diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-06-20 15:48:59 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-06-22 09:02:49 +0000 |
| commit | 16432be9afc39372b7c35a4fb2929b5835c067e0 (patch) | |
| tree | e1a7231c6e6abc267e898105fdb67e84ab0040ee /src/lib/corelib/corelib.qbs | |
| parent | dfe13cd2180db68877eb9f72f8115d54b9efa644 (diff) | |
Move the buildgraph, language and tools tests into the proper locations
Also export necessary symbols that they need.
Change-Id: I3023893a3da82cf0d86b0d08df38943db867cf3a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/corelib.qbs')
| -rw-r--r-- | src/lib/corelib/corelib.qbs | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs index eac9e709c..6f470902a 100644 --- a/src/lib/corelib/corelib.qbs +++ b/src/lib/corelib/corelib.qbs @@ -4,7 +4,6 @@ QbsLibrary { Depends { name: "cpp" } Depends { name: "Qt"; submodules: ["core-private", "network", "script", "xml"] } Depends { condition: qbsbuildconfig.enableProjectFileUpdates; name: "Qt.gui" } - Depends { condition: qbsbuildconfig.enableUnitTests; name: "Qt.testlib" } Depends { condition: Qt.core.staticBuild; productTypes: ["qbsplugin"] } name: "qbscore" cpp.includePaths: base.concat([ @@ -13,13 +12,14 @@ QbsLibrary { ]) property stringList projectFileUpdateDefines: qbsbuildconfig.enableProjectFileUpdates ? ["QBS_ENABLE_PROJECT_FILE_UPDATES"] : [] + property stringList enableUnitTestsDefines: + qbsbuildconfig.enableUnitTests ? ["QBS_ENABLE_UNIT_TESTS"] : [] // TODO: Use Utilities.cStringQuote cpp.defines: base.concat([ 'QBS_RELATIVE_LIBEXEC_PATH="' + qbsbuildconfig.relativeLibexecPath + '"', "QBS_VERSION=\"" + version + "\"", "QT_CREATOR", "QML_BUILD_STATIC_LIB", // needed for QmlJS - "SRCDIR=\"" + path + "\"" - ]).concat(projectFileUpdateDefines) + ]).concat(projectFileUpdateDefines).concat(enableUnitTestsDefines) Properties { condition: qbs.targetOS.contains("windows") @@ -455,19 +455,6 @@ QbsLibrary { qbs.install: qbsbuildconfig.installApiHeaders qbs.installDir: headerInstallPrefix } - Group { - condition: qbsbuildconfig.enableUnitTests - name: "tests" - cpp.defines: outer.filter(function(def) { return def !== "QT_NO_CAST_FROM_ASCII"; }) - files: [ - "buildgraph/tst_buildgraph.cpp", - "buildgraph/tst_buildgraph.h", - "language/tst_language.cpp", - "language/tst_language.h", - "tools/tst_tools.h", - "tools/tst_tools.cpp" - ] - } Export { Depends { name: "cpp" } cpp.defines: product.projectFileUpdateDefines |