Changeset 39373 in vbox

Timestamp:

Nov 18, 2011 5:08:40 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: fixed extpack version test for non-obvious versions

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• net/UIUpdateManager.cpp (modified) (1 diff)
• settings/global/UIGlobalSettingsExtension.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp

@@ -276 +276 @@
         /* Get extension pack version: */
         QString strExtPackVersion(extPack.GetVersion().remove(VBOX_BUILD_PUBLISHER));
-        VBoxVersion extPackVersion(strExtPackVersion);
+        QStringList strExtPackVersionParts = strExtPackVersion.split(QRegExp("[-_]"), QString::SkipEmptyParts);
+        VBoxVersion extPackVersion(strExtPackVersionParts[0]);
         /* Check if extension pack version less than required: */
         if ((vboxVersion.z() % 2 != 0) /* Skip unstable VBox version */ ||

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp

@@ -53 +53 @@
         QString strVersion(m_data.m_strVersion.section(QRegExp("[-_]"), 0, 0));
         QString strAppend;
-        /* workaround for http://qt.gitorious.org/qt/qt/commit/7fc63dd0ff368a637dcd17e692b9d6b26278b538this */
+        /* workaround for http://qt.gitorious.org/qt/qt/commit/7fc63dd0ff368a637dcd17e692b9d6b26278b538 */
         if (m_data.m_strVersion.contains(QRegExp("[-_]")))
             strAppend = m_data.m_strVersion.section(QRegExp("[-_]"), 1, -1, QString::SectionIncludeLeadingSep);
@@ -142 +142 @@
     QString strVersion(extPackFile.GetVersion().section(QRegExp("[-_]"), 0, 0));
     QString strAppend;
-    /* workaround for http://qt.gitorious.org/qt/qt/commit/7fc63dd0ff368a637dcd17e692b9d6b26278b538this */
+    /* workaround for http://qt.gitorious.org/qt/qt/commit/7fc63dd0ff368a637dcd17e692b9d6b26278b538 */
     if (extPackFile.GetVersion().contains(QRegExp("[-_]")))
         strAppend = extPackFile.GetVersion().section(QRegExp("[-_]"), 1, -1, QString::SectionIncludeLeadingSep);
@@ -158 +158 @@
         QString strVersionCur(extPackCur.GetVersion().section(QRegExp("[-_]"), 0, 0));
         QString strAppendCur;
-        /* workaround for http://qt.gitorious.org/qt/qt/commit/7fc63dd0ff368a637dcd17e692b9d6b26278b538this */
+        /* workaround for http://qt.gitorious.org/qt/qt/commit/7fc63dd0ff368a637dcd17e692b9d6b26278b538 */
         if (extPackCur.GetVersion().contains(QRegExp("[-_]")))
             strAppendCur = extPackCur.GetVersion().section(QRegExp("[-_]"), 1, -1, QString::SectionIncludeLeadingSep);