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

Timestamp:

Aug 25, 2009 2:26:49 PM (16 years ago)

Author:

vboxsync

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

51430

Message:

beb: more fixes

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• include/VBoxProblemReporter.h (modified) (1 diff)
• src/VBoxProblemReporter.cpp (modified) (1 diff)
• src/main.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -206 +206 @@
     VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\"
 VirtualBox_src/VBoxAboutDlg.cpp_DEFS += \
+    VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\"
+VirtualBox_src/main.cpp_DEFS += \
     VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\"
 VirtualBox_src/VBoxConsoleWnd.cpp_DEPS += $(VBOX_VERSION_MK) $(VBOX_SVN_REV_KMK)

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

@@ -155 +155 @@
     /* Special problem handlers */
     void showBETAWarning();
+    void showBEBWarning();
 
 #ifdef Q_WS_X11

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

@@ -353 +353 @@
 }
 
+void VBoxProblemReporter::showBEBWarning()
+{
+    message
+        (0, Warning,
+         tr ("You are running an EXPERIMENTAL build of VirtualBox. "
+             "This version is not suitable for production use."));
+}
+
 #ifdef Q_WS_X11
 void VBoxProblemReporter::cannotFindLicenseFiles (const QString &aPath)

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

@@ -491 +491 @@
             else
             {
-#ifndef DEBUG
+#ifdef VBOX_BLEEDING_EDGE
+                vboxProblem().showBEBWarning();
+#else
+# ifndef DEBUG
                 /* Check for BETA version */
                 QString vboxVersion (vboxGlobal().virtualBox().GetVersion());
                 if (vboxVersion.contains ("BETA"))
                     vboxProblem().showBETAWarning();
+# endif
 #endif