diff options
| -rw-r--r-- | src/designer/src/designer/qdesigner_actions.cpp | 1 | ||||
| -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 | ||||
| -rw-r--r-- | src/linguist/linguist/mainwindow.cpp | 4 |
5 files changed, 7 insertions, 9 deletions
diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp index cf404d51c..e0a7d7136 100644 --- a/src/designer/src/designer/qdesigner_actions.cpp +++ b/src/designer/src/designer/qdesigner_actions.cpp @@ -67,7 +67,6 @@ #include <QtWidgets/qmdisubwindow.h> #include <QtWidgets/qpushbutton.h> #include <QtWidgets/qstatusbar.h> -#include <QtWidgets/qdesktopwidget.h> #include <QtGui/qaction.h> #include <QtGui/qactiongroup.h> 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> diff --git a/src/linguist/linguist/mainwindow.cpp b/src/linguist/linguist/mainwindow.cpp index 5f4558150..5c6c3edfa 100644 --- a/src/linguist/linguist/mainwindow.cpp +++ b/src/linguist/linguist/mainwindow.cpp @@ -54,7 +54,6 @@ #include <QBitmap> #include <QCloseEvent> #include <QDebug> -#include <QDesktopWidget> #include <QDockWidget> #include <QFile> #include <QFileDialog> @@ -73,6 +72,7 @@ #include <QPrinter> #include <QProcess> #include <QRegularExpression> +#include <QScreen> #include <QSettings> #include <QSortFilterProxyModel> #include <QStackedWidget> @@ -486,7 +486,7 @@ MainWindow::MainWindow() connect(m_translateDialog, SIGNAL(requestMatchUpdate(bool&)), SLOT(updateTranslateHit(bool&))); connect(m_translateDialog, SIGNAL(activated(int)), SLOT(translate(int))); - QSize as(qApp->desktop()->size()); + QSize as(screen()->size()); as -= QSize(30, 30); resize(QSize(1000, 800).boundedTo(as)); show(); |