From 003dc8e29a89c18729fc696ea9ca224645e792fd Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Tue, 30 May 2017 20:52:39 +0200
Subject: Convert features.inputdialog to QT_[REQUIRE_]CONFIG

Change-Id: Ie480efcfc1fdc00e2b2697cf4c5abb231b42cc0e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/widgets/dialogs/dialogs.pri           |  7 +++++--
 src/widgets/dialogs/qfiledialog.cpp       |  1 -
 src/widgets/dialogs/qinputdialog.cpp      |  4 ----
 src/widgets/dialogs/qinputdialog.h        |  7 ++-----
 src/widgets/styles/qwindowsvistastyle.cpp | 12 ++++++------
 5 files changed, 13 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/widgets/dialogs/dialogs.pri b/src/widgets/dialogs/dialogs.pri
index 9307a80009..b745607c90 100644
--- a/src/widgets/dialogs/dialogs.pri
+++ b/src/widgets/dialogs/dialogs.pri
@@ -6,7 +6,6 @@ HEADERS += \
 	dialogs/qerrormessage.h \
 	dialogs/qfontdialog.h \
 	dialogs/qfontdialog_p.h \
-	dialogs/qinputdialog.h \
 	dialogs/qmessagebox.h \
         dialogs/qfilesystemmodel.h \
         dialogs/qfilesystemmodel_p.h \
@@ -23,7 +22,6 @@ SOURCES += \
 	dialogs/qcolordialog.cpp \
 	dialogs/qerrormessage.cpp \
 	dialogs/qfontdialog.cpp \
-	dialogs/qinputdialog.cpp \
 	dialogs/qmessagebox.cpp \
         dialogs/qfilesystemmodel.cpp \
         dialogs/qfileinfogatherer.cpp \
@@ -51,6 +49,11 @@ qtConfig(filedialog) {
     FORMS += dialogs/qfiledialog.ui
 }
 
+qtConfig(inputdialog) {
+    HEADERS += dialogs/qinputdialog.h
+    SOURCES += dialogs/qinputdialog.cpp
+}
+
 qtConfig(progressdialog) {
     HEADERS += dialogs/qprogressdialog.h
     SOURCES += dialogs/qprogressdialog.cpp
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index 5c4b42a470..61ee933dc6 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -52,7 +52,6 @@
 #include <qgridlayout.h>
 #include <qmenu.h>
 #include <qmessagebox.h>
-#include <qinputdialog.h>
 #include <stdlib.h>
 #include <qsettings.h>
 #include <qdebug.h>
diff --git a/src/widgets/dialogs/qinputdialog.cpp b/src/widgets/dialogs/qinputdialog.cpp
index 47551ae6fd..04d13045e5 100644
--- a/src/widgets/dialogs/qinputdialog.cpp
+++ b/src/widgets/dialogs/qinputdialog.cpp
@@ -39,8 +39,6 @@
 
 #include "qinputdialog.h"
 
-#ifndef QT_NO_INPUTDIALOG
-
 #include "qapplication.h"
 #include "qcombobox.h"
 #include "qdialogbuttonbox.h"
@@ -1507,5 +1505,3 @@ QT_END_NAMESPACE
 
 #include "qinputdialog.moc"
 #include "moc_qinputdialog.cpp"
-
-#endif // QT_NO_INPUTDIALOG
diff --git a/src/widgets/dialogs/qinputdialog.h b/src/widgets/dialogs/qinputdialog.h
index 7b43e774a7..5f06785886 100644
--- a/src/widgets/dialogs/qinputdialog.h
+++ b/src/widgets/dialogs/qinputdialog.h
@@ -44,12 +44,11 @@
 #include <QtCore/qstring.h>
 #include <QtWidgets/qlineedit.h>
 
-#ifndef QT_NO_INPUTDIALOG
-
 #include <QtWidgets/qdialog.h>
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(inputdialog);
 
+QT_BEGIN_NAMESPACE
 
 class QInputDialogPrivate;
 
@@ -212,6 +211,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QInputDialog::InputDialogOptions)
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_INPUTDIALOG
-
 #endif // QINPUTDIALOG_H
diff --git a/src/widgets/styles/qwindowsvistastyle.cpp b/src/widgets/styles/qwindowsvistastyle.cpp
index a1aabc20c6..ae1b83957c 100644
--- a/src/widgets/styles/qwindowsvistastyle.cpp
+++ b/src/widgets/styles/qwindowsvistastyle.cpp
@@ -780,10 +780,10 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt
 
             if (qobject_cast<const QMessageBox *> (widget))
                 buttonBox = widget->findChild<const QDialogButtonBox *>(QLatin1String("qt_msgbox_buttonbox"));
-#ifndef QT_NO_INPUTDIALOG
+#if QT_CONFIG(inputdialog)
             else if (qobject_cast<const QInputDialog *> (widget))
                 buttonBox = widget->findChild<const QDialogButtonBox *>(QLatin1String("qt_inputdlg_buttonbox"));
-#endif // QT_NO_INPUTDIALOG
+#endif // QT_CONFIG(inputdialog)
 
             if (buttonBox) {
                 //draw white panel part
@@ -2324,7 +2324,7 @@ void QWindowsVistaStyle::polish(QWidget *widget)
             buttonBox->setContentsMargins(0, 9, 0, 0);
 #endif
     }
-#ifndef QT_NO_INPUTDIALOG
+#if QT_CONFIG(inputdialog)
     else if (qobject_cast<QInputDialog *> (widget)) {
         widget->setAttribute(Qt::WA_StyledBackground);
 #if QT_CONFIG(dialogbuttonbox)
@@ -2333,7 +2333,7 @@ void QWindowsVistaStyle::polish(QWidget *widget)
             buttonBox->setContentsMargins(0, 9, 0, 0);
 #endif
     }
-#endif // QT_NO_INPUTDIALOG
+#endif // QT_CONFIG(inputdialog)
     else if (QTreeView *tree = qobject_cast<QTreeView *> (widget)) {
         tree->viewport()->setAttribute(Qt::WA_Hover);
     }
@@ -2368,7 +2368,7 @@ void QWindowsVistaStyle::unpolish(QWidget *widget)
             buttonBox->setContentsMargins(0, 0, 0, 0);
 #endif
     }
-#ifndef QT_NO_INPUTDIALOG
+#if QT_CONFIG(inputdialog)
     else if (qobject_cast<QInputDialog *> (widget)) {
         widget->setAttribute(Qt::WA_StyledBackground, false);
 #if QT_CONFIG(dialogbuttonbox)
@@ -2377,7 +2377,7 @@ void QWindowsVistaStyle::unpolish(QWidget *widget)
             buttonBox->setContentsMargins(0, 0, 0, 0);
 #endif
     }
-#endif // QT_NO_INPUTDIALOG
+#endif // QT_CONFIG(inputdialog)
     else if (QTreeView *tree = qobject_cast<QTreeView *> (widget)) {
         tree->viewport()->setAttribute(Qt::WA_Hover, false);
     } else if (qobject_cast<QCommandLinkButton*>(widget)) {
-- 
cgit v1.2.3