partial build fix for the case when QT_NO_WIZARD is defined

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/core/global/qconfig.h.cmake b/src/core/global/qconfig.h.cmake
index ad138e5..413abab 100644 (file)
--- a/src/core/global/qconfig.h.cmake
+++ b/src/core/global/qconfig.h.cmake
@@ -161,6 +161,7 @@
 // #cmakedefine QT_NO_VALIDATOR
 // #cmakedefine QT_NO_VECTOR4D
 // #cmakedefine QT_NO_WARNING_OUTPUT
+// #cmakedefine QT_NO_WIZARD
 
 // Misc
 #cmakedefine QT_NO_USING_NAMESPACE
@@ -219,7 +220,6 @@
 #cmakedefine QT_NO_VECTOR2D
 #cmakedefine QT_NO_WHATSTHIS
 #cmakedefine QT_NO_WHEELEVENT
-#cmakedefine QT_NO_WIZARD
 #cmakedefine QT_NO_WORKSPACE
 #cmakedefine QT_NO_XMLSTREAM
 #cmakedefine QT_NO_XMLSTREAMREADER

diff --git a/src/designer/shared/widgetfactory.cpp b/src/designer/shared/widgetfactory.cpp
index 7e61405..dc052c3 100644 (file)
--- a/src/designer/shared/widgetfactory.cpp
+++ b/src/designer/shared/widgetfactory.cpp
@@ -648,10 +648,12 @@ void WidgetFactory::initialize(QObject *object) const
         cb->installEventFilter(new ComboEventFilter(cb));
         return;
     }
+#ifndef QT_NO_WIZARD
     if (QWizard *wz = qobject_cast<QWizard *>(widget)) {
         WizardPageChangeWatcher *pw = new WizardPageChangeWatcher(wz);
         Q_UNUSED(pw);
     }
+#endif // QT_NO_WIZARD
 }
 
 static inline QString classNameOfStyle(const QStyle *s)

diff --git a/src/gui/dialogs/qwizard.h b/src/gui/dialogs/qwizard.h
index e9326da..aaab9bb 100644 (file)
--- a/src/gui/dialogs/qwizard.h
+++ b/src/gui/dialogs/qwizard.h
@@ -24,12 +24,10 @@
 
 #include <QtGui/qdialog.h>
 
+#ifndef QT_NO_WIZARD
 
 QT_BEGIN_NAMESPACE
 
-
-#ifndef QT_NO_WIZARD
-
 class QAbstractButton;
 class QWizardPage;
 class QWizardPrivate;
@@ -237,7 +235,6 @@ private:
 
 QT_END_NAMESPACE
 
-
 #endif // QT_NO_WIZARD
 
 #endif // QWIZARD_H