diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-04-13 10:54:42 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-04-13 10:54:42 +0200 |
| commit | 428fcb476ba2c5bbe1d16dfe437e510dafce1777 (patch) | |
| tree | 10b130ef79d87dd1339004857c8f1e31e29c3f95 /qbs | |
| parent | 9e29a32e1ab3af42a4d70984449ba33b3092a50b (diff) | |
| parent | f4594c922fe3ffcfaf715cf09622ba48c3d1d620 (diff) | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
src/libs/utils/settingsaccessor.cpp
src/plugins/autotest/autotestplugin.cpp
src/plugins/git/gitclient.cpp
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
src/plugins/qbsprojectmanager/qbsrunconfiguration.h
Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcCommercialPlugin.qbs | 1 | ||||
| -rw-r--r-- | qbs/imports/QtcPlugin.qbs | 1 | ||||
| -rw-r--r-- | qbs/modules/pluginjson/pluginjson.qbs | 5 |
3 files changed, 5 insertions, 2 deletions
diff --git a/qbs/imports/QtcCommercialPlugin.qbs b/qbs/imports/QtcCommercialPlugin.qbs index e3ef7a3757..712ad9f157 100644 --- a/qbs/imports/QtcCommercialPlugin.qbs +++ b/qbs/imports/QtcCommercialPlugin.qbs @@ -3,4 +3,5 @@ import qbs QtcPlugin { Depends { name: "LicenseChecker"; required: false } cpp.defines: base.concat(LicenseChecker.present ? ["LICENSECHECKER"] : []) + pluginjson.useVcsData: true } diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs index 7606b02504..4fc7917c41 100644 --- a/qbs/imports/QtcPlugin.qbs +++ b/qbs/imports/QtcPlugin.qbs @@ -17,6 +17,7 @@ QtcProduct { Depends { name: "ExtensionSystem" } Depends { name: "pluginjson" } + pluginjson.useVcsData: false Depends { condition: qtc.testsEnabled name: "Qt.testlib" diff --git a/qbs/modules/pluginjson/pluginjson.qbs b/qbs/modules/pluginjson/pluginjson.qbs index f684dbccb4..eccd53c85b 100644 --- a/qbs/modules/pluginjson/pluginjson.qbs +++ b/qbs/modules/pluginjson/pluginjson.qbs @@ -10,9 +10,10 @@ Module { // TODO: Wrap the VCS specific stuff in a dedicated module 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 { - condition: hasVcs + condition: useVcsData vcs.headerFileName: undefined vcs.repoDir: { // TODO: Could something like this be incorporated into the vcs module? |