diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-05-02 16:47:56 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-05-03 07:40:03 +0000 |
| commit | 9258beb35aaf30ab2e89cdd6af0e02ddc179d98d (patch) | |
| tree | 7965fc30292766e7e64def91997e8afc728be3a5 /src/plugins/plugins.pri | |
| parent | ad86d31cd2b8ed279c79106e4143424facea0622 (diff) | |
qmake build: Fix building plugins statically
For some reason, plugins.pri did not include use_corelib.pri when
building statically, so the include paths were missing.
Task-number: QBS-1229
Change-Id: I142da643772182ae78a3e68d91f19460223c7a6f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/plugins/plugins.pri')
| -rw-r--r-- | src/plugins/plugins.pri | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri index dc7f5a9e4..393f1d24d 100644 --- a/src/plugins/plugins.pri +++ b/src/plugins/plugins.pri @@ -7,13 +7,11 @@ include(../install_prefix.pri) destdirPrefix = $$shadowed($$PWD)/../../$${QBS_LIBRARY_DIRNAME} } DESTDIR = $${destdirPrefix}/qbs/plugins -CONFIG(static, static|shared) { - DEFINES += QBS_STATIC_LIB -} else { - isEmpty(QBSLIBDIR): QBSLIBDIR = $$OUT_PWD/../../../../$${QBS_LIBRARY_DIRNAME} - isEmpty(QBS_RPATH): QBS_RPATH = ../.. - include($${PWD}/../lib/corelib/use_corelib.pri) -} + +isEmpty(QBSLIBDIR): QBSLIBDIR = $$OUT_PWD/../../../../$${QBS_LIBRARY_DIRNAME} +isEmpty(QBS_RPATH): QBS_RPATH = ../.. +include($${PWD}/../lib/corelib/use_corelib.pri) + TEMPLATE = lib CONFIG += c++14 |