diff options
author | Liang Qi <liang.qi@qt.io> | 2019-03-30 21:52:42 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-04-01 13:48:48 +0000 |
commit | ad313595e0662fa2e91676feef65aad5b4525a86 (patch) | |
tree | 1f420ccf6ff754457d8fd063c7adc6fdc59c5f1c /src/gui/kernel/qplatformintegration.h | |
parent | a49c5648919a0bd2d8206ae7fb5033c9f84e0a86 (diff) |
Revert "Revert "Remove deprecated screen maintenance functions in QPlatformIntegration""
This reverts commit 300940a6c9eb0f74cefda7d76a5d19f56ec50253.
The fixes for leaf modules landed already.
Task-number: QTBUG-74816
Change-Id: I1c7f0705c20d030419ceedca485106af73946b3c
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Diffstat (limited to 'src/gui/kernel/qplatformintegration.h')
-rw-r--r-- | src/gui/kernel/qplatformintegration.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/gui/kernel/qplatformintegration.h b/src/gui/kernel/qplatformintegration.h index 048ea1139c..b764bd2617 100644 --- a/src/gui/kernel/qplatformintegration.h +++ b/src/gui/kernel/qplatformintegration.h @@ -192,10 +192,6 @@ public: #endif virtual void setApplicationIcon(const QIcon &icon) const; -#if QT_DEPRECATED_SINCE(5, 12) - QT_DEPRECATED_X("Use QWindowSystemInterface::handleScreenRemoved") void removeScreen(QScreen *screen); -#endif - virtual void beep() const; #if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) @@ -204,12 +200,6 @@ public: protected: QPlatformIntegration() = default; - -#if QT_DEPRECATED_SINCE(5, 12) - QT_DEPRECATED_X("Use QWindowSystemInterface::handleScreenAdded") void screenAdded(QPlatformScreen *screen, bool isPrimary = false); - QT_DEPRECATED_X("Use QWindowSystemInterface::handleScreenRemoved") void destroyScreen(QPlatformScreen *screen); - QT_DEPRECATED_X("Use QWindowSystemInterface::handlePrimaryScreenChanged") void setPrimaryScreen(QPlatformScreen *newPrimary); -#endif }; QT_END_NAMESPACE |