Skip to content

Q
qgroundcontrol
Commit f939c2be authored by Stefan Dunca's avatar Stefan Dunca
Browse files
Options

Fix VERSION qmake var being corupted by dev version build

parent f6e72014
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
QGCCommon.pri
View file @ f939c2be
...@@ -132,14 +132,15 @@ exists ($$PWD/.git) { ...@@ -132,14 +132,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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment