Changeset 38567 in vbox

Timestamp:

Aug 30, 2011 11:44:18 AM (14 years ago)

Author:

vboxsync

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

73743

Message:

Config;FE/Qt4: use VBOX_BUILD_PUBLISHER

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (modified) (3 diffs)

trunk/Config.kmk

@@ -4765 +4765 @@
         $(QUIET)$(APPEND) [email protected] '#define VBOX_VENDOR_SHORT "$(VBOX_VENDOR_SHORT)"'
         $(QUIET)$(APPEND) [email protected] '#define VBOX_PRODUCT "$(VBOX_PRODUCT)"'
+        $(QUIET)$(APPEND) [email protected] '#define VBOX_BUILD_PUBLISHER "$(VBOX_BUILD_PUBLISHER)"'
         $(QUIET)$(APPEND) [email protected] '#define VBOX_C_YEAR "$(VBOX_C_YEAR)"'
         $(QUIET)$(APPEND) [email protected] ''

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

@@ -2897 +2897 @@
         /* Configure User Manual downloader: */
         CVirtualBox vbox = vboxGlobal().virtualBox();
-        pDl->addSource(QString("http://download.virtualbox.org/virtualbox/%1/").arg(vbox.GetVersion().remove("_OSE")) + strShortFileName);
+        pDl->addSource(QString("http://download.virtualbox.org/virtualbox/%1/").arg(vbox.GetVersion().remove(VBOX_BUILD_PUBLISHER)) + strShortFileName);
         pDl->addSource(QString("http://download.virtualbox.org/virtualbox/") + strShortFileName);
         pDl->setTarget(strUserManualFileName2);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -46 +46 @@
 /* Global includes */
 #include <iprt/path.h>
-#include <VBox/VMMDev.h>
+#include <VBox/version.h>
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -1487 +1487 @@
     /* Check for the already registered image */
     CVirtualBox vbox = vboxGlobal().virtualBox();
-    QString name = QString("VBoxGuestAdditions_%1.iso").arg(vbox.GetVersion().remove("_OSE"));
+    const QString &name = QString("VBoxGuestAdditions_%1.iso").arg(vbox.GetVersion().remove(VBOX_BUILD_PUBLISHER));
 
     CMediumVector vec = vbox.GetDVDImages();
@@ -1503 +1503 @@
     if (result == QIMessageBox::Yes)
     {
-        QString source = QString("http://download.virtualbox.org/virtualbox/%1/").arg(vbox.GetVersion().remove("_OSE")) + name;
-        QString target = QDir(vboxGlobal().virtualBox().GetHomeFolder()).absoluteFilePath(name);
+        const QString &source = QString("http://download.virtualbox.org/virtualbox/%1/").arg(vbox.GetVersion().remove(VBOX_BUILD_PUBLISHER)) + name;
+        const QString &target = QDir(vboxGlobal().virtualBox().GetHomeFolder()).absoluteFilePath(name);
 
         UIDownloaderAdditions *pDl = UIDownloaderAdditions::create();