Changeset 72679 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 25, 2018 2:51:05 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

123194

Message:

FE/Qt: bugref:9197 Some corrections for r123193

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QISplitter.cpp (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QISplitter.cpp

@@ -28 +28 @@
 /* GUI includes: */
 # include "QISplitter.h"
+# include "VBoxGlobal.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -348 +348 @@
 
 /* static */
-uint VBoxGlobal::qtRTMajorVersion()
-{
-    QString rt_ver_str("5.11");// = VBoxGlobal::qtRTVersionString();
-    return rt_ver_str.section ('.', 0, 0).toInt();
-}
-
-/* static */
-uint VBoxGlobal::qtRTMinorVersion()
-{
-    QString rt_ver_str("5.11");// = VBoxGlobal::qtRTVersionString();
-    return rt_ver_str.section ('.', 1, 1).toInt();
-}
-
-/* static */
-uint VBoxGlobal::qtRTRevisionNumber()
-{
-    QString rt_ver_str("5.11");// = VBoxGlobal::qtRTVersionString();
-    return rt_ver_str.section ('.', 2, 2).toInt();
-}
-
-/* static */
 QString VBoxGlobal::qtRTVersionString()
 {
@@ -381 +360 @@
            (strVersionRT.section('.', 1, 1).toInt() << 8) +
            strVersionRT.section('.', 2, 2).toInt();
+}
+
+/* static */
+uint VBoxGlobal::qtRTMajorVersion()
+{
+    return VBoxGlobal::qtRTVersionString().section('.', 0, 0).toInt();
+}
+
+/* static */
+uint VBoxGlobal::qtRTMinorVersion()
+{
+    return VBoxGlobal::qtRTVersionString().section('.', 1, 1).toInt();
+}
+
+/* static */
+uint VBoxGlobal::qtRTRevisionNumber()
+{
+    return VBoxGlobal::qtRTVersionString().section('.', 2, 2).toInt();
 }
 
@@ -1813 +1810 @@
 
 #ifdef VBOX_WS_X11
-    /* As reported in #9197, in X11 QWidget::setCursor(..) call uses RENDER
+    /* As reported in https://www.virtualbox.org/ticket/16348,
+     * in X11 QWidget::setCursor(..) call uses RENDER
      * extension. Qt (before 5.11) fails to handle the case where the mentioned extension
      * is missing. Please see https://codereview.qt-project.org/#/c/225665/ for Qt patch: */
@@ -1834 +1832 @@
 void VBoxGlobal::setCursor(QGraphicsWidget *pWidget, const QCursor &cursor)
 {
-
     if (!pWidget)
         return;
 
 #ifdef VBOX_WS_X11
-    /* As reported in #9197, in X11 QGraphicsWidget::setCursor(..) call uses RENDER
+    /* As reported in https://www.virtualbox.org/ticket/16348,
+     * in X11 QGraphicsWidget::setCursor(..) call uses RENDER
      * extension. Qt (before 5.11) fails to handle the case where the mentioned extension
      * is missing. Please see https://codereview.qt-project.org/#/c/225665/ for Qt patch: */
-    if ((VBoxGlobal::qtRTMajorVersion() < 5) ||
+     if ((VBoxGlobal::qtRTMajorVersion() < 5) ||
         (VBoxGlobal::qtRTMajorVersion() == 5 && VBoxGlobal::qtRTMinorVersion() < 11))
     {