feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Allow compile with bundled QtScript

Browse Source 
Qbs has QtScript nowadays bundled as submodule. Use it
for qmake builds as well if the used Qt does not have QtScript
present.

Change-Id: I4eabdbe7ea502953b0213ad39c8b72220f2d966f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Christian Stenger
2019-09-11 09:05:32 +02:00
parent 4702faba06
commit 2249765041
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/shared/shared.pro
View File

@@ -19,6 +19,13 @@ qbsstatic.file = qbs/static.pro
exists(qbs/qbs.pro) { exists(qbs/qbs.pro) {
isEmpty(QBS_INSTALL_DIR):QBS_INSTALL_DIR = $$(QBS_INSTALL_DIR) isEmpty(QBS_INSTALL_DIR):QBS_INSTALL_DIR = $$(QBS_INSTALL_DIR)
isEmpty(QBS_INSTALL_DIR):SUBDIRS += $$QBS_DIRS isEmpty(QBS_INSTALL_DIR):SUBDIRS += $$QBS_DIRS
include(qbs/src/lib/bundledlibs.pri)
qbs_use_bundled_qtscript {
qbsscriptenginelib.file = qbs/src/lib/scriptengine/scriptengine.pro
qbscorelib.depends = qbsscriptenginelib
SUBDIRS += qbsscriptenginelib
}
} }
TR_EXCLUDE = qbs TR_EXCLUDE = qbs