From bdcf770de62b3bbc7158543852393ebafed04ab5 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Mon, 28 Oct 2024 17:49:24 -0400 Subject: [PATCH] build: rm DESKFLOW_VERSION_URL define --- cmake/Definitions.cmake | 6 ------ src/lib/gui/env_vars.h | 5 +---- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/cmake/Definitions.cmake b/cmake/Definitions.cmake index e53ec4a4a..bb828c5d6 100644 --- a/cmake/Definitions.cmake +++ b/cmake/Definitions.cmake @@ -54,10 +54,6 @@ endmacro() macro(configure_meta) - set(DESKFLOW_VERSION_URL - "https://api.deskflow.org/version" - CACHE STRING "URL to get the latest version") - set(DESKFLOW_HELP_TEXT "Report a bug" CACHE STRING "Text label for the help menu item") @@ -74,14 +70,12 @@ macro(configure_meta) true CACHE BOOL "Show developer thanks message") - message(VERBOSE "Version URL: ${DESKFLOW_VERSION_URL}") message(VERBOSE "Help text: ${DESKFLOW_HELP_TEXT}") message(VERBOSE "Res dir: ${DESKFLOW_DEPLOY_RES_DIR}") message(VERBOSE "Mac bundle code: ${DESKFLOW_MAC_BUNDLE_CODE}") message(VERBOSE "Show dev thanks: ${DESKFLOW_SHOW_DEV_THANKS}") # TODO: We need to move this to configure_file() in the future, which is much cleaner. - add_definitions(-DDESKFLOW_VERSION_URL="${DESKFLOW_VERSION_URL}") add_definitions(-DDESKFLOW_HELP_TEXT="${DESKFLOW_HELP_TEXT}") if(DESKFLOW_SHOW_DEV_THANKS) diff --git a/src/lib/gui/env_vars.h b/src/lib/gui/env_vars.h index 1bf6df3dd..ef2621661 100644 --- a/src/lib/gui/env_vars.h +++ b/src/lib/gui/env_vars.h @@ -23,10 +23,7 @@ namespace deskflow::gui::env_vars { inline QString versionUrl() { - if (QString(DESKFLOW_VERSION_URL).isEmpty()) { - qFatal("version url is not set"); - } - return qEnvironmentVariable("DESKFLOW_VERSION_URL", DESKFLOW_VERSION_URL); + return qEnvironmentVariable("DESKFLOW_VERSION_URL", QStringLiteral("https://api.deskflow.org/version")); } } // namespace deskflow::gui::env_vars