diff options
| -rw-r--r-- | examples/widgets/dialogs/dialogs.pro | 1 | ||||
| -rw-r--r-- | src/widgets/styles/qfusionstyle.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/styles/qgtkstyle.cpp | 2 |
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: { |