From b6fb532f3afbdb755045171cb52e6f58211d2ca9 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Thu, 9 Mar 2017 15:29:04 +0100 Subject: [PATCH] Set installbuilder project.version dynamically from qmake Instead of maintaining the version number in project.xml, pass it to installbuilder from qmake project. refs #902 --- install.pri | 3 ++- installer/installbuilder/project.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/install.pri b/install.pri index 68a4aafdf..c718b2765 100644 --- a/install.pri +++ b/install.pri @@ -308,7 +308,8 @@ bitrock_builder_bin = $$(BITROCK_BUILDER) } create_installer.commands = $${bitrock_builder_bin} build $${bitrock_project} $${INSTALLER_PLATFORM} \ --setvars project.outputDirectory=$$shell_path($${PREFIX}/..) \ - project.installerFilename=$${INSTALLER_BASENAME}.$${INSTALLER_EXT} + project.installerFilename=$${INSTALLER_BASENAME}.$${INSTALLER_EXT} \ + project.version=$${BLACK_VERSION} QMAKE_EXTRA_TARGETS += create_installer } diff --git a/installer/installbuilder/project.xml b/installer/installbuilder/project.xml index 5f4be44bd..197eb061b 100644 --- a/installer/installbuilder/project.xml +++ b/installer/installbuilder/project.xml @@ -1,7 +1,7 @@ swift swift - 0.7.0 + ../../dist/bin/README.md ../../dist/bin/LICENSE ../images/leftimage.png