1
0
mirror of https://github.com/jaredtao/TaoQuick.git synced 2025-01-19 20:22:56 +08:00

Merge branch 'master' of https://github.com/jaredtao/TaoQuick into master

This commit is contained in:
jared 2020-08-27 09:20:28 +08:00
commit fef2528b86
3 changed files with 19 additions and 14 deletions

View File

@ -6,6 +6,7 @@ QT += qml quick concurrent
CONFIG += plugin c++17 qtquickcompiler utf8_source
load(taoVersion)
setTaoVersion()
load(taoBundle)
BundlePath = $$getBundlePath("TaoQuickApp")

View File

@ -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)
}

View File

@ -12,6 +12,7 @@ versionAtLeast(QT_VERSION, 5.15.0) {
uri = $$TARGET
load(taoVersion)
setTaoVersion()
load(taoBundle)
BundlePath = $$getBundlePath("TaoQuickApp")