Fix build with -no-feature-messagebox

Pick-to: 6.5
Change-Id: I4c34f6aa2106afc528f182d7925442acf82b7000
Reviewed-by: Volker Hilsheimer <[email protected]>

4 files changed, 10 insertions, 2 deletions

diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp
index 1199c4f6004..ae4ee193a0a 100644
--- a/src/printsupport/dialogs/qprintdialog_unix.cpp
+++ b/src/printsupport/dialogs/qprintdialog_unix.cpp
@@ -322,7 +322,7 @@ void QPrintPropertiesDialog::reject()
 
 void QPrintPropertiesDialog::accept()
 {
-#if QT_CONFIG(cups)
+#if QT_CONFIG(cups) && QT_CONFIG(messagebox)
     if (widget.pageSetup->hasPpdConflict()) {
         widget.tabs->setCurrentWidget(widget.tabPage);
         const QMessageBox::StandardButton answer = QMessageBox::warning(this, tr("Page Setup Conflicts"),
@@ -990,7 +990,7 @@ int QPrintDialog::exec()
 void QPrintDialog::accept()
 {
     Q_D(QPrintDialog);
-#if QT_CONFIG(cups)
+#if QT_CONFIG(cups) && QT_CONFIG(messagebox)
     if (d->options.pagesRadioButton->isChecked() && printer()->pageRanges().isEmpty()) {
         QMessageBox::critical(this, tr("Invalid Pages Definition"),
                               tr("%1 does not follow the correct syntax. Please use ',' to separate "
diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp
index 01ada3a5c55..e13b7ebcf79 100644
--- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp
+++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp
@@ -84,8 +84,10 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje
 #endif
     } else if (classname == "QDialog"_L1) {
         iface = new QAccessibleWidget(widget, QAccessible::Dialog);
+#if QT_CONFIG(messagebox)
     } else if (classname == "QMessageBox"_L1) {
         iface = new QAccessibleMessageBox(widget);
+#endif
 #if QT_CONFIG(mainwindow)
     } else if (classname == "QMainWindow"_L1) {
         iface = new QAccessibleMainWindow(widget);
diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp
index 4269ef72b3d..3152634a603 100644
--- a/src/widgets/accessible/simplewidgets.cpp
+++ b/src/widgets/accessible/simplewidgets.cpp
@@ -43,7 +43,9 @@
 #ifndef QT_NO_PICTURE
 #include <QtGui/qpicture.h>
 #endif
+#if QT_CONFIG(messagebox)
 #include <qmessagebox.h>
+#endif
 #include <qdialogbuttonbox.h>
 #include <qstyle.h>
 #include <qstyleoption.h>
@@ -953,6 +955,7 @@ QWindowContainer *QAccessibleWindowContainer::container() const
     return static_cast<QWindowContainer *>(widget());
 }
 
+#if QT_CONFIG(messagebox)
 /*!
     \internal
     Implements QAccessibleWidget for QMessageBox
@@ -993,6 +996,7 @@ QString QAccessibleMessageBox::text(QAccessible::Text t) const
 
     return str;
 }
+#endif
 
 #endif // QT_CONFIG(accessibility)
 
diff --git a/src/widgets/accessible/simplewidgets_p.h b/src/widgets/accessible/simplewidgets_p.h
index 027d3c7bbc2..c9c03b00d8c 100644
--- a/src/widgets/accessible/simplewidgets_p.h
+++ b/src/widgets/accessible/simplewidgets_p.h
@@ -190,6 +190,7 @@ private:
     QWindowContainer *container() const;
 };
 
+#if QT_CONFIG(messagebox)
 class QAccessibleMessageBox : public QAccessibleWidget
 {
 public:
@@ -199,6 +200,7 @@ public:
 
     QMessageBox *messageBox() const;
 };
+#endif
 
 #endif // QT_CONFIG(accessibility)