From 2249765041287f226b8f2b69cbb35516b568d767 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 11 Sep 2019 09:05:32 +0200 Subject: [PATCH] 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 --- src/shared/shared.pro | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/shared/shared.pro b/src/shared/shared.pro index e94abae8043..ea76484dec6 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