From aeb4bdb83ed910366c76daec266a3a3b705ca4f9 Mon Sep 17 00:00:00 2001
From: woblight <woblight@gmail.com>
Date: Sun, 24 Jun 2018 00:10:49 +0200
Subject: [PATCH] Correct redundant version string

---
 GitAddonsManager.pro | 6 ++----
 main.cpp             | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/GitAddonsManager.pro b/GitAddonsManager.pro
index f5320cc..46fe3fe 100644
--- a/GitAddonsManager.pro
+++ b/GitAddonsManager.pro
@@ -40,11 +40,9 @@ win32 {
     DEFINES += _WIN32_WINNT=0x06010000
 }
 
-GIT_TAG = $$system(git describe --tags)
-GIT_SHA = $$system(git rev-parse --short HEAD)
+GIT_DESCRIBE = $$system(git describe --tags)
 
-DEFINES += GIT_TAG=\\\"$$GIT_TAG\\\" \
-    GIT_SHA=\\\"$$GIT_SHA\\\"
+DEFINES += GIT_DESCRIBE=\\\"$$GIT_DESCRIBE\\\"
 
 DISTFILES += \
     README.md
diff --git a/main.cpp b/main.cpp
index 66bc26f..92a334e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
         return Control::instance();
     });
     qmlRegisterUncreatableType<Addon>("GitAddonsManager.engine",1,0,"Addon","");
-    engine.rootContext()->setContextProperty("gitVersion", QString("%1 (%2)").arg(GIT_TAG, GIT_SHA));
+    engine.rootContext()->setContextProperty("gitVersion", GIT_DESCRIBE);
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
     if (engine.rootObjects().isEmpty())
         return -1;