feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qbs build: Enable the vcs module only for commercial plugins

Browse Source 
The other ones are in the Qt Creator source tree and should not get
rebuilt on repo metadata changes, because they do not make use of
QTC_PLUGIN_REVISION.

Change-Id: I216a89de4411948b7ccad65f883d0d8782a283d4
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Christian Kandeler
2018-04-04 13:12:41 +02:00
parent 0029231e3b
commit d2d5208819
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
qbs/imports/QtcCommercialPlugin.qbs
View File

@@ -3,4 +3,5 @@ import qbs
QtcPlugin { QtcPlugin {
Depends { name: "LicenseChecker"; required: false } Depends { name: "LicenseChecker"; required: false }
cpp.defines: base.concat(LicenseChecker.present ? ["LICENSECHECKER"] : []) cpp.defines: base.concat(LicenseChecker.present ? ["LICENSECHECKER"] : [])
pluginjson.useVcsData: true
} }

1
qbs/imports/QtcPlugin.qbs
View File

@@ -17,6 +17,7 @@ QtcProduct {
Depends { name: "ExtensionSystem" } Depends { name: "ExtensionSystem" }
Depends { name: "pluginjson" } Depends { name: "pluginjson" }
pluginjson.useVcsData: false
Depends { Depends {
condition: qtc.testsEnabled condition: qtc.testsEnabled
name: "Qt.testlib" name: "Qt.testlib"

5
qbs/modules/pluginjson/pluginjson.qbs
View File

@@ -10,9 +10,10 @@ Module {
// TODO: Wrap the VCS specific stuff in a dedicated module // TODO: Wrap the VCS specific stuff in a dedicated module
property bool hasVcs: Utilities.versionCompare(qbs.version, "1.10") >= 0 property bool hasVcs: Utilities.versionCompare(qbs.version, "1.10") >= 0
Depends { name: "vcs"; condition: hasVcs } property bool useVcsData: hasVcs
Depends { name: "vcs"; condition: useVcsData }
Properties { Properties {
condition: hasVcs condition: useVcsData
vcs.headerFileName: undefined vcs.headerFileName: undefined
vcs.repoDir: { vcs.repoDir: {
// TODO: Could something like this be incorporated into the vcs module? // TODO: Could something like this be incorporated into the vcs module?