Changeset 21481 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 10, 2009 2:14:36 PM (16 years ago)

Author:

vboxsync

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

49920

Message:

FE/Qt4: better approach

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (1 diff)
• src/main.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

@@ -266 +266 @@
     bool isValid() { return mValid; }
 
+    static QString qtRTVersionString();
+    static uint qtRTVersion();
+    static QString qtCTVersionString();
+    static uint qtCTVersion();
+
     QString versionString() { return mVerString; }
 

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

@@ -646 +646 @@
     qDeleteAll (mVMStateIcons);
     qDeleteAll (mVMStateColors);
+}
+
+/* static */
+QString VBoxGlobal::qtRTVersionString()
+{
+    return QString::fromLatin1 (qVersion());
+}
+
+/* static */
+uint VBoxGlobal::qtRTVersion()
+{
+    QString rt_ver_str = VBoxGlobal::qtRTVersionString();
+    return (rt_ver_str.section ('.', 0, 0).toInt() << 16) +
+           (rt_ver_str.section ('.', 1, 1).toInt() << 8) +
+           rt_ver_str.section ('.', 2, 2).toInt();
+}
+
+/* static */
+QString VBoxGlobal::qtCTVersionString()
+{
+    return QString::fromLatin1 (QT_VERSION_STR);
+}
+
+/* static */
+uint VBoxGlobal::qtCTVersion()
+{
+    QString ct_ver_str = VBoxGlobal::qtCTVersionString();
+    return (ct_ver_str.section ('.', 0, 0).toInt() << 16) +
+           (ct_ver_str.section ('.', 1, 1).toInt() << 8) +
+           ct_ver_str.section ('.', 2, 2).toInt();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -324 +324 @@
     /* scope the QIApplication variable */
     {
-#if defined(Q_WS_X11) && (QT_VERSION >= 0x040500)
+#ifdef Q_WS_X11
         /* There are some buggy/strange driver/compiz combinations which lead
          * to transparent backgrounds on ARGB visuals. Try to fix it by not
@@ -330 +330 @@
          * restore the original environment, so that others like the OpenGL
          * service will proper work. */
-        RTENV env = NIL_RTENV;
-        char envval[1024];
-        bool found = false;
-        int rc = RTEnvClone (&env, RTENV_DEFAULT);
-        if (RT_SUCCESS (rc))
-        {
-            found = RTEnvGetEx (env, "XLIB_SKIP_ARGB_VISUALS", envval, sizeof(envval), NULL) == VINF_SUCCESS;
-            RTEnvSetEx (env, "XLIB_SKIP_ARGB_VISUALS", "1");
+        char *pchOldVar = NULL;
+        if (!RTEnvExist ("VBOX_NO_ARGB_VISUALS_HACK") &&
+            VBoxGlobal::qtRTVersion() >= 0x040500)
+        {
+            const char *pchVar = RTEnvGet ("XLIB_SKIP_ARGB_VISUALS");
+            if (pchVar)
+                pchOldVar = RTStrDup (pchVar);
+            RTEnvSet ("XLIB_SKIP_ARGB_VISUALS", "1");
         }
         /* Now create the application object */
         QIApplication a (argc, argv);
         /* Restore previous environment */
-        if (env != NIL_RTENV)
-        {
-            if (found)
-                RTEnvSetEx (env, "XLIB_SKIP_ARGB_VISUALS", envval);
-            else
-                RTEnvUnsetEx (env, "XLIB_SKIP_ARGB_VISUALS");
-            RTEnvDestroy (env);
+        if (pchOldVar)
+        {
+            RTEnvSet ("XLIB_SKIP_ARGB_VISUALS", pchOldVar);
+            RTStrFree (pchOldVar);
         }
 #else /* defined(Q_WS_X11) && (QT_VERSION >= 0x040500) */
@@ -422 +419 @@
 #ifdef Q_WS_X11
         /* version check (major.minor are sensitive, fix number is ignored) */
-        QString ver_str = QString::fromLatin1 (QT_VERSION_STR);
-        QString ver_str_base = ver_str.section ('.', 0, 1);
-        QString rt_ver_str = QString::fromLatin1 (qVersion());
-        uint ver =
-            (ver_str.section ('.', 0, 0).toInt() << 16) +
-            (ver_str.section ('.', 1, 1).toInt() << 8) +
-            ver_str.section ('.', 2, 2).toInt();
-        uint rt_ver =
-            (rt_ver_str.section ('.', 0, 0).toInt() << 16) +
-            (rt_ver_str.section ('.', 1, 1).toInt() << 8) +
-            rt_ver_str.section ('.', 2, 2).toInt();
-        if (rt_ver < (ver & 0xFFFF00))
+        if (VBoxGlobal::qtRTVersion() < (VBoxGlobal::qtCTVersion() & 0xFFFF00))
         {
             QString msg =
                 QApplication::tr ("Executable <b>%1</b> requires Qt %2.x, found Qt %3.")
                                   .arg (qAppName())
-                                  .arg (ver_str_base)
-                                  .arg (rt_ver_str);
+                                  .arg (VBoxGlobal::qtCTVersionString().section ('.', 0, 1))
+                                  .arg (VBoxGlobal::qtRTVersionString());
             QMessageBox::critical (
                 0, QApplication::tr ("Incompatible Qt Library Error"),