zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #7689 from stefandunca/pr-fix_windows_dev_build 

Fix `VERSION` qmake variable being corrupted by dev version build
QGC4.4
Gus Grubba 6 years ago committed by GitHub
parent
3918559bf6 f939c2be55
commit
22132435cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      QGCCommon.pri

7
QGCCommon.pri
Unescape View File

@ -133,14 +133,15 @@ exists ($$PWD/.git) {
contains(GIT_DESCRIBE, v[0-9]+.[0-9]+.[0-9]+) { contains(GIT_DESCRIBE, v[0-9]+.[0-9]+.[0-9]+) {
# release version "vX.Y.Z" # release version "vX.Y.Z"
GIT_VERSION = $${GIT_DESCRIBE} GIT_VERSION = $${GIT_DESCRIBE}
VERSION = $$replace(GIT_DESCRIBE, "v", "")
VERSION = $$replace(VERSION, "-", ".")
VERSION = $$section(VERSION, ".", 0, 3)
} else { } else {
# development version "Development branch:sha date" # development version "Development branch:sha date"
GIT_VERSION = "Development $${GIT_BRANCH}:$${GIT_HASH} $${GIT_TIME}" GIT_VERSION = "Development $${GIT_BRANCH}:$${GIT_HASH} $${GIT_TIME}"
VERSION = 0.0.0
} }
VERSION = $$replace(GIT_DESCRIBE, "v", "")
VERSION = $$replace(VERSION, "-", ".")
VERSION = $$section(VERSION, ".", 0, 3)
MacBuild { MacBuild {
MAC_VERSION = $$section(VERSION, ".", 0, 2) MAC_VERSION = $$section(VERSION, ".", 0, 2)
MAC_BUILD = $$section(VERSION, ".", 3, 3) MAC_BUILD = $$section(VERSION, ".", 3, 3)

Write Preview
Loading…
Cancel
Save