Changeset 87682 in vbox

Timestamp:

Feb 10, 2021 12:40:58 PM (4 years ago)

Author:

vboxsync

Message:

VBoxDbg: bugref:9532: Qt 5.15.2 migration: Replacing QDesktopWidget::availableGeometry with QScreen::availableGeometry since former is obsolete; Doing that selectively cause new API is available since Qt 5.10 only.

File:

• trunk/src/VBox/Debugger/VBoxDbgGui.cpp (modified) (2 diffs)

trunk/src/VBox/Debugger/VBoxDbgGui.cpp

@@ -26 +26 @@
 
 #include "VBoxDbgGui.h"
-#include <QDesktopWidget>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+# include <QScreen>
+#else
+# include <QDesktopWidget>
+#endif
 #include <QApplication>
 
@@ -225 +229 @@
 {
     QRect Rct(0, 0, 1600, 1200);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+    QScreen *pScreen = QApplication::screenAt(QPoint(m_x, m_y));
+    if (pScreen)
+        Rct = pScreen->availableGeometry();
+#else
     QDesktopWidget *pDesktop = QApplication::desktop();
     if (pDesktop)
         Rct = pDesktop->availableGeometry(QPoint(m_x, m_y));
+#endif
     m_xDesktop = Rct.x();
     m_yDesktop = Rct.y();