From 5477c1ffa0f6643ce90abdd2573029c1fc481147 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 14 Oct 2013 22:43:50 -0700 Subject: Actually get the correct full version for DMG This is what I get for trying to be smart and pushing a change from the Linux box because the fix was 'obvious'. Duh. It was not. In order to get the real full version including the git hash we always have to pass 'linux' to the gen-version script, even on a Mac. Signed-off-by: Dirk Hohndel --- subsurface-gen-version.pri | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/subsurface-gen-version.pri b/subsurface-gen-version.pri index 78e230ea6..d52d98c19 100644 --- a/subsurface-gen-version.pri +++ b/subsurface-gen-version.pri @@ -6,7 +6,8 @@ win32: VER_OS = win exists(.git/HEAD): { GIT_HEAD = .git/HEAD VERSION_SCRIPT = $$PWD/scripts/get-version - FULL_VERSION = $$system("$$VERSION_SCRIPT $$VER_OS") + # always use linux here -------------------vvv so we get the true full version + FULL_VERSION = $$system("$$VERSION_SCRIPT linux") version_h.depends = $$VERSION_SCRIPT version_h.commands = echo \\$${LITERAL_HASH}define VERSION_STRING \\\"`$$VERSION_SCRIPT $$VER_OS`\\\" > ${QMAKE_FILE_OUT} version_h.input = GIT_HEAD -- cgit v1.2.3-70-g09d2