diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2012-03-02 13:47:47 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-02 18:31:10 +0100 |
| commit | db1aa6dd99aa7ce3118452c811dcf88a863511d7 (patch) | |
| tree | b4e10154c26d0f94ffc1ea2f5e0828488ff83105 | |
| parent | db5c28fa0e392a68836d9a97bb2add3a94ddb37c (diff) | |
Fix QWizard autotest for Windows 7 Classic theme
QWizard always forced Aero style even if Classic theme was used.
Added a check for Classic theme into initialization.
Task-number: QTBUG-24618
Change-Id: I0793df62e022037835e1c1a311143f06cc4382b4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| -rw-r--r-- | src/widgets/dialogs/qwizard.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 324831ea52..8cd3799cae 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -3141,7 +3141,12 @@ bool QWizard::event(QEvent *event) #if !defined(QT_NO_STYLE_WINDOWSVISTA) else if (event->type() == QEvent::Show && d->vistaInitPending) { d->vistaInitPending = false; - d->wizStyle = AeroStyle; + // Do not force AeroStyle when in Classic theme. + // Note that d->handleAeroStyleChange() needs to be called in any case as it does some + // necessary initialization, like ensures that the Aero specific back button is hidden if + // Aero theme isn't active. + if (QVistaHelper::vistaState() != QVistaHelper::Classic) + d->wizStyle = AeroStyle; d->handleAeroStyleChange(); } else if (d->isVistaThemeEnabled()) { |