diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2019-03-21 12:01:51 +0100 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2019-03-22 17:19:23 +0000 |
commit | 7a64ffb7738dc975b5008800901c8cd8ab238a0f (patch) | |
tree | 8aedf711560149ca660638de169d525a021873e0 /src/gui/kernel/qplatformintegration.cpp | |
parent | 58a87609a6c963416e2483e57e6f2a80552ec945 (diff) |
Remove deprecated screen maintenance functions in QPlatformIntegration
The logic for removing QScreens from QGuiApplicationPrivate has been
moved into the QScreen destructor, similar to QWindow.
Change-Id: I18ad57d8dcf9f765c47be7c082bf075af3ebe69c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/gui/kernel/qplatformintegration.cpp')
-rw-r--r-- | src/gui/kernel/qplatformintegration.cpp | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/src/gui/kernel/qplatformintegration.cpp b/src/gui/kernel/qplatformintegration.cpp index 6ae6e4a528..490cfc6178 100644 --- a/src/gui/kernel/qplatformintegration.cpp +++ b/src/gui/kernel/qplatformintegration.cpp @@ -462,44 +462,6 @@ QList<int> QPlatformIntegration::possibleKeys(const QKeyEvent *) const return QList<int>(); } -/*! - \deprecated Use QWindowSystemInterface::handleScreenAdded instead. -*/ -void QPlatformIntegration::screenAdded(QPlatformScreen *ps, bool isPrimary) -{ - QWindowSystemInterface::handleScreenAdded(ps, isPrimary); -} - -/*! - \deprecated Use QWindowSystemInterface::handleScreenRemoved instead. -*/ -void QPlatformIntegration::removeScreen(QScreen *screen) -{ - const bool wasPrimary = (!QGuiApplicationPrivate::screen_list.isEmpty() && QGuiApplicationPrivate::screen_list.at(0) == screen); - QGuiApplicationPrivate::screen_list.removeOne(screen); - - QGuiApplicationPrivate::resetCachedDevicePixelRatio(); - - if (wasPrimary && qGuiApp && !QGuiApplicationPrivate::screen_list.isEmpty()) - emit qGuiApp->primaryScreenChanged(QGuiApplicationPrivate::screen_list.at(0)); -} - -/*! - \deprecated Use QWindowSystemInterface::handleScreenRemoved instead. -*/ -void QPlatformIntegration::destroyScreen(QPlatformScreen *platformScreen) -{ - QWindowSystemInterface::handleScreenRemoved(platformScreen); -} - -/*! - \deprecated Use QWindowSystemInterface::handlePrimaryScreenChanged instead. -*/ -void QPlatformIntegration::setPrimaryScreen(QPlatformScreen *newPrimary) -{ - QWindowSystemInterface::handlePrimaryScreenChanged(newPrimary); -} - QStringList QPlatformIntegration::themeNames() const { return QStringList(); |