summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/widgets/dialogs/dialogs.pro6
-rw-r--r--src/widgets/dialogs/dialogs.pri21
-rw-r--r--src/widgets/dialogs/qwizard.cpp4
-rw-r--r--src/widgets/dialogs/qwizard.h8
-rw-r--r--src/widgets/dialogs/qwizard_win.cpp4
-rw-r--r--src/widgets/dialogs/qwizard_win_p.h4
-rw-r--r--src/widgets/styles/qcommonstyle.cpp4
-rw-r--r--src/widgets/styles/qfusionstyle.cpp4
-rw-r--r--src/widgets/styles/qmacstyle_mac.mm4
-rw-r--r--src/widgets/styles/qmacstyle_mac_p_p.h1
-rw-r--r--src/widgets/styles/qwindowsstyle.cpp4
11 files changed, 33 insertions, 31 deletions
diff --git a/examples/widgets/dialogs/dialogs.pro b/examples/widgets/dialogs/dialogs.pro
index 7a01e818e0..6f19309440 100644
--- a/examples/widgets/dialogs/dialogs.pro
+++ b/examples/widgets/dialogs/dialogs.pro
@@ -1,3 +1,5 @@
+QT_FOR_CONFIG += widgets
+
TEMPLATE = subdirs
SUBDIRS = classwizard \
configdialog \
@@ -13,5 +15,7 @@ SUBDIRS = classwizard \
}
!qtHaveModule(printsupport): SUBDIRS -= licensewizard
-contains(DEFINES, QT_NO_WIZARD): SUBDIRS -= trivialwizard licensewizard classwizard
+!qtConfig(wizard) {
+ SUBDIRS -= trivialwizard licensewizard classwizard
+}
wince: SUBDIRS += sipdialog
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
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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 05:31:26 +0000