diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-11-04 13:27:02 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-11-05 13:37:23 +0000 |
| commit | c0f2da3065fd00b4d4193786865f7603e07c4515 (patch) | |
| tree | 6e22bb8a3de01971d0472fa1f04adb57da1324f4 | |
| parent | dfa558e15f0de337c3b9ea0d79dd0b178442663f (diff) | |
| download | qbs-c0f2da3065fd00b4d4193786865f7603e07c4515.tar.gz | |
qmake: fix public dependency on scriptengine
Task-number: QTCREATORBUG-26516
Change-Id: I32ea47948bbf92ee512c964f069f911226c2b6a2
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | src/lib/corelib/use_corelib.pri | 1 | ||||
| -rw-r--r-- | src/lib/scriptengine/use_scriptengine.pri | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/corelib/use_corelib.pri b/src/lib/corelib/use_corelib.pri index a0bb90e8b..e1d74ca0d 100644 --- a/src/lib/corelib/use_corelib.pri +++ b/src/lib/corelib/use_corelib.pri @@ -1,5 +1,6 @@ include(../../../qbs_version.pri) include(../../library_dirname.pri) +include(../scriptengine/use_scriptengine.pri) isEmpty(QBSLIBDIR) { QBSLIBDIR = $$OUT_PWD/../../../$${QBS_LIBRARY_DIRNAME} diff --git a/src/lib/scriptengine/use_scriptengine.pri b/src/lib/scriptengine/use_scriptengine.pri index ff1bb1343..9981b442a 100644 --- a/src/lib/scriptengine/use_scriptengine.pri +++ b/src/lib/scriptengine/use_scriptengine.pri @@ -1,4 +1,6 @@ -!qbs_do_not_link_bundled_qtscript { +include(../bundledlibs.pri) + +qbs_use_bundled_qtscript:!qbs_do_not_link_bundled_qtscript { include(../../library_dirname.pri) isEmpty(QBSLIBDIR) { QBSLIBDIR = $$shadowed($$PWD/../../../$${QBS_LIBRARY_DIRNAME}) |