From f939c2be55255d0db3893fa11b4eac5141ffa8e8 Mon Sep 17 00:00:00 2001 From: Stefan Dunca Date: Thu, 15 Aug 2019 20:29:08 +0200 Subject: [PATCH] Fix VERSION qmake var being corupted by dev version build --- QGCCommon.pri | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/QGCCommon.pri b/QGCCommon.pri index 826e4a78f..95d3c5ede 100644 --- a/QGCCommon.pri +++ b/QGCCommon.pri @@ -132,14 +132,15 @@ exists ($$PWD/.git) { contains(GIT_DESCRIBE, v[0-9]+.[0-9]+.[0-9]+) { # release version "vX.Y.Z" GIT_VERSION = $${GIT_DESCRIBE} + VERSION = $$replace(GIT_DESCRIBE, "v", "") + VERSION = $$replace(VERSION, "-", ".") + VERSION = $$section(VERSION, ".", 0, 3) } else { # development version "Development branch:sha date" 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 { MAC_VERSION = $$section(VERSION, ".", 0, 2) MAC_BUILD = $$section(VERSION, ".", 3, 3) -- 2.22.0