QT/TaoQuick
1
0
Fork 0
mirror of https://github.com/jaredtao/TaoQuick.git synced 2025-01-31 21:22:58 +08:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/TaoQuickShow/TaoQuickShow.pro
View File

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

31
mkspecs/features/taoVersion.prf
View File

@ -1,6 +1,4 @@
!exists(TaoVersionDefined) { defineTest(setTaoVersion) {
TaoVersionDefined=1
TAO_VERSION_TAG = 1.0 TAO_VERSION_TAG = 1.0
# current commit hash # current commit hash
@ -26,16 +24,21 @@
VER_PAT = $${PAT} VER_PAT = $${PAT}
VERSION = $${Ver} VERSION = $${Ver}
} }
!exists(TaoDefined) {
TaoDefined=1 DEFINES += TaoREVISION=$${REVISION}
DEFINES += TaoREVISION=$${REVISION} DEFINES += TaoREVISIONSTR=\"\\\"$${REVISION}\\\"\"
DEFINES += TaoREVISIONSTR=\"\\\"$${REVISION}\\\"\" DEFINES += TaoVer=\"\\\"$${Ver}\\\"\"
DEFINES += TaoVer=\"\\\"$${Ver}\\\"\" DEFINES += TaoMAJ=$${MAJ}
DEFINES += TaoMAJ=$${MAJ} DEFINES += TaoMIN=$${MIN}
DEFINES += TaoMIN=$${MIN} DEFINES += TaoPAT=$${PAT}
DEFINES += TaoPAT=$${PAT} DEFINES += TaoDATETIME=\"\\\"$${_DATE_}\\\"\"
DEFINES += TaoDATETIME=\"\\\"$${_DATE_}\\\"\" DEFINES += TaoCompilerVendor=\"\\\"$${QT_VERSION} $${QMAKE_PLATFORM} $${QMAKE_COMPILER} $${QMAKE_TARGET.arch}\\\"\"
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)
} }

1
src/TaoQuick/TaoQuick.pro
View File

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