diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-03-13 11:25:38 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-03-13 11:25:38 +0100 |
| commit | 0b10ecc718accd8c4d472ba8f3ed5ea6f1856e51 (patch) | |
| tree | 67f63d2b4aa20195910728659cd3c0ba2cb580eb /qbs | |
| parent | f1985df55dfa81f184c9d29df6cfbb353bf77ffc (diff) | |
| parent | 0bcc983cdbb74baebccfdb09f7d2ffb22ebf950d (diff) | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
src/plugins/cmakeprojectmanager/cmakeproject.h
src/plugins/debugger/debuggerplugin.cpp
src/plugins/ios/iosrunfactories.cpp
src/plugins/nim/project/nimproject.h
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp
src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
src/plugins/qmlprojectmanager/qmlproject.h
src/plugins/qnx/qnxrunconfigurationfactory.cpp
src/plugins/qtsupport/exampleslistmodel.cpp
src/plugins/winrt/winrtrunfactories.cpp
Change-Id: Ib029fdbaa65270426332f5edd6e90264be5fb539
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/modules/pluginjson/pluginjson.qbs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qbs/modules/pluginjson/pluginjson.qbs b/qbs/modules/pluginjson/pluginjson.qbs index 8cba183437..f684dbccb4 100644 --- a/qbs/modules/pluginjson/pluginjson.qbs +++ b/qbs/modules/pluginjson/pluginjson.qbs @@ -13,6 +13,7 @@ Module { Depends { name: "vcs"; condition: hasVcs } Properties { condition: hasVcs + vcs.headerFileName: undefined vcs.repoDir: { // TODO: Could something like this be incorporated into the vcs module? // Currently, the default repo dir is project.sourceDirectory, which |