1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compile with -DQT_NO_WIZARD

Browse Source 
Change-Id: I6f7be895b8c4a1a65de43ee35d1fab25a30a25c6
Reviewed-by: David Faure <david.faure@kdab.com>
This commit is contained in:
Montel Laurent 2012-11-30 19:00:11 +01:00 committed by The Qt Project
parent ce68ca86f2
commit 9bf17c7cb6
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/widgets/dialogs/dialogs.pro
View File

@ -9,6 +9,7 @@ SUBDIRS = classwizard \
extension \ extension \
findfiles findfiles
contains(DEFINES, QT_NO_WIZARD): SUBDIRS -= trivialwizard licensewizard classwizard
wince*: SUBDIRS += sipdialog wince*: SUBDIRS += sipdialog
QT += widgets QT += widgets

4
src/widgets/styles/qfusionstyle.cpp
View File

@ -3488,10 +3488,10 @@ int QFusionStyle::styleHint(StyleHint hint, const QStyleOption *option, const QW
case SH_MessageBox_TextInteractionFlags: case SH_MessageBox_TextInteractionFlags:
return Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse; return Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse;
#ifndef QT_NO_WIZARD
case SH_WizardStyle: case SH_WizardStyle:
return QWizard::ClassicStyle; return QWizard::ClassicStyle;
#endif
case SH_Menu_SubMenuPopupDelay: case SH_Menu_SubMenuPopupDelay:
return 225; // default from GtkMenu return 225; // default from GtkMenu

2
src/widgets/styles/qgtkstyle.cpp
View File

@ -794,8 +794,10 @@ int QGtkStyle::styleHint(StyleHint hint, const QStyleOption *option, const QWidg
return Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse; return Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse;
case SH_MessageBox_CenterButtons: case SH_MessageBox_CenterButtons:
return false; return false;
#ifndef QT_NO_WIZARD
case SH_WizardStyle: case SH_WizardStyle:
return QWizard::ClassicStyle; return QWizard::ClassicStyle;
#endif
case SH_ItemView_ArrowKeysNavigateIntoChildren: case SH_ItemView_ArrowKeysNavigateIntoChildren:
return false; return false;
case SH_DialogButtonLayout: { case SH_DialogButtonLayout: {