Fix deprecated/removed code

- Port away from QDesktopWidget
- Use QFontMetrics::horizontalAdvance() instead of width()

Change-Id: I5d721fa574356a27e414545d6b9b2d28d400080b
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 55b91dc4714d36d457fbfa32bc6b412415362430)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

2 files changed, 3 insertions, 3 deletions

diff --git a/examples/activeqt/hierarchy/objects.cpp b/examples/activeqt/hierarchy/objects.cpp
index c28cd85..af9d966 100644
--- a/examples/activeqt/hierarchy/objects.cpp
+++ b/examples/activeqt/hierarchy/objects.cpp
@@ -104,7 +104,7 @@ QString QSubWidget::label() const
 QSize QSubWidget::sizeHint() const
 {
     QFontMetrics fm(font());
-    return QSize(fm.width(m_label), fm.height());
+    return QSize(fm.horizontalAdvance(m_label), fm.height());
 }
 
 void QSubWidget::paintEvent(QPaintEvent *)
diff --git a/examples/activeqt/mediaplayer/main.cpp b/examples/activeqt/mediaplayer/main.cpp
index c20f262..2f84d83 100644
--- a/examples/activeqt/mediaplayer/main.cpp
+++ b/examples/activeqt/mediaplayer/main.cpp
@@ -51,7 +51,7 @@
 #include <QApplication>
 #include <QMessageBox>
 #include <QMainWindow>
-#include <QDesktopWidget>
+#include <QScreen>
 #include <QVariant>
 #include <QSettings>
 #include <QFileDialog>
@@ -90,7 +90,7 @@ MainWindow::MainWindow()
 
     const QByteArray restoredGeometry = settings.value(QLatin1String(geometryKey)).toByteArray();
     if (restoredGeometry.isEmpty() || !restoreGeometry(restoredGeometry)) {
-        const QRect availableGeometry = QApplication::desktop()->availableGeometry(this);
+        const QRect availableGeometry = screen()->availableGeometry();
         const QSize size = (availableGeometry.size() * 4) / 5;
         resize(size);
         move(availableGeometry.center() - QPoint(size.width(), size.height()) / 2);