From ddd276e59a2de0f4f669342a167f1976a5c8e474 Mon Sep 17 00:00:00 2001
From: jared <jared2020@163.com>
Date: Thu, 27 Aug 2020 01:00:32 +0800
Subject: [PATCH] update taoVersion.prf

---
 examples/TaoQuickShow/TaoQuickShow.pro |  1 +
 mkspecs/features/taoVersion.prf        | 31 ++++++++++++++------------
 src/TaoQuick/TaoQuick.pro              |  1 +
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/examples/TaoQuickShow/TaoQuickShow.pro b/examples/TaoQuickShow/TaoQuickShow.pro
index f5e52b1..0a5bf9d 100644
--- a/examples/TaoQuickShow/TaoQuickShow.pro
+++ b/examples/TaoQuickShow/TaoQuickShow.pro
@@ -6,6 +6,7 @@ QT += qml quick concurrent
 CONFIG += plugin c++17 qtquickcompiler utf8_source
 
 load(taoVersion)
+setTaoVersion()
 
 load(taoBundle)
 BundlePath = $$getBundlePath("TaoQuickApp")
diff --git a/mkspecs/features/taoVersion.prf b/mkspecs/features/taoVersion.prf
index 95964b3..73984d1 100644
--- a/mkspecs/features/taoVersion.prf
+++ b/mkspecs/features/taoVersion.prf
@@ -1,6 +1,4 @@
-!exists(TaoVersionDefined) {
-    TaoVersionDefined=1
-
+defineTest(setTaoVersion) {
     TAO_VERSION_TAG = 1.0
 
     # current commit hash
@@ -26,16 +24,21 @@
         VER_PAT = $${PAT}
         VERSION = $${Ver}
     }
-    !exists(TaoDefined) {
-        TaoDefined=1
-        DEFINES += TaoREVISION=$${REVISION}
-        DEFINES += TaoREVISIONSTR=\"\\\"$${REVISION}\\\"\"
-        DEFINES += TaoVer=\"\\\"$${Ver}\\\"\"
-        DEFINES += TaoMAJ=$${MAJ}
-        DEFINES += TaoMIN=$${MIN}
-        DEFINES += TaoPAT=$${PAT}
-        DEFINES += TaoDATETIME=\"\\\"$${_DATE_}\\\"\"
-        DEFINES += TaoCompilerVendor=\"\\\"$${QT_VERSION} $${QMAKE_PLATFORM} $${QMAKE_COMPILER} $${QMAKE_TARGET.arch}\\\"\"
-    }
+
+    DEFINES += TaoREVISION=$${REVISION}
+    DEFINES += TaoREVISIONSTR=\"\\\"$${REVISION}\\\"\"
+    DEFINES += TaoVer=\"\\\"$${Ver}\\\"\"
+    DEFINES += TaoMAJ=$${MAJ}
+    DEFINES += TaoMIN=$${MIN}
+    DEFINES += TaoPAT=$${PAT}
+    DEFINES += TaoDATETIME=\"\\\"$${_DATE_}\\\"\"
+    DEFINES += TaoCompilerVendor=\"\\\"$${QT_VERSION} $${QMAKE_PLATFORM} $${QMAKE_COMPILER} $${QMAKE_TARGET.arch}\\\"\"
+
+    export(CONFIG)
+    export(VER_MAJ)
+    export(VER_MIN)
+    export(VER_PAT)
+    export(VERSION)
+    export(DEFINES)
 }
 
diff --git a/src/TaoQuick/TaoQuick.pro b/src/TaoQuick/TaoQuick.pro
index 008d030..750cff3 100644
--- a/src/TaoQuick/TaoQuick.pro
+++ b/src/TaoQuick/TaoQuick.pro
@@ -12,6 +12,7 @@ versionAtLeast(QT_VERSION, 5.15.0) {
 
 uri = $$TARGET
 load(taoVersion)
+setTaoVersion()
 
 load(taoBundle)
 BundlePath = $$getBundlePath("TaoQuickApp")