diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 505a9cc..af6d3df 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -129,7 +129,7 @@ ob_add_cpp_vars(${APP_TARGET_NAME} NAME "project_vars" PREFIX "PROJECT_" VARS - VERSION_STR "\"${PROJECT_VERSION}\"" + VERSION_STR "\"${PROJECT_VERSION_VERBOSE}\"" SHORT_NAME "\"${APP_ALIAS_NAME}\"" TARGET_FP_VER_PFX_STR "\"${TARGET_FP_VERSION_PREFIX}\"" APP_NAME "\"${PROJECT_FORMAL_NAME}\"" diff --git a/app/src/command/c-update.cpp b/app/src/command/c-update.cpp index 4954c07..80e97e1 100644 --- a/app/src/command/c-update.cpp +++ b/app/src/command/c-update.cpp @@ -264,7 +264,7 @@ CUpdateError CUpdate::checkAndPrepareUpdate() const return ue; // Check if newer - QVersionNumber currentVersion = QVersionNumber::fromString(QCoreApplication::applicationVersion()); + QVersionNumber currentVersion = QVersionNumber::fromString(QCoreApplication::applicationVersion().mid(1)); // Drops 'v' Q_ASSERT(!currentVersion.isNull()); QVersionNumber newVersion = QVersionNumber::fromString(rd.tag_name.mid(1)); // Drops 'v' if(newVersion.isNull()) diff --git a/app/src/kernel/core.h b/app/src/kernel/core.h index ef559e1..227e5fe 100644 --- a/app/src/kernel/core.h +++ b/app/src/kernel/core.h @@ -216,7 +216,7 @@ class Core : public QObject static inline const QString HELP_COMMAND_TEMPL = u"
%1:  %2"_s; // Command line messages - static inline const QString CL_VERSION_MESSAGE = u"CLI Flashpoint version " PROJECT_VERSION_STR ", designed for use with Flashpoint Archive " PROJECT_TARGET_FP_VER_PFX_STR " series"_s; + static inline const QString CL_VERSION_MESSAGE = u"CLI Flashpoint " PROJECT_VERSION_STR ", designed for use with Flashpoint Archive " PROJECT_TARGET_FP_VER_PFX_STR " series"_s; // Input strings static inline const QString MULTI_TITLE_SEL_CAP = u"Title Disambiguation"_s;