diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-19 09:48:10 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-19 09:48:10 +0100 |
commit | 739585b2f5684956d9c5b999300b4b7b2cd0daa3 (patch) | |
tree | c785232d461328db1a2a8e85748e75e402ed8a08 /src/widgets | |
parent | 0ffc39806e4669eaebe2d20d197b3a6f356be862 (diff) | |
parent | 13f6eb9773c0a4c64da7070be4ac3bbf66f8c82d (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/corelib/io/qprocess_win.cpp
Change-Id: Ib61b74a69922ec1e9eecbba5f75352b4ec167fa9
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/kernel/qwidget.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 680c179bd9..a973bee2cd 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -1482,7 +1482,8 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO if (q->windowType() != Qt::Desktop || q->testAttribute(Qt::WA_NativeWindow)) { win->create(); // Enable nonclient-area events for QDockWidget and other NonClientArea-mouse event processing. - win->handle()->setFrameStrutEventsEnabled(true); + if (QPlatformWindow *platformWindow = win->handle()) + platformWindow->setFrameStrutEventsEnabled(true); } data.window_flags = win->flags(); |