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

QWizard/AeroStyle: Fix condition introduced by previous fix

Browse Source 
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>
This commit is contained in:
Friedemann Kleint 2019-09-18 15:49:07 +02:00
parent cd92049a95
commit 1ceb48c6a6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 {