diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-03-29 10:11:27 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-03-29 20:55:24 +0000 |
| commit | 300940a6c9eb0f74cefda7d76a5d19f56ec50253 (patch) | |
| tree | b17f5a6f4289890872a17e29f682d46e302b69cd /src/gui/kernel/qwindowsysteminterface.cpp | |
| parent | 6ed2ea86db63c72a38a60543da5a95d3543d39b1 (diff) | |
Revert "Remove deprecated screen maintenance functions in QPlatformIntegration"
This reverts commit 7a64ffb7738dc975b5008800901c8cd8ab238a0f.
This change landed in 5.13 too early, so there is no baseline with both APIs in
dev. This will be reverted later when the fixes for leaf modules landed.
Task-number: QTBUG-74816
Change-Id: Ie5ee41fbf6be53b8fcb4289ac1ec3974e5bf6e42
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Diffstat (limited to 'src/gui/kernel/qwindowsysteminterface.cpp')
| -rw-r--r-- | src/gui/kernel/qwindowsysteminterface.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp index 6f3edb10b4..2b40b2d4d0 100644 --- a/src/gui/kernel/qwindowsysteminterface.cpp +++ b/src/gui/kernel/qwindowsysteminterface.cpp @@ -818,6 +818,11 @@ void QWindowSystemInterface::handleScreenAdded(QPlatformScreen *ps, bool isPrima */ void QWindowSystemInterface::handleScreenRemoved(QPlatformScreen *platformScreen) { +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED + QGuiApplicationPrivate::platformIntegration()->removeScreen(platformScreen->screen()); +QT_WARNING_POP + // Important to keep this order since the QSceen doesn't own the platform screen delete platformScreen->screen(); delete platformScreen; |