Fix compile with -DQT_NO_WIZARD
authorMontel Laurent <kdeqt@yahoo.fr>
Fri, 30 Nov 2012 18:00:11 +0000 (19:00 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Sat, 1 Dec 2012 00:49:46 +0000 (01:49 +0100)
Change-Id: I6f7be895b8c4a1a65de43ee35d1fab25a30a25c6
Reviewed-by: David Faure <david.faure@kdab.com>
examples/widgets/dialogs/dialogs.pro
src/widgets/styles/qfusionstyle.cpp
src/widgets/styles/qgtkstyle.cpp

index ab33609..0a4922e 100644 (file)
@@ -9,6 +9,7 @@ SUBDIRS       = classwizard \
                     extension \
                     findfiles
 
+contains(DEFINES, QT_NO_WIZARD): SUBDIRS -= trivialwizard licensewizard classwizard
 wince*: SUBDIRS += sipdialog
 
 QT += widgets
index e2b5227..ebcdc10 100644 (file)
@@ -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
 
index 4532f9f..75d2306 100644 (file)
@@ -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: {