diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2017-09-25 09:00:45 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2017-09-25 09:03:06 +0300 |
| commit | 741d16a9bd088497a0ae1eb172e3d865e09fd57b (patch) | |
| tree | a300e921ff70e686e0f70a3d7fbb4747e7eb7e5f /installerfw.pri | |
| parent | 1fe36e54d5bd75bc0a403218966f8046a66718da (diff) | |
| parent | 0089d7b3b741ed5f1137ee5ad8bd606fcccb5c68 (diff) | |
Merge remote-tracking branch 'origin/3.0'
Change-Id: Id2e682dc2698e08f91bee83e2a94de57403545a0
Diffstat (limited to 'installerfw.pri')
| -rw-r--r-- | installerfw.pri | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/installerfw.pri b/installerfw.pri index 4aed182c1..2810e5144 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -126,13 +126,11 @@ DEFINES += NOMINMAX QT_NO_CAST_FROM_ASCII QT_STRICT_ITERATORS QT_USE_QSTRINGBUIL IFW_VERSION_STR=$$IFW_VERSION_STR IFW_VERSION=$$IFW_VERSION DEFINES += IFW_REPOSITORY_FORMAT_VERSION=$$IFW_REPOSITORY_FORMAT_VERSION -static { - LIBS += -l7z - win32-g++*: LIBS += -lmpr -luuid - - equals(TEMPLATE, app) { - msvc:POST_TARGETDEPS += $$IFW_LIB_PATH/installer.lib $$IFW_LIB_PATH/7z.lib - win32-g++*:POST_TARGETDEPS += $$IFW_LIB_PATH/libinstaller.a $$IFW_LIB_PATH/lib7z.a - unix:POST_TARGETDEPS += $$IFW_LIB_PATH/libinstaller.a $$IFW_LIB_PATH/lib7z.a - } +LIBS += -l7z +win32-g++*: LIBS += -lmpr -luuid + +equals(TEMPLATE, app) { + msvc:POST_TARGETDEPS += $$IFW_LIB_PATH/installer.lib $$IFW_LIB_PATH/7z.lib + win32-g++*:POST_TARGETDEPS += $$IFW_LIB_PATH/libinstaller.a $$IFW_LIB_PATH/lib7z.a + unix:POST_TARGETDEPS += $$IFW_LIB_PATH/libinstaller.a $$IFW_LIB_PATH/lib7z.a } |