diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-05-14 12:45:19 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-05-15 18:46:39 +0200 |
commit | 45cf8da63c419c27e7476f0a929e9d8ba664bfd3 (patch) | |
tree | fa2b36153c67f994b04728064b5db76ed86a028d /src/widgets/kernel/qwidget.cpp | |
parent | 9803ba9b6f74f5ac18220fe145fe1fe4c8f70910 (diff) |
Reduce QDesktopWidget API to bare minimum
The class is documented as obsolete, and the majority of APIs is marked
as deprecated. In this first phase, remove all explicitly deprecated
APIs and trivial implementations.
The test case is complete removed; what's left when code that uses any
of those deprecated methods is removed is not testing anything
meaningful.
For some methods, there is no practical replacement using QScreen yet,
and QDesktopWidget is still used in QWidget internals. Those require
refactoring to only use QScreen before the rest can be removed.
Change-Id: I8f7c968ec566820077221d37b817843758d51d49
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/widgets/kernel/qwidget.cpp')
-rw-r--r-- | src/widgets/kernel/qwidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index a1f5b9a26c..a217ef5352 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -7252,8 +7252,8 @@ bool QWidget::restoreGeometry(const QByteArray &geometry) // ### Qt 6 - Perhaps it makes sense to dumb down the restoreGeometry() logic, see QTBUG-69104 - if (restoredScreenNumber >= QDesktopWidgetPrivate::numScreens()) - restoredScreenNumber = QDesktopWidgetPrivate::primaryScreen(); + if (restoredScreenNumber >= qMax(QGuiApplication::screens().size(), 1)) + restoredScreenNumber = 0; const qreal screenWidthF = qreal(QDesktopWidgetPrivate::screenGeometry(restoredScreenNumber).width()); // Sanity check bailing out when large variations of screen sizes occur due to // high DPI scaling or different levels of DPI awareness. |