diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-06 01:00:58 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-02-06 11:10:34 +0100 |
| commit | 8ce0ad805d59da7be377233874a2783303f381f8 (patch) | |
| tree | a8d35d76f0d8ad775958c8a7ae16bcd41e6ee7e2 /src/widgets/kernel | |
| parent | 74a2467edd1bf0800cbaf1878984c6bccd42570d (diff) | |
| parent | d29aaf598ab565600af2619d91e05459f7bad0aa (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/network/ssl/qsslsocket_openssl_symbols.cpp
Change-Id: I8c13b5c48a8ecce96540b39c6d5f8ca146eb2339
Diffstat (limited to 'src/widgets/kernel')
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index f45f1bdc31..fdad879209 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -2350,7 +2350,9 @@ QWidget *QWidget::find(WId id) */ WId QWidget::winId() const { - if (!testAttribute(Qt::WA_WState_Created) || !internalWinId()) { + if (!data->in_destructor + && (!testAttribute(Qt::WA_WState_Created) || !internalWinId())) + { #ifdef ALIEN_DEBUG qDebug() << "QWidget::winId: creating native window for" << this; #endif |