summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/widgets/dialogs/qwizard.cpp7
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()) {