Convert features.filedialog to QT_[REQUIRE_]CONFIG

Change-Id: I9bc229b0d1430b81eeb2cfca2b24474736d5d561
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>

15 files changed, 53 insertions, 40 deletions

diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro
index 62935210be..0f478a79f3 100644
--- a/src/plugins/platforms/cocoa/cocoa.pro
+++ b/src/plugins/platforms/cocoa/cocoa.pro
@@ -21,7 +21,6 @@ OBJECTIVE_SOURCES += main.mm \
     qcocoaaccessibilityelement.mm \
     qcocoaaccessibility.mm \
     qcocoacolordialoghelper.mm \
-    qcocoafiledialoghelper.mm \
     qcocoafontdialoghelper.mm \
     qcocoacursor.mm \
     qcocoaclipboard.mm \
@@ -56,7 +55,6 @@ HEADERS += qcocoaintegration.h \
     qcocoaaccessibilityelement.h \
     qcocoaaccessibility.h \
     qcocoacolordialoghelper.h \
-    qcocoafiledialoghelper.h \
     qcocoafontdialoghelper.h \
     qcocoacursor.h \
     qcocoaclipboard.h \
@@ -89,6 +87,8 @@ QT += \
 CONFIG += no_app_extension_api_only
 
 qtHaveModule(widgets) {
+    QT_FOR_CONFIG += widgets
+
     OBJECTIVE_SOURCES += \
         qpaintengine_mac.mm \
         qprintengine_mac.mm \
@@ -101,6 +101,11 @@ qtHaveModule(widgets) {
         qcocoaprintersupport.h \
         qcocoaprintdevice.h \
 
+    qtConfig(filedialog) {
+        SOURCES += qcocoafiledialoghelper.mm
+        HEADERS += qcocoafiledialoghelper.h
+    }
+
     QT += widgets-private printsupport-private
 }
 
diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h
index 1cff6f97ba..f5ba1dc22e 100644
--- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h
+++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h
@@ -41,8 +41,11 @@
 #define QCOCOAFILEDIALOGHELPER_H
 
 #include <QObject>
+#include <QtWidgets/qtwidgetsglobal.h>
 #include <qpa/qplatformdialoghelper.h>
 
+QT_REQUIRE_CONFIG(filedialog);
+
 Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate));
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
index 4ba3dcb9a6..74148b7cbf 100644
--- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
+++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
@@ -41,8 +41,6 @@
 
 #include "qcocoafiledialoghelper.h"
 
-#ifndef QT_NO_FILEDIALOG
-
 /*****************************************************************************
   QFileDialog debug facilities
  *****************************************************************************/
@@ -775,5 +773,3 @@ bool QCocoaFileDialogHelper::defaultNameFilterDisables() const
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_FILEDIALOG
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index d48ec8c6f7..bac49cfad9 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -47,7 +47,6 @@
 #include "qcocoahelpers.h"
 #include "qcocoaapplication.h"
 #include "qcocoaapplicationdelegate.h"
-#include "qcocoafiledialoghelper.h"
 #include "qcocoatheme.h"
 #include "qcocoainputcontext.h"
 #include "qcocoamimetypes.h"
@@ -60,6 +59,13 @@
 
 #include <QtGui/private/qcoregraphics_p.h>
 
+#ifdef QT_WIDGETS_LIB
+#include <QtWidgets/qtwidgetsglobal.h>
+#if QT_CONFIG(filedialog)
+#include "qcocoafiledialoghelper.h"
+#endif
+#endif
+
 #include <IOKit/graphics/IOGraphicsLib.h>
 
 static void initResources()
diff --git a/src/plugins/platforms/cocoa/qcocoatheme.mm b/src/plugins/platforms/cocoa/qcocoatheme.mm
index d2345f9abc..53ccf68c0c 100644
--- a/src/plugins/platforms/cocoa/qcocoatheme.mm
+++ b/src/plugins/platforms/cocoa/qcocoatheme.mm
@@ -45,7 +45,6 @@
 #include <QtCore/QVariant>
 
 #include "qcocoacolordialoghelper.h"
-#include "qcocoafiledialoghelper.h"
 #include "qcocoafontdialoghelper.h"
 #include "qcocoasystemsettings.h"
 #include "qcocoasystemtrayicon.h"
@@ -63,6 +62,13 @@
 #include <qpa/qplatformintegration.h>
 #include <qpa/qplatformnativeinterface.h>
 
