From 330f0245898dd2c163a3a8b8dfb7b672cf8def3b Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Wed, 31 May 2017 21:28:32 +0200
Subject: Convert features.wizard to QT_[REQUIRE_]CONFIG

Change-Id: I43e3d9f55a21ae0f602fc43c570321d0152cd8b6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/widgets/styles/qcommonstyle.cpp    | 4 +++-
 src/widgets/styles/qfusionstyle.cpp    | 4 +++-
 src/widgets/styles/qmacstyle_mac.mm    | 4 +++-
 src/widgets/styles/qmacstyle_mac_p_p.h | 1 -
 src/widgets/styles/qwindowsstyle.cpp   | 4 +++-
 5 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'src/widgets/styles')

diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp
index afcb50c866..ad3ba88756 100644
--- a/src/widgets/styles/qcommonstyle.cpp
+++ b/src/widgets/styles/qcommonstyle.cpp
@@ -74,7 +74,9 @@
 #include <private/qmath_p.h>
 #include <qdebug.h>
 #include <qtextformat.h>
+#if QT_CONFIG(wizard)
 #include <qwizard.h>
+#endif
 #include <qfileinfo.h>
 #include <qdir.h>
 #include <qsettings.h>
@@ -5187,7 +5189,7 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget
             vret->variant = fmt;
         }
         break;
-#ifndef QT_NO_WIZARD
+#if QT_CONFIG(wizard)
     case SH_WizardStyle:
         ret = QWizard::ClassicStyle;
         break;
diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp
index dc703e3e8d..983413d149 100644
--- a/src/widgets/styles/qfusionstyle.cpp
+++ b/src/widgets/styles/qfusionstyle.cpp
@@ -65,7 +65,9 @@
 #include <qslider.h>
 #include <qsplitter.h>
 #include <qprogressbar.h>
+#if QT_CONFIG(wizard)
 #include <qwizard.h>
+#endif
 #include <qdrawutil.h>
 #include <private/qstylehelper_p.h>
 #include <private/qdrawhelper_p.h>
@@ -3727,7 +3729,7 @@ int QFusionStyle::styleHint(StyleHint hint, const QStyleOption *option, const QW
 
     case SH_MessageBox_TextInteractionFlags:
         return Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse;
-#ifndef QT_NO_WIZARD
+#if QT_CONFIG(wizard)
     case SH_WizardStyle:
         return QWizard::ClassicStyle;
 #endif
diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm
index cf2929db7e..147b2027bf 100644
--- a/src/widgets/styles/qmacstyle_mac.mm
+++ b/src/widgets/styles/qmacstyle_mac.mm
@@ -89,7 +89,9 @@
 #include <qtreeview.h>
 #include <qtableview.h>
 #include <qoperatingsystemversion.h>
+#if QT_CONFIG(wizard)
 #include <qwizard.h>
+#endif
 #include <qdebug.h>
 #include <qlibrary.h>
 #include <qdatetimeedit.h>
@@ -2990,7 +2992,7 @@ int QMacStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w
     case SH_FocusFrame_AboveWidget:
         ret = true;
         break;
-#ifndef QT_NO_WIZARD
+#if QT_CONFIG(wizard)
     case SH_WizardStyle:
         ret = QWizard::MacStyle;
         break;
diff --git a/src/widgets/styles/qmacstyle_mac_p_p.h b/src/widgets/styles/qmacstyle_mac_p_p.h
index e5d2ffdc9d..e16f17c67f 100644
--- a/src/widgets/styles/qmacstyle_mac_p_p.h
+++ b/src/widgets/styles/qmacstyle_mac_p_p.h
@@ -93,7 +93,6 @@
 #include <qtoolbutton.h>
 #include <qtreeview.h>
 #include <qtableview.h>
-#include <qwizard.h>
 #include <qdebug.h>
 #include <qdatetimeedit.h>
 #include <qmath.h>
diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp
index b537931f49..efbb972a06 100644
--- a/src/widgets/styles/qwindowsstyle.cpp
+++ b/src/widgets/styles/qwindowsstyle.cpp
@@ -60,7 +60,9 @@
 #include "qfile.h"
 #include "qtextstream.h"
 #include "qpixmapcache.h"
+#if QT_CONFIG(wizard)
 #include "qwizard.h"
+#endif
 #include "qlistview.h"
 #include <private/qmath_p.h>
 #include <qmath.h>
@@ -621,7 +623,7 @@ int QWindowsStyle::styleHint(StyleHint hint, const QStyleOption *opt, const QWid
         }
         break;
 #endif // QT_NO_RUBBERBAND
-#ifndef QT_NO_WIZARD
+#if QT_CONFIG(wizard)
     case SH_WizardStyle:
         ret = QWizard::ModernStyle;
         break;
-- 
cgit v1.2.3