diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-18 15:49:07 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-19 09:34:05 +0200 |
| commit | 1ceb48c6a6aa7d718a6abfc7390cde387f990ed9 (patch) | |
| tree | 525069ae6fb74aa03047968cf0af7639bb18c898 /src | |
| parent | cd92049a95e6c762dadf011fad93f5ca151375fa (diff) | |
QWizard/AeroStyle: Fix condition introduced by previous fix
Set the variables within the condition introduced by
6c0e1dba403ce65285e089bf281319de36d29235, as otherwise, the code
might not be executed.
Task-number: QTBUG-78300
Change-Id: Ia83db6fce197ebf16783f3b0c6d6fad7ebd2ba52
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/dialogs/qwizard.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index ccbf8491b3..7b26d9a67a 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -3265,12 +3265,13 @@ bool QWizard::nativeEvent(const QByteArray &eventType, void *message, long *resu MSG *windowsMessage = static_cast<MSG *>(message); const bool winEventResult = d->vistaHelper->handleWinEvent(windowsMessage, result); if (QVistaHelper::vistaState() != d->vistaState) { - d->vistaState = QVistaHelper::vistaState(); - d->vistaStateChanged = true; // QTBUG-78300: When Qt::AA_NativeWindows is set, delay further // window creation until after the platform window creation events. - if (windowsMessage->message == WM_GETICON) + if (windowsMessage->message == WM_GETICON) { + d->vistaStateChanged = true; + d->vistaState = QVistaHelper::vistaState(); setWizardStyle(AeroStyle); + } } return winEventResult; } else { |