diff options
author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-05-17 10:50:51 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-06-08 08:46:00 +0000 |
commit | a0f956f0509a68d7eaec718bed294661bca49996 (patch) | |
tree | f3ff7d1b0063f3ade80db26ca1b5b844a5c34167 /src/src.qbs | |
parent | db9437c2e83ec11befa855e4806ac7920d1a5800 (diff) | |
download | qt-creator-a0f956f0509a68d7eaec718bed294661bca49996.tar.gz |
qbs build: Introduce new module "qtc".
The qtc module gathers properties that used to live in the top-level
project file. This is the first step towards making it possible to build
plugins against an installed Qt Creator ("out of source build").
Change-Id: Ia1514cc9c888e80be01b308e908de48980fcbdb8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/src.qbs')
-rw-r--r-- | src/src.qbs | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/src.qbs b/src/src.qbs index 69160e489e..cca3a2ddd9 100644 --- a/src/src.qbs +++ b/src/src.qbs @@ -23,25 +23,9 @@ Project { id: qbsProject property string qbsBaseDir: project.sharedSourcesDir + "/qbs" condition: qbsSubModuleExists && !useExternalQbs - qbsSearchPaths: [qbsBaseDir + "/qbs-resources"] - property bool enableUnitTests: false - property bool enableProjectFileUpdates: true - property bool installApiHeaders: false - property string libInstallDir: project.ide_library_path - property stringList libRPaths: qbs.targetOS.contains("osx") - ? ["@loader_path/" + FileInfo.relativePath('/' + appInstallDir, '/' + libInstallDir)] - : ["$ORIGIN/..", "$ORIGIN/../" + project.ide_library_path] - property string resourcesInstallDir: project.ide_data_path + "/qbs" - property string pluginsInstallDir: project.ide_plugin_path - property string appInstallDir: project.ide_bin_path - property string libexecInstallDir: project.ide_libexec_path - property string relativeLibexecPath: FileInfo.relativePath('/' + appInstallDir, - '/' + libexecInstallDir) - property string relativePluginsPath: FileInfo.relativePath('/' + appInstallDir, - '/' + pluginsInstallDir) - property string relativeSearchPath: FileInfo.relativePath('/' + appInstallDir, - '/' + resourcesInstallDir) + // The first entry is for overriding qbs' own qbsbuildconfig module. + qbsSearchPaths: [project.ide_source_tree + "/qbs", qbsBaseDir + "/qbs-resources"] references: [ qbsBaseDir + "/src/lib/libs.qbs", |