diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2019-09-11 09:05:32 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2019-09-24 04:42:06 +0000 |
| commit | 2249765041287f226b8f2b69cbb35516b568d767 (patch) | |
| tree | 63517ce66ca490da4e95cfbb0cef515c5b416db4 /src/shared | |
| parent | 4702faba060b879e2caa296a1f0800ebe6b36f22 (diff) | |
| download | qt-creator-2249765041287f226b8f2b69cbb35516b568d767.tar.gz | |
Allow compile with bundled QtScript
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>
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/shared.pro | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/shared/shared.pro b/src/shared/shared.pro index e94abae804..ea76484dec 100644 --- a/src/shared/shared.pro +++ b/src/shared/shared.pro @@ -19,6 +19,13 @@ qbsstatic.file = qbs/static.pro exists(qbs/qbs.pro) { isEmpty(QBS_INSTALL_DIR):QBS_INSTALL_DIR = $$(QBS_INSTALL_DIR) 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 |