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 /share/share.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 'share/share.qbs')
-rw-r--r-- | share/share.qbs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/share/share.qbs b/share/share.qbs index d78dd9a98..7c60a8784 100644 --- a/share/share.qbs +++ b/share/share.qbs @@ -5,12 +5,13 @@ import qbs.FileInfo Product { name: "qbs resources" type: ["copied qbs resources"] + Depends { name: "qbsbuildconfig" } Group { name: "Modules and imports" files: ["qbs/**/*"] fileTags: ["qbs resources"] qbs.install: true - qbs.installDir: project.resourcesInstallDir + "/share" + qbs.installDir: qbsbuildconfig.resourcesInstallDir + "/share" qbs.installSourceBase: "." } @@ -19,14 +20,15 @@ Product { files: ["../examples/**/*"] fileTags: [] qbs.install: true - qbs.installDir: project.resourcesInstallDir + "/share/qbs" + qbs.installDir: qbsbuildconfig.resourcesInstallDir + "/share/qbs" qbs.installSourceBase: ".." } Rule { inputs: ["qbs resources"] Artifact { - filePath: FileInfo.joinPaths(project.buildDirectory, project.resourcesInstallDir, + filePath: FileInfo.joinPaths(project.buildDirectory, + product.moduleProperty("qbsbuildconfig", "resourcesInstallDir"), "share", FileInfo.relativePath(product.sourceDirectory, input.filePath)) fileTags: ["copied qbs resources"] } |