5 files changed, 16 insertions, 25 deletions
diff --git a/src/widgets/dialogs/dialogs.pri b/src/widgets/dialogs/dialogs.pri
index 0ebb912ffc..718db3bb5d 100644
--- a/src/widgets/dialogs/dialogs.pri
+++ b/src/widgets/dialogs/dialogs.pri
@@ -7,21 +7,14 @@ HEADERS += \
 	dialogs/qfontdialog_p.h \
         dialogs/qfilesystemmodel.h \
         dialogs/qfilesystemmodel_p.h \
-        dialogs/qfileinfogatherer_p.h \
-        dialogs/qwizard.h
-
-win32 {
-    HEADERS += dialogs/qwizard_win_p.h
-    SOURCES += dialogs/qwizard_win.cpp
-}
+        dialogs/qfileinfogatherer_p.h
 
 INCLUDEPATH += $$PWD
 SOURCES += \
 	dialogs/qerrormessage.cpp \
 	dialogs/qfontdialog.cpp \
         dialogs/qfilesystemmodel.cpp \
-        dialogs/qfileinfogatherer.cpp \
-	dialogs/qwizard.cpp \
+        dialogs/qfileinfogatherer.cpp
 
 qtConfig(colordialog) {
     HEADERS += dialogs/qcolordialog.h
@@ -65,3 +58,13 @@ qtConfig(progressdialog) {
     HEADERS += dialogs/qprogressdialog.h
     SOURCES += dialogs/qprogressdialog.cpp
 }
+
+qtConfig(wizard) {
+    HEADERS += dialogs/qwizard.h
+    SOURCES += dialogs/qwizard.cpp
+
+    win32 {
+        HEADERS += dialogs/qwizard_win_p.h
+        SOURCES += dialogs/qwizard_win.cpp
+    }
+}
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp
index d1abbc85d2..432b6f1879 100644
--- a/src/widgets/dialogs/qwizard.cpp
+++ b/src/widgets/dialogs/qwizard.cpp
@@ -40,8 +40,6 @@
 #include "qwizard.h"
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
 
-#ifndef QT_NO_WIZARD
-
 #include "qabstractspinbox.h"
 #include "qalgorithms.h"
 #include "qapplication.h"
@@ -3987,5 +3985,3 @@ QWizard *QWizardPage::wizard() const
 QT_END_NAMESPACE
 
 #include "moc_qwizard.cpp"
-
-#endif // QT_NO_WIZARD
diff --git a/src/widgets/dialogs/qwizard.h b/src/widgets/dialogs/qwizard.h
index 3236ee90df..4d03bf91d4 100644
--- a/src/widgets/dialogs/qwizard.h
+++ b/src/widgets/dialogs/qwizard.h
@@ -41,13 +41,11 @@
 #define QWIZARD_H
 
 #include <QtWidgets/qtwidgetsglobal.h>
-
-#ifndef QT_NO_WIZARD
-
 #include <QtWidgets/qdialog.h>
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(wizard);
 
+QT_BEGIN_NAMESPACE
 
 class QAbstractButton;
 class QWizardPage;
@@ -261,6 +259,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_WIZARD
-
 #endif // QWIZARD_H
diff --git a/src/widgets/dialogs/qwizard_win.cpp b/src/widgets/dialogs/qwizard_win.cpp
index 4ab01aca66..666b192e9c 100644
--- a/src/widgets/dialogs/qwizard_win.cpp
+++ b/src/widgets/dialogs/qwizard_win.cpp
@@ -37,8 +37,6 @@
 **
 ****************************************************************************/
 
-#ifndef QT_NO_WIZARD
-
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
 
 #if QT_CONFIG(style_windowsvista)
@@ -724,5 +722,3 @@ int QVistaHelper::topOffset()
 QT_END_NAMESPACE
 
 #endif // style_windowsvista
-
-#endif // QT_NO_WIZARD
diff --git a/src/widgets/dialogs/qwizard_win_p.h b/src/widgets/dialogs/qwizard_win_p.h
index bbba53b879..f9122865c2 100644
--- a/src/widgets/dialogs/qwizard_win_p.h
+++ b/src/widgets/dialogs/qwizard_win_p.h
@@ -53,7 +53,6 @@
 
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
 
-#ifndef QT_NO_WIZARD
 #if QT_CONFIG(style_windowsvista)
 
 #include <qobject.h>
@@ -63,6 +62,8 @@
 #include <QtWidgets/private/qstylehelper_p.h>
 #include <qt_windows.h>
 
+QT_REQUIRE_CONFIG(wizard);
+
 QT_BEGIN_NAMESPACE
 
 class QVistaBackButton : public QAbstractButton
@@ -157,5 +158,4 @@ private:
 QT_END_NAMESPACE
 
 #endif // style_windowsvista
-#endif // QT_NO_WIZARD
 #endif // QWIZARD_WIN_P_H