From 670e8b69f30cc64b1d4407e72847f3b6768dae2c Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Tue, 18 Jun 2019 07:47:00 +0300 Subject: Prepare 3.1.2 release Change-Id: I3e0c2cb9825974ec42940c55d8d9b48afa770d8e Reviewed-by: Iikka Eklund --- installerfw.pri | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'installerfw.pri') diff --git a/installerfw.pri b/installerfw.pri index 86fcb2969..74c091e36 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -3,8 +3,8 @@ } IFW_PRI_INCLUDED = 1 -IFW_VERSION_STR = 3.1.1 -IFW_VERSION = 0x030101 +IFW_VERSION_STR = 3.1.2 +IFW_VERSION = 0x030102 IFW_REPOSITORY_FORMAT_VERSION = 1.0.0 IFW_NEWLINE = $$escape_expand(\\n\\t) -- cgit v1.2.3 From 54f1de217b774322f383df446844c3ec3422dee2 Mon Sep 17 00:00:00 2001 From: Arttu Tarkiainen Date: Thu, 18 Jul 2019 14:29:38 +0300 Subject: Add IFW version information to installerbase binary on Windows Add Windows VERSIONINFO resource definition to installerbase.rc so we can link the installerbase executable with file version property. Created installers using this base binary will include the set version property. Task-number: QTIFW-1397 Change-Id: Ie7781bf65c6032c01bb0bac9e945c665e81973d9 Reviewed-by: Katja Marttila --- installerfw.pri | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'installerfw.pri') diff --git a/installerfw.pri b/installerfw.pri index 74c091e36..e15c7c411 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -5,6 +5,9 @@ IFW_PRI_INCLUDED = 1 IFW_VERSION_STR = 3.1.2 IFW_VERSION = 0x030102 +IFW_VERSION_WIN32 = 3,1,2,0 + +IFW_VERSION_STR_WIN32 = $$IFW_VERSION_STR\0 IFW_REPOSITORY_FORMAT_VERSION = 1.0.0 IFW_NEWLINE = $$escape_expand(\\n\\t) @@ -123,7 +126,10 @@ isEmpty(GIT_SHA1) { DEFINES += NOMINMAX QT_NO_CAST_FROM_ASCII QT_STRICT_ITERATORS QT_USE_QSTRINGBUILDER \ "_GIT_SHA1_=$$GIT_SHA1" \ - IFW_VERSION_STR=$$IFW_VERSION_STR IFW_VERSION=$$IFW_VERSION + IFW_VERSION_STR=$$IFW_VERSION_STR \ + IFW_VERSION=$$IFW_VERSION \ + IFW_VERSION_STR_WIN32=$$IFW_VERSION_STR_WIN32 \ + IFW_VERSION_WIN32=$$IFW_VERSION_WIN32 DEFINES += IFW_REPOSITORY_FORMAT_VERSION=$$IFW_REPOSITORY_FORMAT_VERSION LIBS += -l7z -- cgit v1.2.3