From 2617711cf97e5d507b1f9b566b653fc4b9a6d613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Tue, 18 Jun 2024 14:59:57 +0200 Subject: [PATCH] Revert "Add "RELEASE_NAME" env variable." This reverts commit a0747b291288c4b4d86411de0a8e8825e6d2a503. Conflicts: cmake/templates/BuildInfo.h.in interface/src/Application.cpp --- cmake/macros/SetPackagingParameters.cmake | 1 - cmake/templates/BuildInfo.h.in | 1 - interface/src/Application.cpp | 4 ---- 3 files changed, 6 deletions(-) diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake index 0ae25f6651..4d2cac7b3e 100644 --- a/cmake/macros/SetPackagingParameters.cmake +++ b/cmake/macros/SetPackagingParameters.cmake @@ -23,7 +23,6 @@ macro(SET_PACKAGING_PARAMETERS) set_from_env(RELEASE_TYPE RELEASE_TYPE "DEV") set_from_env(RELEASE_NUMBER RELEASE_NUMBER "") - set_from_env(RELEASE_NAME RELEASE_NAME "") set_from_env(STABLE_BUILD STABLE_BUILD 0) set_from_env(PRELOADED_STARTUP_LOCATION PRELOADED_STARTUP_LOCATION "") diff --git a/cmake/templates/BuildInfo.h.in b/cmake/templates/BuildInfo.h.in index 767807b41b..25541efb17 100644 --- a/cmake/templates/BuildInfo.h.in +++ b/cmake/templates/BuildInfo.h.in @@ -25,7 +25,6 @@ namespace BuildInfo { const QString MODIFIED_ORGANIZATION = "@BUILD_ORGANIZATION@"; const QString ORGANIZATION_DOMAIN = "overte.org"; const QString VERSION = "@BUILD_VERSION@"; - const QString RELEASE_NAME = "@RELEASE_NAME@"; const QString BUILD_NUMBER = "@BUILD_NUMBER@"; const QString BUILD_GLOBAL_SERVICES = "@BUILD_GLOBAL_SERVICES@"; const QString BUILD_TIME = "@BUILD_TIME@"; diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 8d99e41668..62e6aef46f 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -7251,10 +7251,6 @@ void Application::updateWindowTitle() const { + (BuildInfo::BUILD_TYPE == BuildInfo::BuildType::Stable ? QString("Version") : QString("Build")) + " " + applicationVersion(); - if (BuildInfo::RELEASE_NAME != "") { - buildVersion += " - " + BuildInfo::RELEASE_NAME; - } - QString connectionStatus = isInErrorState ? " (ERROR CONNECTING)" : nodeList->getDomainHandler().isConnected() ? "" : " (NOT CONNECTED)";