Browse Source

remove unneccessary Capacity view, add Commit tag on version

Syping 5 months ago
parent
commit
c34d3331fb

+ 1
- 1
.ci/debian_build.sh View File

@@ -21,7 +21,7 @@ mkdir -p /usr/share/gta5view && \
21 21
 
22 22
 # Starting build
23 23
 cd qt5 && \
24
-qmake -qt=5 -spec linux-clang GTA5SYNC_PREFIX=/usr QMAKE_CXXFLAGS+=-std=gnu++11 ${QMAKE_FLAGS_QT5} DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"${PACKAGE_CODE}\\\\\\\"" "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" DEFINES+=GTA5SYNC_QCONF DEFINES+=GTA5SYNC_TELEMETRY "DEFINES+=GTA5SYNC_TELEMETRY_WEBURL=\\\\\\\"https://dev.syping.de/gta5view-userstats/\\\\\\\"" ../../gta5view.pro && \
24
+qmake -qt=5 -spec linux-clang GTA5SYNC_PREFIX=/usr QMAKE_CXXFLAGS+=-std=gnu++11 ${QMAKE_FLAGS_QT5} DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"${PACKAGE_CODE}\\\\\\\"" "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" "DEFINES+=GTA5SYNC_COMMIT=\\\\\\\"${APPLICATION_COMMIT}\\\\\\\"" DEFINES+=GTA5SYNC_QCONF DEFINES+=GTA5SYNC_TELEMETRY "DEFINES+=GTA5SYNC_TELEMETRY_WEBURL=\\\\\\\"https://dev.syping.de/gta5view-userstats/\\\\\\\"" ../../gta5view.pro && \
25 25
 make depend && \
26 26
 make -j 4 && \
27 27
 checkinstall -D --default --nodoc --install=no --pkgname=gta5view-qt5 --pkgversion=${PACKAGE_VERSION} --pkgrelease=${PACKAGE_BUILD} --pkggroup=utility --maintainer="Syping \<dpkg@syping.de\>" --requires=libqt5core5a,libqt5gui5,libqt5network5,libqt5widgets5,qttranslations5-l10n --conflicts=gta5view,gta5view-qt4 --replaces=gta5view,gta5view-qt4 --pakdir=${PROJECT_DIR}/assets && \

+ 1
- 1
.ci/debian_docker.sh View File

@@ -12,4 +12,4 @@ docker pull ${DOCKER_IMAGE} && \
12 12
 docker run --rm \
13 13
 	-v "${PROJECT_DIR}:${PROJECT_DIR_DOCKER}" \
14 14
 	${DOCKER_IMAGE} \
15
-	/bin/bash -c "export PROJECT_DIR=${PROJECT_DIR_DOCKER} && export QT_SELECT=${QT_SELECT} && export APPLICATION_VERSION=${APPLICATION_VERSION} && export APT_INSTALL=${APT_INSTALL} && export QMAKE_FLAGS_QT4=${QMAKE_FLAGS_QT4} && export QMAKE_FLAGS_QT5=${QMAKE_FLAGS_QT5} && export PACKAGE_VERSION=${PACKAGE_VERSION} && export PACKAGE_BUILD=${PACKAGE_BUILD} && export PACKAGE_CODE=${PACKAGE_CODE} && export EXECUTABLE_VERSION=${EXECUTABLE_VERSION} && export EXECUTABLE_ARCH=${EXECUTABLE_ARCH} && cd ${PROJECT_DIR_DOCKER} && .ci/debian_install.sh && .ci/debian_build.sh"
15
+	/bin/bash -c "export PROJECT_DIR=${PROJECT_DIR_DOCKER} && export QT_SELECT=${QT_SELECT} && export APPLICATION_VERSION=${APPLICATION_VERSION} && export APPLICATION_COMMIT=${APPLICATION_COMMIT} && export APT_INSTALL=${APT_INSTALL} && export QMAKE_FLAGS_QT4=${QMAKE_FLAGS_QT4} && export QMAKE_FLAGS_QT5=${QMAKE_FLAGS_QT5} && export PACKAGE_VERSION=${PACKAGE_VERSION} && export PACKAGE_BUILD=${PACKAGE_BUILD} && export PACKAGE_CODE=${PACKAGE_CODE} && export EXECUTABLE_VERSION=${EXECUTABLE_VERSION} && export EXECUTABLE_ARCH=${EXECUTABLE_ARCH} && cd ${PROJECT_DIR_DOCKER} && .ci/debian_install.sh && .ci/debian_build.sh"

