diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2016-07-05 17:35:48 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2016-07-06 13:04:16 +0000 |
| commit | a69c458fdd70e0a30b607786a6428a4772fb5ce8 (patch) | |
| tree | f0907ffa725bbe043cc66a86dfbd0dcb35c67fb7 | |
| parent | bf1ccfc91061a76b60c3622804a2e1f685c20d71 (diff) | |
| download | qbs-a69c458fdd70e0a30b607786a6428a4772fb5ce8.tar.gz | |
Do not export QtScript from corelib
This was only needed, because libqtprofilesetup included scripttools.h
which is no longer the case.
Change-Id: I1966660fe3247a4b54783906c2fd139379cda119
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | src/lib/corelib/corelib.qbs | 2 | ||||
| -rw-r--r-- | src/lib/corelib/use_corelib.pri | 2 | ||||
| -rw-r--r-- | src/lib/corelib/use_installed_corelib.pri | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs index 723531d37..f392aa8b1 100644 --- a/src/lib/corelib/corelib.qbs +++ b/src/lib/corelib/corelib.qbs @@ -455,7 +455,7 @@ QbsLibrary { ] } Export { - Depends { name: "Qt"; submodules: ["script", "xml"] } + Depends { name: "Qt"; submodules: ["xml"] } cpp.defines: product.projectFileUpdateDefines } } diff --git a/src/lib/corelib/use_corelib.pri b/src/lib/corelib/use_corelib.pri index 814da51e0..df511fbe3 100644 --- a/src/lib/corelib/use_corelib.pri +++ b/src/lib/corelib/use_corelib.pri @@ -5,7 +5,7 @@ isEmpty(QBSLIBDIR) { QBSLIBDIR = $$OUT_PWD/../../../$${QBS_LIBRARY_DIRNAME} } -QT += script xml +QT += xml unix { LIBS += -L$$QBSLIBDIR -lqbscore diff --git a/src/lib/corelib/use_installed_corelib.pri b/src/lib/corelib/use_installed_corelib.pri index 8726d6ec1..d6a805315 100644 --- a/src/lib/corelib/use_installed_corelib.pri +++ b/src/lib/corelib/use_installed_corelib.pri @@ -1,6 +1,6 @@ include(qbs_version.pri) -QT += script xml +QT += xml QBSLIBDIR=$${PWD}/../../lib unix { |