Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: Ia1da879a7bd8f71a649661a1844144dd67d60b3a

2 files changed, 4 insertions, 3 deletions

diff --git a/examples/widgets/widgets/charactermap/mainwindow.cpp b/examples/widgets/widgets/charactermap/mainwindow.cpp
index 25c4503ddb..b0f9705c21 100644
--- a/examples/widgets/widgets/charactermap/mainwindow.cpp
+++ b/examples/widgets/widgets/charactermap/mainwindow.cpp
@@ -64,6 +64,7 @@
 #include <QMenuBar>
 #include <QPlainTextEdit>
 #include <QPushButton>
+#include <QScreen>
 #include <QScrollArea>
 #include <QStatusBar>
 #include <QTextStream>
@@ -302,7 +303,7 @@ QString FontInfoDialog::text() const
 
 void MainWindow::showInfo()
 {
-    const QRect screenGeometry = QApplication::desktop()->screenGeometry(this);
+    const QRect screenGeometry = screen()->geometry();
     FontInfoDialog *dialog = new FontInfoDialog(this);
     dialog->setWindowTitle(tr("Fonts"));
     dialog->setAttribute(Qt::WA_DeleteOnClose);
diff --git a/examples/widgets/widgets/icons/main.cpp b/examples/widgets/widgets/icons/main.cpp
index a045ea765a..632795c18c 100644
--- a/examples/widgets/widgets/icons/main.cpp
+++ b/examples/widgets/widgets/icons/main.cpp
@@ -50,7 +50,7 @@
 
 #include <QApplication>
 #include <QCommandLineParser>
-#include <QDesktopWidget>
+#include <QScreen>
 
 #include "mainwindow.h"
 
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
     if (!commandLineParser.positionalArguments().isEmpty())
         mainWin.loadImages(commandLineParser.positionalArguments());
 
-    const QRect availableGeometry = QApplication::desktop()->availableGeometry(&mainWin);
+    const QRect availableGeometry = mainWin.screen()->availableGeometry();
     mainWin.resize(availableGeometry.width() / 2, availableGeometry.height() * 2 / 3);
     mainWin.move((availableGeometry.width() - mainWin.width()) / 2, (availableGeometry.height() - mainWin.height()) / 2);