diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-07-28 14:44:29 -0700 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2017-09-13 04:01:29 +0000 |
| commit | 0089d7b3b741ed5f1137ee5ad8bd606fcccb5c68 (patch) | |
| tree | 373b861ac952c759609a9847cdbd3ae1ad27f77e | |
| parent | 21214c88dd52f38ab4eebec176ddbbcddda474d5 (diff) | |
Always build libinstaller as a static library
This fixes the build if IFW is built with a dynamically linked Qt, and
does not otherwise affect use of static builds of Qt.
Task-number: QTIFW-993
Change-Id: I1e6807e522adde339263c697fa4a1353250a2e3f
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| -rw-r--r-- | installerfw.pri | 16 | ||||
| -rw-r--r-- | src/libs/installer/installer.pro | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/installerfw.pri b/installerfw.pri index ca2bbaa24..ff018f792 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 } diff --git a/src/libs/installer/installer.pro b/src/libs/installer/installer.pro index d641ff1fc..f649a1ecb 100644 --- a/src/libs/installer/installer.pro +++ b/src/libs/installer/installer.pro @@ -2,6 +2,8 @@ TEMPLATE = lib TARGET = installer INCLUDEPATH += . .. +CONFIG += staticlib + include(../7zip/7zip.pri) include(../kdtools/kdtools.pri) include(../../../installerfw.pri) |