diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-21 01:00:45 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-21 01:00:46 +0200 |
| commit | eb5f02c5cc493d88bd9ff20cbf2b6ed531229263 (patch) | |
| tree | 0ddc2d2f4077db3c42a4d8cbee5c7c3554880162 /src/widgets | |
| parent | 580572f3c9cb77283e63a58386002407957d7309 (diff) | |
| parent | f155c40fdc0b7bbc12804ba77c00e217ba6c2bb3 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ib615dbfd783c5a3cf0f130ff82965382ce5cfb5a
Diffstat (limited to 'src/widgets')
| -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 { |