diff options
author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-05-19 17:07:49 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-06-07 12:31:21 +0000 |
commit | ddc360f424720799c26ce47d49f13929e00af2df (patch) | |
tree | 3713414489cb0871b84fc2dcc98036db5a35d408 /src/lib/corelib/corelib.qbs | |
parent | 81e2141158af5ad4f457a2671dd2717d8302e90e (diff) |
qbs build: Move build config properties into a dedicated module.
Qt Creator will do the same in order to be able to build plugins that
are not part of the main source tree. This means the qbs build and
install settings can no longer be controlled by properties in a higher-
level project file, but need to come from a module.
Change-Id: I20c0a4538395c8ee838b33f35be84ee59f601f90
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/lib/corelib/corelib.qbs')
-rw-r--r-- | src/lib/corelib/corelib.qbs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs index 58c70f9b2..4c52af17b 100644 --- a/src/lib/corelib/corelib.qbs +++ b/src/lib/corelib/corelib.qbs @@ -4,15 +4,15 @@ import QbsFunctions QbsLibrary { Depends { name: "cpp" } Depends { name: "Qt"; submodules: ["core-private", "network", "script", "xml"] } - Depends { condition: project.enableProjectFileUpdates; name: "Qt.gui" } - Depends { condition: project.enableUnitTests; name: "Qt.test" } + Depends { condition: qbsbuildconfig.enableProjectFileUpdates; name: "Qt.gui" } + Depends { condition: qbsbuildconfig.enableUnitTests; name: "Qt.test" } name: "qbscore" cpp.includePaths: base.concat([ ".", "../.." // for the plugin headers ]) property stringList projectFileUpdateDefines: - project.enableProjectFileUpdates ? ["QBS_ENABLE_PROJECT_FILE_UPDATES"] : [] + qbsbuildconfig.enableProjectFileUpdates ? ["QBS_ENABLE_PROJECT_FILE_UPDATES"] : [] cpp.defines: base.concat([ "QBS_VERSION=\"" + version + "\"", "QT_CREATOR", "QML_BUILD_STATIC_LIB", // needed for QmlJS @@ -37,12 +37,12 @@ QbsLibrary { Group { name: product.name files: ["qbs.h"] - qbs.install: project.installApiHeaders + qbs.install: qbsbuildconfig.installApiHeaders qbs.installDir: headerInstallPrefix } Group { name: "project file updating" - condition: project.enableProjectFileUpdates + condition: qbsbuildconfig.enableProjectFileUpdates prefix: "api/" files: [ "changeset.cpp", @@ -74,7 +74,7 @@ QbsLibrary { } Group { name: "public api headers" - qbs.install: project.installApiHeaders + qbs.install: qbsbuildconfig.installApiHeaders qbs.installDir: headerInstallPrefix + "/api" prefix: "api/" files: [ @@ -159,7 +159,7 @@ QbsLibrary { } Group { name: "public buildgraph headers" - qbs.install: project.installApiHeaders + qbs.install: qbsbuildconfig.installApiHeaders qbs.installDir: headerInstallPrefix + "/buildgraph" files: "buildgraph/forward_decls.h" } @@ -277,7 +277,7 @@ QbsLibrary { } Group { name: "public language headers" - qbs.install: project.installApiHeaders + qbs.install: qbsbuildconfig.installApiHeaders qbs.installDir: headerInstallPrefix + "/language" files: "language/forward_decls.h" } @@ -293,7 +293,7 @@ QbsLibrary { } Group { name: "public logging headers" - qbs.install: project.installApiHeaders + qbs.install: qbsbuildconfig.installApiHeaders qbs.installDir: headerInstallPrefix + "/logging" files: "logging/ilogsink.h" } @@ -402,7 +402,7 @@ QbsLibrary { "setupprojectparameters.h", "toolchains.h", ] - qbs.install: project.installApiHeaders + qbs.install: qbsbuildconfig.installApiHeaders qbs.installDir: headerInstallPrefix + "/tools" } Group { @@ -436,11 +436,11 @@ QbsLibrary { "use_installed_corelib.pri", "../../../qbs_version.pri" ] - qbs.install: project.installApiHeaders + qbs.install: qbsbuildconfig.installApiHeaders qbs.installDir: headerInstallPrefix } Group { - condition: project.enableUnitTests + condition: qbsbuildconfig.enableUnitTests name: "tests" cpp.defines: outer.filter(function(def) { return def !== "QT_NO_CAST_FROM_ASCII"; }) files: [ |