+ 1
- 1
.ci/osx_build.sh View File

@@ -8,7 +8,7 @@ mkdir -p build && \
8 8
 mkdir -p assets && \
9 9
 cd build && \
10 10
 
11
-/usr/local/opt/qt/bin/qmake ${QMAKE_FLAGS_QT5} DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"${PACKAGE_CODE}\\\\\\\"" "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" DEFINES+=GTA5SYNC_TELEMETRY "DEFINES+=GTA5SYNC_TELEMETRY_WEBURL=\\\\\\\"https://dev.syping.de/gta5view-userstats/\\\\\\\"" ../gta5view.pro && \
11
+/usr/local/opt/qt/bin/qmake ${QMAKE_FLAGS_QT5} DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"${PACKAGE_CODE}\\\\\\\"" "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" "DEFINES+=GTA5SYNC_COMMIT=\\\\\\\"${APPLICATION_COMMIT}\\\\\\\"" DEFINES+=GTA5SYNC_TELEMETRY "DEFINES+=GTA5SYNC_TELEMETRY_WEBURL=\\\\\\\"https://dev.syping.de/gta5view-userstats/\\\\\\\"" ../gta5view.pro && \
12 12
 make depend && \
13 13
 make -j 4 && \
14 14
 /usr/local/opt/qt/bin/macdeployqt gta5view.app -dmg && \

+ 1
- 1
.ci/windows_build.sh View File

@@ -12,7 +12,7 @@ mkdir -p assets && \
12 12
 
13 13
 # Starting build
14 14
 cd build && \
15
-qmake-static ${QMAKE_FLAGS} DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"${PACKAGE_CODE}\\\\\\\"" "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" DEFINES+=GTA5SYNC_TELEMETRY "DEFINES+=GTA5SYNC_TELEMETRY_WEBURL=\\\\\\\"https://dev.syping.de/gta5view-userstats/\\\\\\\"" ../gta5view.pro && \
15
+qmake-static ${QMAKE_FLAGS} DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"${PACKAGE_CODE}\\\\\\\"" "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" "DEFINES+=GTA5SYNC_COMMIT=\\\\\\\"${APPLICATION_COMMIT}\\\\\\\"" DEFINES+=GTA5SYNC_TELEMETRY "DEFINES+=GTA5SYNC_TELEMETRY_WEBURL=\\\\\\\"https://dev.syping.de/gta5view-userstats/\\\\\\\"" ../gta5view.pro && \
16 16
 make depend && \
17 17
 make -j 4 && \
