From 1ebe68b01f6ab7e32f4f383d979588842b050dfb Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Tue, 30 May 2017 20:25:50 +0200
Subject: Convert features.filedialog to QT_[REQUIRE_]CONFIG

Change-Id: I9bc229b0d1430b81eeb2cfca2b24474736d5d561
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/widgets/dialogs/dialogs.pri     | 20 +++++++++++++-------
 src/widgets/dialogs/qdialog.cpp     |  4 +++-
 src/widgets/dialogs/qfiledialog.cpp |  3 ---
 src/widgets/dialogs/qfiledialog.h   |  8 ++------
 src/widgets/dialogs/qfiledialog_p.h |  6 ++----
 src/widgets/dialogs/qsidebar.cpp    |  4 ----
 src/widgets/dialogs/qsidebar_p.h    |  4 +---
 7 files changed, 21 insertions(+), 28 deletions(-)

(limited to 'src/widgets/dialogs')

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
 
-- 
cgit v1.2.3