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

Fix QWizard autotest for Windows 7 Classic theme

Browse Source 
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>
This commit is contained in:
Miikka Heikkinen 2012-03-02 13:47:47 +02:00 committed by Qt by Nokia
parent db5c28fa0e
commit db1aa6dd99
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/widgets/dialogs/qwizard.cpp
View File

@ -3141,7 +3141,12 @@ bool QWizard::event(QEvent *event)
#if !defined(QT_NO_STYLE_WINDOWSVISTA) #if !defined(QT_NO_STYLE_WINDOWSVISTA)
else if (event->type() == QEvent::Show && d->vistaInitPending) { else if (event->type() == QEvent::Show && d->vistaInitPending) {
d->vistaInitPending = false; 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(); d->handleAeroStyleChange();
} }
else if (d->isVistaThemeEnabled()) { else if (d->isVistaThemeEnabled()) {