From 3e2d757bb18681f1c077997d42bd4d64ee7c5b2a Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 25 Jan 2014 13:28:07 -0800 Subject: [PATCH] We need the full version Clearly the version generation stuff wasn't ported correctly to qmake. Or something got lost. Just always calling the linux version to get the right response to the --version option. Signed-off-by: Dirk Hohndel --- subsurface-gen-version.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subsurface-gen-version.pri b/subsurface-gen-version.pri index e0d0ea512..e31531311 100644 --- a/subsurface-gen-version.pri +++ b/subsurface-gen-version.pri @@ -13,7 +13,7 @@ exists(.git/HEAD): { PRODVERSION_STRING = $$system("sh scripts/get-version win $$FULL_VERSION || $${VERSION}.0.0") VERSION_STRING = $$system("sh scripts/get-version linux $$FULL_VERSION || $${VERSION}") version_h.depends = $$VERSION_SCRIPT $$PWD/.git/$$system("$$SET_GIT_DIR=$$PWD/.git git rev-parse --symbolic-full-name HEAD") - version_h.commands = echo \\$${LITERAL_HASH}define VERSION_STRING \\\"`GIT_DIR=$$PWD/.git $$VERSION_SCRIPT $$VER_OS`\\\" > ${QMAKE_FILE_OUT} + version_h.commands = echo \\$${LITERAL_HASH}define VERSION_STRING \\\"`GIT_DIR=$$PWD/.git $$VERSION_SCRIPT linux`\\\" > ${QMAKE_FILE_OUT} version_h.input = GIT_HEAD version_h.output = $$VERSION_FILE version_h.variable_out = GENERATED_FILES