diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-07-10 09:54:52 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-07-10 09:54:52 +0200 |
| commit | 345ea0307cb34bc7a00acb8881fa53bedb28b0ca (patch) | |
| tree | 11b96bf9330e9c7a4b5c1b04b982be2bdd63741b /qbs | |
| parent | 491ab37b1f5499bf53b5c8e41862776ec4d3658c (diff) | |
| parent | 4196534759f7f7aa04c8675378cfec57539abc75 (diff) | |
Merge remote-tracking branch 'origin/4.3' into 4.4
Conflicts:
qtcreator.qbs
Change-Id: Ic5e268326d93172208de291d31a716e437b9cedf
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcProduct.qbs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs index d89dbd1635..ea9fb30163 100644 --- a/qbs/imports/QtcProduct.qbs +++ b/qbs/imports/QtcProduct.qbs @@ -8,6 +8,7 @@ Product { version: qtc.qtcreator_version property bool install: true property string installDir + property string installSourceBase property stringList installTags: type property string fileName: FileInfo.fileName(sourceDirectory) + ".qbs" property bool useNonGuiPchFile: false @@ -37,6 +38,7 @@ Product { fileTagsFilter: installTags qbs.install: install qbs.installDir: installDir + qbs.installSourceBase: installSourceBase } Group { |