Use DEV_BUILD define instead of env

story-apps · Apr 24, 2022 · 95b69bb · 95b69bb
1 parent a4e1bea
commit 95b69bb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/build_starc_app.yml b/.github/workflows/build_starc_app.yml
@@ -51,12 +51,11 @@ jobs:
         shell: bash
         run: |
           cd src
-          qmake starc.pro
+          qmake starc.pro DEFINES+="DEV_BUILD=$DEV_BUILD"
 
       - name: Build
         shell: bash
         run: |
-          export DEV_BUILD=${{env.DEV_BUILD}}
           cd src
           make -j$(nproc)
 
@@ -127,7 +126,7 @@ jobs:
         shell: bash
         run: |
           cd src
-          qmake starc.pro CONFIG+=release
+          qmake starc.pro CONFIG+=release DEFINES+="DEV_BUILD=$DEV_BUILD"
 
       - name: Build
         run: |
@@ -236,7 +235,7 @@ jobs:
         shell: bash
         run: |
           cd src
-          qmake starc.pro CONFIG+=release
+          qmake starc.pro CONFIG+=release DEFINES+="DEV_BUILD=$DEV_BUILD"
 
       - name: Build
         run: |
@@ -335,7 +334,7 @@ jobs:
         shell: bash
         run: |
           cd src
-          qmake starc.pro
+          qmake starc.pro DEFINES+="DEV_BUILD=$DEV_BUILD"
 
       - name: Build
         shell: bash

diff --git a/src/core/management_layer/application_manager.cpp b/src/core/management_layer/application_manager.cpp
@@ -1414,9 +1414,9 @@ ApplicationManager::ApplicationManager(QObject* _parent)
 
 
     QString applicationVersion = "0.1.5";
-    if (auto devBuild = qgetenv("DEV_BUILD"); !devBuild.isEmpty()) {
-        applicationVersion += QString(" dev %1").arg(devBuild.constData());
-    }
+#if defined(DEV_BUILD) && DEV_BUILD > 0
+    applicationVersion += QString(" dev %1").arg(DEV_BUILD);
+#endif
     QApplication::setApplicationVersion(applicationVersion);
     QApplication::setStyle(new ApplicationStyle(QStyleFactory::create("Fusion")));