summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMontel Laurent <kdeqt@yahoo.fr>2012-11-30 19:00:11 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-01 01:49:46 +0100
commit9bf17c7cb6dcbee52de435e07f40d5c9e75985c3 (patch)
treec27a13992707593002c95fe12627d484bfb15ee4
parentce68ca86f252f69a89a6bbcd1b125ee0aa87974c (diff)
Fix compile with -DQT_NO_WIZARD
Change-Id: I6f7be895b8c4a1a65de43ee35d1fab25a30a25c6 Reviewed-by: David Faure <david.faure@kdab.com>
-rw-r--r--examples/widgets/dialogs/dialogs.pro1
-rw-r--r--src/widgets/styles/qfusionstyle.cpp4
-rw-r--r--src/widgets/styles/qgtkstyle.cpp2
3 files changed, 5 insertions, 2 deletions
diff --git a/examples/widgets/dialogs/dialogs.pro b/examples/widgets/dialogs/dialogs.pro
index ab33609bcd..0a4922eeaf 100644
--- a/examples/widgets/dialogs/dialogs.pro
+++ b/examples/widgets/dialogs/dialogs.pro
@@ -9,6 +9,7 @@ SUBDIRS = classwizard \
extension \
findfiles
+contains(DEFINES, QT_NO_WIZARD): SUBDIRS -= trivialwizard licensewizard classwizard
wince*: SUBDIRS += sipdialog
QT += widgets
diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp
index e2b5227b75..ebcdc10d59 100644
--- a/src/widgets/styles/qfusionstyle.cpp
+++ b/src/widgets/styles/qfusionstyle.cpp
@@ -3488,10 +3488,10 @@ int QFusionStyle::styleHint(StyleHint hint, const QStyleOption *option, const QW
case SH_MessageBox_TextInteractionFlags:
return Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse;
-
+#ifndef QT_NO_WIZARD
case SH_WizardStyle:
return QWizard::ClassicStyle;
-
+#endif
case SH_Menu_SubMenuPopupDelay:
return 225; // default from GtkMenu
diff --git a/src/widgets/styles/qgtkstyle.cpp b/src/widgets/styles/qgtkstyle.cpp
index 4532f9f8cd..75d2306da7 100644
--- a/src/widgets/styles/qgtkstyle.cpp
+++ b/src/widgets/styles/qgtkstyle.cpp
@@ -794,8 +794,10 @@ int QGtkStyle::styleHint(StyleHint hint, const QStyleOption *option, const QWidg
return Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse;
case SH_MessageBox_CenterButtons:
return false;
+#ifndef QT_NO_WIZARD
case SH_WizardStyle:
return QWizard::ClassicStyle;
+#endif
case SH_ItemView_ArrowKeysNavigateIntoChildren:
return false;
case SH_DialogButtonLayout: {