18 18
 cp -Rf release/*.exe ${PROJECT_DIR}/assets/${GTA5VIEW_EXECUTABLE} && \

+ 1
- 1
.ci/windows_docker.sh View File

@@ -9,7 +9,7 @@ docker pull ${DOCKER_IMAGE} && \
9 9
 docker run --rm \
10 10
 	-v "${PROJECT_DIR}:${PROJECT_DIR_DOCKER}" \
11 11
 	${DOCKER_IMAGE} \
12
-	/bin/bash -c "export PROJECT_DIR=${PROJECT_DIR_DOCKER} && export QT_SELECT=${QT_SELECT} && export APPLICATION_VERSION=${APPLICATION_VERSION} && export QMAKE_FLAGS_QT4=${QMAKE_FLAGS_QT4} && export QMAKE_FLAGS_QT5=${QMAKE_FLAGS_QT5} && export PACKAGE_VERSION=${PACKAGE_VERSION} && export PACKAGE_BUILD=${PACKAGE_BUILD} && export PACKAGE_CODE=${PACKAGE_CODE} && export EXECUTABLE_VERSION=${EXECUTABLE_VERSION} && export EXECUTABLE_ARCH=${EXECUTABLE_ARCH} && cd ${PROJECT_DIR_DOCKER} && .ci/windows_build.sh" && \
12
+	/bin/bash -c "export PROJECT_DIR=${PROJECT_DIR_DOCKER} && export QT_SELECT=${QT_SELECT} && export APPLICATION_VERSION=${APPLICATION_VERSION} && export APPLICATION_COMMIT=${APPLICATION_COMMIT} && export QMAKE_FLAGS_QT4=${QMAKE_FLAGS_QT4} && export QMAKE_FLAGS_QT5=${QMAKE_FLAGS_QT5} && export PACKAGE_VERSION=${PACKAGE_VERSION} && export PACKAGE_BUILD=${PACKAGE_BUILD} && export PACKAGE_CODE=${PACKAGE_CODE} && export EXECUTABLE_VERSION=${EXECUTABLE_VERSION} && export EXECUTABLE_ARCH=${EXECUTABLE_ARCH} && cd ${PROJECT_DIR_DOCKER} && .ci/windows_build.sh" && \
13 13
 
14 14
 # Prepare environment variable
15 15
 export GTA5VIEW_EXECUTABLE=gta5view-${EXECUTABLE_VERSION}${EXECUTABLE_ARCH}.exe && \

+ 1
- 1
.ci/wininstall_build.sh View File

@@ -11,7 +11,7 @@ mkdir -p assets && \
11 11
 
12 12
 # Starting build
13 13
 cd build && \
14
-qmake ${QMAKE_FLAGS} DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"${PACKAGE_CODE}\\\\\\\"" "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" DEFINES+=GTA5SYNC_TELEMETRY "DEFINES+=GTA5SYNC_TELEMETRY_WEBURL=\\\\\\\"https://dev.syping.de/gta5view-userstats/\\\\\\\"" DEFINES+=GTA5SYNC_QCONF DEFINES+=GTA5SYNC_INLANG='\\\"RUNDIR:SEPARATOR:lang\\\"' DEFINES+=GTA5SYNC_LANG='\\\"RUNDIR:SEPARATOR:lang\\\"' DEFINES+=GTA5SYNC_PLUG='\\\"RUNDIR:SEPARATOR:plugins\\\"' ../gta5view.pro && \
14
+qmake ${QMAKE_FLAGS} DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"${PACKAGE_CODE}\\\\\\\"" "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" "DEFINES+=GTA5SYNC_COMMIT=\\\\\\\"${APPLICATION_COMMIT}\\\\\\\"" DEFINES+=GTA5SYNC_TELEMETRY "DEFINES+=GTA5SYNC_TELEMETRY_WEBURL=\\\\\\\"https://dev.syping.de/gta5view-userstats/\\\\\\\"" DEFINES+=GTA5SYNC_QCONF DEFINES+=GTA5SYNC_INLANG='\\\"RUNDIR:SEPARATOR:lang\\\"' DEFINES+=GTA5SYNC_LANG='\\\"RUNDIR:SEPARATOR:lang\\\"' DEFINES+=GTA5SYNC_PLUG='\\\"RUNDIR:SEPARATOR:plugins\\\"' ../gta5view.pro && \
15 15
 make depend && \
16 16
 make -j 4 && \
17 17
 cd ${PROJECT_DIR}/assets && \

+ 1
- 1
.ci/wininstall_docker.sh View File

@@ -9,4 +9,4 @@ docker pull ${DOCKER_IMAGE} && \
9 9
 docker run --rm \
10 10
 	-v "${PROJECT_DIR}:${PROJECT_DIR_DOCKER}" \
11 11
 	${DOCKER_IMAGE} \
12
-	/bin/bash -c "export PROJECT_DIR=${PROJECT_DIR_DOCKER} && export QT_SELECT=${QT_SELECT} && export APPLICATION_VERSION=${APPLICATION_VERSION} && export QMAKE_FLAGS_QT4=${QMAKE_FLAGS_QT4} && export QMAKE_FLAGS_QT5=${QMAKE_FLAGS_QT5} && export PACKAGE_VERSION=${PACKAGE_VERSION} && export PACKAGE_BUILD=${PACKAGE_BUILD} && export PACKAGE_CODE=${PACKAGE_CODE} && export EXECUTABLE_VERSION=${EXECUTABLE_VERSION} && export EXECUTABLE_ARCH=${EXECUTABLE_ARCH} && cd ${PROJECT_DIR_DOCKER} && .ci/wininstall_build.sh"
12
+	/bin/bash -c "export PROJECT_DIR=${PROJECT_DIR_DOCKER} && export QT_SELECT=${QT_SELECT} && export APPLICATION_VERSION=${APPLICATION_VERSION} && export APPLICATION_COMMIT=${APPLICATION_COMMIT} && export QMAKE_FLAGS_QT4=${QMAKE_FLAGS_QT4} && export QMAKE_FLAGS_QT5=${QMAKE_FLAGS_QT5} && export PACKAGE_VERSION=${PACKAGE_VERSION} && export PACKAGE_BUILD=${PACKAGE_BUILD} && export PACKAGE_CODE=${PACKAGE_CODE} && export EXECUTABLE_VERSION=${EXECUTABLE_VERSION} && export EXECUTABLE_ARCH=${EXECUTABLE_ARCH} && cd ${PROJECT_DIR_DOCKER} && .ci/wininstall_build.sh"

+ 4
- 1
.gitlab/gitlab.sh View File

@@ -1,6 +1,6 @@
1 1
 #!/bin/bash
2 2
 
3
-# Install curl and lua
3
+# Install curl, git, lua, nsis and openssl
4 4
 apt-get update -qq && \
5 5
 apt-get install -qq curl git lua5.2 nsis openssl
6 6
 
@@ -20,6 +20,9 @@ if [ "${PACKAGE_CODE}" == "" ]; then
20 20
 	export PACKAGE_CODE=GitLab
21 21
 fi
22 22
 
23
+# Init Application Commit Hash
24
+export APPLICATION_COMMIT=$(git rev-parse --short HEAD)
25
+
23 26
 # Start CI script and copying assets into base directory
24 27
 .ci/ci.sh && \
25 28
 cp -Rf assets/* ./

+ 4
- 0
.travis.yml View File

@@ -33,6 +33,10 @@ matrix:
33 33
     - BUILD_SCRIPT=windows_docker.sh
34 34
     - QT_SELECT=qt5-x86_64-w64-mingw32
35 35
     - PACKAGE_CODE=Dropbox
36
+  - env:
37
+    - BUILD_SCRIPT=windows_docker.sh
38
+    - QT_SELECT=qt5-x86_64-w64-mingw32
39
+    - PACKAGE_CODE=gta5-mods
36 40
   - env:
37 41
     - BUILD_SCRIPT=wininstall_docker.sh
38 42
     - QT_SELECT=qt5-x86_64-w64-mingw32

+ 4
- 0
.travis/travis.sh View File

@@ -20,4 +20,8 @@ if [ "${PACKAGE_CODE}" == "" ]; then
20 20
 	export PACKAGE_CODE=GitHub
21 21
 fi
22 22
 
23
+# Init Application Commit Hash
24
+export APPLICATION_COMMIT=$(git rev-parse --short HEAD)
25
+
26
+# Start CI script
23 27
 .ci/ci.sh

+ 5
- 0
AboutDialog.cpp View File

@@ -37,6 +37,11 @@ AboutDialog::AboutDialog(QWidget *parent) :
37 37
     buildType.replace("_", " ");
38 38
     QString projectBuild = AppEnv::getBuildDateTime();
39 39
     QString buildStr = GTA5SYNC_BUILDSTRING;
40
+#ifndef GTA5SYNC_BUILDTYPE_REL
41
+#ifdef GTA5SYNC_COMMIT
42
+    appVersion = appVersion % "-" % GTA5SYNC_COMMIT;
43
+#endif
44
+#endif
40 45
 
41 46
     // Translator Comments
42 47
     //: Translated by translator, example Translated by Syping

+ 0
- 7
ImageEditorDialog.cpp View File

@@ -72,7 +72,6 @@ ImageEditorDialog::ImageEditorDialog(SnapmaticPicture *picture, QString profileN
72 72
     snapmaticResolutionLW = 516 * screenRatio; // 430
73 73
     snapmaticResolutionLH = 288 * screenRatio; // 240
74 74
     ui->labPicture->setMinimumSize(snapmaticResolutionLW, snapmaticResolutionLH);
75
-    ui->labCapacity->setText(tr("Capacity: %1").arg(QString::number(qRound((double)picture->getContentMaxLength() / 1024)) % " KB"));
76 75
 
77 76
     imageIsChanged = false;
78 77
     pictureCache = picture->getImage();
@@ -204,9 +203,3 @@ void ImageEditorDialog::on_cmdSave_clicked()
204 203
     }
205 204
     close();
206 205
 }
207
-
208
-void ImageEditorDialog::on_cmdQuestion_clicked()
209
-{
210
-    QMessageBox::information(this, tr("Snapmatic Image Editor"), tr("Every taken Snapmatic have a different Capacity, a Snapmatic with higher Capacity can store a picture with better quality."));
211
-
212
-}

+ 0
- 1
ImageEditorDialog.h View File

@@ -38,7 +38,6 @@ private slots:
38 38
     void on_cmdClose_clicked();
39 39
     void on_cmdReplace_clicked();
40 40
     void on_cmdSave_clicked();
41
-    void on_cmdQuestion_clicked();
42 41
 
43 42
 private:
44 43
     SnapmaticPicture *smpic;

+ 1
- 32
ImageEditorDialog.ui View File

@@ -7,7 +7,7 @@
7 7
     <x>0</x>
8 8
     <y>0</y>
9 9
     <width>516</width>
10
-    <height>335</height>
10
+    <height>337</height>
11 11
    </rect>
12 12
   </property>
13 13
   <property name="windowTitle">
@@ -51,37 +51,6 @@
51 51
       <number>0</number>
52 52
      </property>
53 53
      <layout class="QVBoxLayout" name="vlButtons">
54
-      <item>
55
-       <layout class="QHBoxLayout" name="hlCapacity">
56
-        <item>
57
-         <widget class="QLabel" name="labCapacity">
58
-          <property name="text">
59
-           <string>Capacity: %1</string>
60
-          </property>
61
-         </widget>
62
-        </item>
63
-        <item>
64
-         <widget class="QToolButton" name="cmdQuestion">
65
-          <property name="text">
66
-           <string>?</string>
67
-          </property>
68
-         </widget>
69
-        </item>
70
-        <item>
71
-         <spacer name="hsCapacity">
72
-          <property name="orientation">
73
-           <enum>Qt::Horizontal</enum>
74
-          </property>
75
-          <property name="sizeHint" stdset="0">
76
-           <size>
77
-            <width>0</width>
78
-            <height>0</height>
79
-           </size>
80
-          </property>
81
-         </spacer>
82
-        </item>
83
-       </layout>
84
-      </item>
85 54
       <item>
86 55
        <layout class="QHBoxLayout" name="hlButtons">
87 56
         <item>

+ 14
- 2
ProfileInterface.cpp View File

@@ -87,7 +87,13 @@ ProfileInterface::ProfileInterface(ProfileDatabase *profileDB, CrewDatabase *cre
87 87
     saSpacerItem = nullptr;
88 88
 
89 89
     updatePalette();
90
-    ui->labVersion->setText(QString("%1 %2").arg(GTA5SYNC_APPSTR, GTA5SYNC_APPVER));
90
+    QString appVersion = GTA5SYNC_APPVER;
91
+#ifndef GTA5SYNC_BUILDTYPE_REL
92
+#ifdef GTA5SYNC_COMMIT
93
+    appVersion = appVersion % "-" % GTA5SYNC_COMMIT;
94
+#endif
95
+#endif
96
+    ui->labVersion->setText(QString("%1 %2").arg(GTA5SYNC_APPSTR, appVersion));
91 97
     ui->saProfileContent->setFilesDropEnabled(true);
92 98
     ui->saProfileContent->setImageDropEnabled(true);
93 99
 
@@ -1498,7 +1504,13 @@ void ProfileInterface::on_saProfileContent_dropped(const QMimeData *mimeData)
1498 1504
 void ProfileInterface::retranslateUi()
1499 1505
 {
1500 1506
     ui->retranslateUi(this);
1501
-    ui->labVersion->setText(QString("%1 %2").arg(GTA5SYNC_APPSTR, GTA5SYNC_APPVER));
1507
+    QString appVersion = GTA5SYNC_APPVER;
1508
+#ifndef GTA5SYNC_BUILDTYPE_REL
1509
+#ifdef GTA5SYNC_COMMIT
1510
+    appVersion = appVersion % "-" % GTA5SYNC_COMMIT;
1511
+#endif
1512
+#endif
1513
+    ui->labVersion->setText(QString("%1 %2").arg(GTA5SYNC_APPSTR, appVersion));
1502 1514
 }
1503 1515
 
1504 1516
 bool ProfileInterface::eventFilter(QObject *watched, QEvent *event)

+ 3
- 0
TelemetryClass.cpp View File

@@ -336,6 +336,9 @@ QJsonDocument TelemetryClass::getApplicationSpec()
336 336
     jsonObject["Arch"] = QSysInfo::buildCpuArchitecture();
337 337
 #endif
338 338
     jsonObject["Name"] = GTA5SYNC_APPSTR;
339
+#ifdef GTA5SYNC_COMMIT
340
+    jsonObject["Commit"] = GTA5SYNC_COMMIT;
341
+#endif
339 342
     jsonObject["Version"] = GTA5SYNC_APPVER;
340 343
     jsonObject["BuildDateTime"] = AppEnv::getBuildDateTime();
341 344
     jsonObject["BuildType"] = GTA5SYNC_BUILDTYPE;

+ 14
- 2
UserInterface.cpp View File

@@ -61,7 +61,13 @@ UserInterface::UserInterface(ProfileDatabase *profileDB, CrewDatabase *crewDB, D
61 61
     defaultWindowTitle = tr("%2 - %1").arg("%1", GTA5SYNC_APPSTR);
62 62
 
63 63
     this->setWindowTitle(defaultWindowTitle.arg(tr("Select Profile")));
64
-    ui->labVersion->setText(QString("%1 %2").arg(GTA5SYNC_APPSTR, GTA5SYNC_APPVER));
64
+    QString appVersion = GTA5SYNC_APPVER;
65
+#ifndef GTA5SYNC_BUILDTYPE_REL
66
+#ifdef GTA5SYNC_COMMIT
67
+    appVersion = appVersion % "-" % GTA5SYNC_COMMIT;
68
+#endif
69
+#endif
70
+    ui->labVersion->setText(QString("%1 %2").arg(GTA5SYNC_APPSTR, appVersion));
65 71
 
66 72
     // Set Icon for Close Button
67 73
     if (QIcon::hasThemeIcon("dialog-close"))
@@ -633,7 +639,13 @@ void UserInterface::retranslateUi()
633 639
 {
634 640
     ui->retranslateUi(this);
635 641
     ui->actionAbout_gta5sync->setText(tr("&About %1").arg(GTA5SYNC_APPSTR));
636
-    ui->labVersion->setText(QString("%1 %2").arg(GTA5SYNC_APPSTR, GTA5SYNC_APPVER));
642
+    QString appVersion = GTA5SYNC_APPVER;
643
+#ifndef GTA5SYNC_BUILDTYPE_REL
644
+#ifdef GTA5SYNC_COMMIT
645
+    appVersion = appVersion % "-" % GTA5SYNC_COMMIT;
646
+#endif
647
+#endif
648
+    ui->labVersion->setText(QString("%1 %2").arg(GTA5SYNC_APPSTR, appVersion));
637 649
     if (profileOpen)
638 650
     {
639 651
         this->setWindowTitle(defaultWindowTitle.arg(profileName));