diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-22 22:28:32 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-22 22:28:33 +0200 |
| commit | c0f7cc3a3cc3f06b09591f25277f8083b3a55581 (patch) | |
| tree | ecf3d3f49d6dc85b55fbdbe999e386ceda31ef39 /src/widgets/dialogs/qwizard.cpp | |
| parent | 139240ac671953f0763308f235d8b868c1efe1b1 (diff) | |
| parent | aa6d7dd7ee306c0adbcd42b013d1e749072205bb (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ic274a375d6fc1312ced2354e034dc0980dd47c51
Diffstat (limited to 'src/widgets/dialogs/qwizard.cpp')
| -rw-r--r-- | src/widgets/dialogs/qwizard.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 7558054da5..5752e218c2 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -3271,9 +3271,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; - setWizardStyle(AeroStyle); + // QTBUG-78300: When Qt::AA_NativeWindows is set, delay further + // window creation until after the platform window creation events. + if (windowsMessage->message == WM_GETICON) { + d->vistaStateChanged = true; + d->vistaState = QVistaHelper::vistaState(); + setWizardStyle(AeroStyle); + } } return winEventResult; } else { |