Changeset 104054 in vbox

Timestamp:

Mar 26, 2024 8:52:58 AM (8 months ago)

Author:

vboxsync

Message:

Version.kmk, FE/Qt: Remove explicit BETA label from the build, and keep the Dev Preview marker on all ARM builds (independent of OS).

Location:

trunk

Files:

• Version.kmk (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/globals/UIVersion.cpp (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp (modified) (1 diff)

trunk/Version.kmk

@@ -45 +45 @@
 VBOX_RELEASE_EXACT_MATCH =
 
-# darwin.arm64 will remain BETA for quite a while.
-if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.arm64)
- if $(VBOX_VERSION_BUILD) % 2 == 0
-  ifeq ($(VBOX_VERSION_PRERELEASE),)
-   VBOX_RELEASE_EXACT_MATCH := 1
-  endif
- endif
- VBOX_VERSION_PRERELEASE := BETA5
-endif
-
 # Fallback revision when there is no other source. See Config.kmk.
 VBOX_SVN_REV_VERSION_FALLBACK := $(patsubst %:,,  $Rev$  )

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

@@ -211 +211 @@
 bool UIVersionInfo::isBeta()
 {
+#if defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
+    return true;
+#else
     return vboxVersionString().contains(QRegularExpression("BETA|ALPHA", QRegularExpression::CaseInsensitiveOption));
+#endif
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

@@ -677 +677 @@
                         m_pToolBar->setContextMenuPolicy(Qt::CustomContextMenu);
                         m_pToolBar->setUseTextLabels(true);
-#ifdef VBOX_WS_MAC
-                        m_pToolBar->emulateMacToolbar();
+#if defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
                         /* Branding stuff for Qt6 beta: */
                         if (UIVersionInfo::showBetaLabel())
+                        {
+# ifdef VBOX_WS_MAC
+                            m_pToolBar->emulateMacToolbar();
+# endif /* VBOX_WS_MAC */
                             m_pToolBar->enableBranding(UIIconPool::iconSet(":/explosion_hazard_32px.png"),
                                                        "Dev Preview", // do we need to make it NLS?
                                                        QColor(246, 179, 0),
                                                        74 /* width of BETA label */);
-#endif /* VBOX_WS_MAC */
+                        }
+#endif /* defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32) */
 
                         /* Add toolbar into layout: */