Add proper version+hash appending in about dialog

SeongGino · Dec 6, 2024 · e012fe4 · e012fe4
1 parent 39cca97
commit e012fe4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,6 +13,17 @@ if(NOT NERO_QT_VERSIONS)
     set(NERO_QT_VERSIONS Qt6)
 endif()
 
+option(NERO_VERSION "Sets Nero version number" OFF)
+option(NERO_GITHASH "Sets Nero git hash" OFF)
+
+if(NERO_VERSION)
+    add_compile_definitions(NERO_VERSION="${NERO_VERSION}")
+endif()
+
+if(NERO_GITHASH)
+    add_compile_definitions(NERO_GITHASH="${NERO_GITHASH}")
+endif()
+
 find_package(QT NAMES ${NERO_QT_VERSIONS} COMPONENTS Widgets LinguistTools REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets LinguistTools REQUIRED)
 

diff --git a/src/neromanager.cpp b/src/neromanager.cpp
@@ -881,12 +881,12 @@ void NeroManagerWindow::on_actionAbout_Nero_triggered()
     // TODO: better about screen pls
     QString vInfo;
     #ifdef NERO_VERSION
-    vInfo.append(QString("v%1").arg(NERO_VERSION));
+    vInfo.append(" v" + QString(NERO_VERSION));
     #endif // NERO_VERSION
     #ifdef NERO_GITHASH
-    vInfo.append(QString("-%1").arg(NERO_GITHASH));
+    vInfo.append("-" + QString(NERO_GITHASH));
     #endif // NERO_GITHASH
-    vInfo.append("\nRunning on Qt" +
+    vInfo.append("\nRunning on Qt " +
                  QString::number(QT_VERSION_MAJOR) + '.' +
                  QString::number(QT_VERSION_MINOR) + '.' +
                  QString::number(QT_VERSION_PATCH));