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>
This commit is contained in:
parent
db5c28fa0e
commit
db1aa6dd99
@ -3141,6 +3141,11 @@ bool QWizard::event(QEvent *event)
|
||||
#if !defined(QT_NO_STYLE_WINDOWSVISTA)
|
||||
else if (event->type() == QEvent::Show && d->vistaInitPending) {
|
||||
d->vistaInitPending = false;
|
||||
// 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();
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user