diff options
| author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2019-07-18 14:29:38 +0300 |
|---|---|---|
| committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2019-08-15 12:16:57 +0000 |
| commit | 54f1de217b774322f383df446844c3ec3422dee2 (patch) | |
| tree | f9ed43e520a892a042a96c48f341bffd1b80a9d8 | |
| parent | 864aaa7ea3867530ff662af8265ac701257be36e (diff) | |
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 <katja.marttila@qt.io>
| -rw-r--r-- | installerfw.pri | 8 | ||||
| -rw-r--r-- | src/sdk/installerbase.rc | 18 |
2 files changed, 25 insertions, 1 deletions
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 diff --git a/src/sdk/installerbase.rc b/src/sdk/installerbase.rc index 6229466b5..ae7c36aef 100644 --- a/src/sdk/installerbase.rc +++ b/src/sdk/installerbase.rc @@ -1,3 +1,21 @@ +#include <windows.h> + +/* Version info for Windows binary */ +VS_VERSION_INFO VERSIONINFO + FILEVERSION IFW_VERSION_WIN32 + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "FileVersion", IFW_VERSION_STR_WIN32 + END + END + END +/* End of version info */ + IDI_ICON1 ICON DISCARDABLE "installerbase.ico" |