diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2019-08-23 11:05:07 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2019-08-23 11:05:07 +0300 |
| commit | 516492370b95e9c07cad4080ef713d5b2b3f2f94 (patch) | |
| tree | c094d82a3cebf3aaff4182ae7824c3efbce6d3a3 /installerfw.pri | |
| parent | 3b310a3ec13a743ae2258bc43d92a5df42c6ad37 (diff) | |
| parent | 8f7af86198935849c74c71add7c9ca081347fb85 (diff) | |
Merge remote-tracking branch 'origin/3.1' into master
Change-Id: I8b203e12283374aed707e0e89c2f73d44ff296cb
Diffstat (limited to 'installerfw.pri')
| -rw-r--r-- | installerfw.pri | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/installerfw.pri b/installerfw.pri index b227cb70a..cd1227aec 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -5,6 +5,9 @@ IFW_PRI_INCLUDED = 1 IFW_VERSION_STR = 3.2.0 IFW_VERSION = 0x030200 +IFW_VERSION_WIN32 = 3,2,0,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 |