+#ifdef QT_WIDGETS_LIB
+#include <QtWidgets/qtwidgetsglobal.h>
+#if QT_CONFIG(filedialog)
+#include "qcocoafiledialoghelper.h"
+#endif
+#endif
+
 #include <Carbon/Carbon.h>
 
 @interface QT_MANGLE_NAMESPACE(QCocoaThemeNotificationReceiver) : NSObject {
@@ -138,7 +144,7 @@ bool QCocoaTheme::usePlatformNativeDialog(DialogType dialogType) const
 QPlatformDialogHelper * QCocoaTheme::createPlatformDialogHelper(DialogType dialogType) const
 {
     switch (dialogType) {
-#ifndef QT_NO_FILEDIALOG
+#if defined(QT_WIDGETS_LIB) && QT_CONFIG(filedialog)
     case QPlatformTheme::FileDialog:
         return new QCocoaFileDialogHelper();
 #endif
diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp
index 32a06a4f7e..d80cc1fa3d 100644
--- a/src/printsupport/dialogs/qprintdialog_unix.cpp
+++ b/src/printsupport/dialogs/qprintdialog_unix.cpp
@@ -43,7 +43,9 @@
 #include "private/qabstractprintdialog_p.h"
 #include <QtWidgets/qmessagebox.h>
 #include "qprintdialog.h"
+#if QT_CONFIG(filedialog)
 #include "qfiledialog.h"
+#endif
 #include <QtCore/qdir.h>
 #include <QtGui/qevent.h>
 #include <QtWidgets/qfilesystemmodel.h>
@@ -780,7 +782,7 @@ void QUnixPrintWidgetPrivate::setOptionsPane(QPrintDialogPrivate *pane)
 void QUnixPrintWidgetPrivate::_q_btnBrowseClicked()
 {
     QString filename = widget.filename->text();
-#ifndef QT_NO_FILEDIALOG
+#if QT_CONFIG(filedialog)
     filename = QFileDialog::getSaveFileName(parent, QPrintDialog::tr("Print To File ..."), filename,
                                             QString(), 0, QFileDialog::DontConfirmOverwrite);
 #else
diff --git a/src/printsupport/dialogs/qprintpreviewdialog.cpp b/src/printsupport/dialogs/qprintpreviewdialog.cpp
index fd23aea460..dbcbaf3ce5 100644
--- a/src/printsupport/dialogs/qprintpreviewdialog.cpp
+++ b/src/printsupport/dialogs/qprintpreviewdialog.cpp
@@ -51,7 +51,9 @@
 #include <QtWidgets/qstyle.h>
 #include <QtWidgets/qtoolbutton.h>
 #include <QtGui/qvalidator.h>
+#if QT_CONFIG(filedialog)
 #include <QtWidgets/qfiledialog.h>
+#endif
 #include <QtWidgets/qmainwindow.h>
 #include <QtWidgets/qtoolbar.h>
 #include <QtCore/QCoreApplication>
diff --git a/src/widgets/dialogs/dialogs.pri b/src/widgets/dialogs/dialogs.pri
index c9438696fa..584aef1da1 100644
--- a/src/widgets/dialogs/dialogs.pri
+++ b/src/widgets/dialogs/dialogs.pri
@@ -4,14 +4,11 @@ HEADERS += \
 	dialogs/qcolordialog.h \
         dialogs/qfscompleter_p.h \
 	dialogs/qerrormessage.h \
-	dialogs/qfiledialog.h \
-	dialogs/qfiledialog_p.h \
 	dialogs/qfontdialog.h \
 	dialogs/qfontdialog_p.h \
 	dialogs/qinputdialog.h \
 	dialogs/qmessagebox.h \
 	dialogs/qprogressdialog.h \
-        dialogs/qsidebar_p.h \
         dialogs/qfilesystemmodel.h \
         dialogs/qfilesystemmodel_p.h \
         dialogs/qfileinfogatherer_p.h \
@@ -22,18 +19,14 @@ win32 {
     SOURCES += dialogs/qwizard_win.cpp
 }
 
-FORMS += dialogs/qfiledialog.ui
-
 INCLUDEPATH += $$PWD
 SOURCES += \
 	dialogs/qcolordialog.cpp \
 	dialogs/qerrormessage.cpp \
-	dialogs/qfiledialog.cpp \
 	dialogs/qfontdialog.cpp \
 	dialogs/qinputdialog.cpp \
 	dialogs/qmessagebox.cpp \
 	dialogs/qprogressdialog.cpp \
-        dialogs/qsidebar.cpp \
         dialogs/qfilesystemmodel.cpp \
         dialogs/qfileinfogatherer.cpp \
 	dialogs/qwizard.cpp \
@@ -47,4 +40,17 @@ qtConfig(dialog) {
         dialogs/qdialog.cpp
 }
 
+qtConfig(filedialog) {
+    HEADERS += \
+        dialogs/qfiledialog.h \
+        dialogs/qfiledialog_p.h \
+        dialogs/qsidebar_p.h
+
+    SOURCES += \
+        dialogs/qfiledialog.cpp \
+        dialogs/qsidebar.cpp
+
+    FORMS += dialogs/qfiledialog.ui
+}
+
 RESOURCES += dialogs/qmessagebox.qrc
diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp
index a6e9cda8ce..6169951b49 100644
--- a/src/widgets/dialogs/qdialog.cpp
+++ b/src/widgets/dialogs/qdialog.cpp
@@ -39,7 +39,9 @@
 
 #include "qcolordialog.h"
 #include "qfontdialog.h"
+#if QT_CONFIG(filedialog)
 #include "qfiledialog.h"
+#endif
 
 #include "qevent.h"
 #include "qdesktopwidget.h"
@@ -64,7 +66,7 @@ QT_BEGIN_NAMESPACE
 
 static inline int themeDialogType(const QDialog *dialog)
 {
-#ifndef QT_NO_FILEDIALOG
+#if QT_CONFIG(filedialog)
     if (qobject_cast<const QFileDialog *>(dialog))
         return QPlatformTheme::FileDialog;
 #endif
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index 98f8147236..5c4b42a470 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -43,7 +43,6 @@
 #include <private/qwidgetitemdata_p.h>
 #include "qfiledialog.h"
 
-#ifndef QT_NO_FILEDIALOG
 #include "qfiledialog_p.h"
 #include <private/qguiapplication_p.h>
 #include <qfontmetrics.h>
@@ -4134,5 +4133,3 @@ QStringList QFSCompleter::splitPath(const QString &path) const
 QT_END_NAMESPACE
 
 #include "moc_qfiledialog.cpp"
-
-#endif // QT_NO_FILEDIALOG
diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h
index 733dd03092..b9092e036d 100644
--- a/src/widgets/dialogs/qfiledialog.h
+++ b/src/widgets/dialogs/qfiledialog.h
@@ -44,13 +44,11 @@
 #include <QtCore/qdir.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qurl.h>
-
-#ifndef QT_NO_FILEDIALOG
-
 #include <QtWidgets/qdialog.h>
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(filedialog);
 
+QT_BEGIN_NAMESPACE
 
 class QModelIndex;
 class QItemSelection;
@@ -316,6 +314,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QFileDialog::Options)
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_FILEDIALOG
-
 #endif // QFILEDIALOG_H
diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h
index d5df7542b6..d06a089e42 100644
--- a/src/widgets/dialogs/qfiledialog_p.h
+++ b/src/widgets/dialogs/qfiledialog_p.h
@@ -53,8 +53,6 @@
 
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
 
-#ifndef QT_NO_FILEDIALOG
-
 #include "qfiledialog.h"
 #include "private/qdialog_p.h"
 #include "qplatformdefs.h"
@@ -81,6 +79,8 @@
 #include <unistd.h>
 #endif
 
+QT_REQUIRE_CONFIG(filedialog);
+
 QT_BEGIN_NAMESPACE
 
 class QFileDialogListView;
@@ -432,6 +432,4 @@ QString QFileDialogPrivate::selectedNameFilter_sys() const
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_FILEDIALOG
-
 #endif // QFILEDIALOG_P_H
diff --git a/src/widgets/dialogs/qsidebar.cpp b/src/widgets/dialogs/qsidebar.cpp
index 9bb046db61..b8b042ddb5 100644
--- a/src/widgets/dialogs/qsidebar.cpp
+++ b/src/widgets/dialogs/qsidebar.cpp
@@ -40,8 +40,6 @@
 #include "qsidebar_p.h"
 #include "qfilesystemmodel.h"
 
-#ifndef QT_NO_FILEDIALOG
-
 #include <qaction.h>
 #include <qurl.h>
 #include <qmenu.h>
@@ -518,5 +516,3 @@ bool QSidebar::event(QEvent * event)
 QT_END_NAMESPACE
 
 #include "moc_qsidebar_p.cpp"
-
-#endif
diff --git a/src/widgets/dialogs/qsidebar_p.h b/src/widgets/dialogs/qsidebar_p.h
index ee57f2fb48..17d576e54d 100644
--- a/src/widgets/dialogs/qsidebar_p.h
+++ b/src/widgets/dialogs/qsidebar_p.h
@@ -58,7 +58,7 @@
 #include <qurl.h>
 #include <qvector.h>
 
-#ifndef QT_NO_FILEDIALOG
+QT_REQUIRE_CONFIG(filedialog);
 
 QT_BEGIN_NAMESPACE
 
@@ -159,7 +159,5 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_FILEDIALOG
-
 #endif // QSIDEBAR_H
 
diff --git a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
index eb056475d1..3a6102f2fa 100644
--- a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
+++ b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
@@ -94,7 +94,7 @@ private slots:
     void customPaperSizeAndMargins();
     void customPaperNameSettingBySize();
     void customPaperNameSettingByName();
-#if !defined(QT_NO_COMPLETER) && !defined(QT_NO_FILEDIALOG)
+#if !defined(QT_NO_COMPLETER) && QT_CONFIG(filedialog)
     void printDialogCompleter();
 #endif
     void testCurrentPage();
@@ -601,7 +601,7 @@ void tst_QPrinter::customPaperSizeAndMargins()
     }
 }
 
-#if !defined(QT_NO_COMPLETER) && !defined(QT_NO_FILEDIALOG)
+#if !defined(QT_NO_COMPLETER) && QT_CONFIG(filedialog)
 void tst_QPrinter::printDialogCompleter()
 {
     QPrintDialog dialog;