diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-10 09:55:40 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-10 10:11:42 +0200 |
| commit | 3ef581afdc31884f4a094c89c86df91f1a46bacf (patch) | |
| tree | 6ce57df9d9aff621fe9f7bb84e586e051348db4e /src/designer/src/lib | |
| parent | 6dc3a87b117102b93faa8e79c274f45f43add9b3 (diff) | |
| download | qttools-3ef581afdc31884f4a094c89c86df91f1a46bacf.tar.gz | |
Remove more usages of QDesktopWidget
Change-Id: I678bceedd7374e3a0a9fab79f03259836cab0c0d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/designer/src/lib')
| -rw-r--r-- | src/designer/src/lib/shared/deviceprofile.cpp | 9 | ||||
| -rw-r--r-- | src/designer/src/lib/shared/newformwidget.cpp | 1 | ||||
| -rw-r--r-- | src/designer/src/lib/shared/selectsignaldialog.cpp | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/designer/src/lib/shared/deviceprofile.cpp b/src/designer/src/lib/shared/deviceprofile.cpp index c2df77ffd..ef12fd571 100644 --- a/src/designer/src/lib/shared/deviceprofile.cpp +++ b/src/designer/src/lib/shared/deviceprofile.cpp @@ -34,11 +34,12 @@ #include <QtWidgets/qapplication.h> #include <QtGui/qfont.h> -#include <QtWidgets/qdesktopwidget.h> #include <QtWidgets/qstyle.h> #include <QtWidgets/qstylefactory.h> #include <QtWidgets/qapplication.h> +#include <QtGui/qscreen.h> + #include <QtCore/qshareddata.h> #include <QtCore/qtextstream.h> @@ -202,9 +203,9 @@ void DeviceProfile::setName(const QString &n) void DeviceProfile::systemResolution(int *dpiX, int *dpiY) { - const QDesktopWidget *dw = qApp->desktop(); - *dpiX = dw->logicalDpiX(); - *dpiY = dw->logicalDpiY(); + auto s = qApp->primaryScreen(); + *dpiX = s->logicalDotsPerInchX(); + *dpiY = s->logicalDotsPerInchY(); } class FriendlyWidget : public QWidget { diff --git a/src/designer/src/lib/shared/newformwidget.cpp b/src/designer/src/lib/shared/newformwidget.cpp index f5cae7fca..bef697266 100644 --- a/src/designer/src/lib/shared/newformwidget.cpp +++ b/src/designer/src/lib/shared/newformwidget.cpp @@ -49,7 +49,6 @@ #include <QtCore/qtextstream.h> #include <QtWidgets/qapplication.h> -#include <QtWidgets/qdesktopwidget.h> #include <QtWidgets/qheaderview.h> #include <QtWidgets/qtreewidget.h> #include <QtGui/qpainter.h> diff --git a/src/designer/src/lib/shared/selectsignaldialog.cpp b/src/designer/src/lib/shared/selectsignaldialog.cpp index 3e4dbe100..576dd0bdb 100644 --- a/src/designer/src/lib/shared/selectsignaldialog.cpp +++ b/src/designer/src/lib/shared/selectsignaldialog.cpp @@ -38,7 +38,6 @@ #include "widgetdatabase_p.h" #include <QtWidgets/qapplication.h> -#include <QtWidgets/qdesktopwidget.h> #include <QtWidgets/qpushbutton.h> #include <QtGui/qscreen.h> |