diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-07-10 09:59:56 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-07-10 09:59:56 +0200 |
| commit | 3158981e9d8773d88eeab2f5c9a27c595b35cc3b (patch) | |
| tree | 7f69aa3f6a036613f74702ce7df8fdc19d623111 /qbs | |
| parent | 79ec3b3cdd41187a52d0521d050376f73d798840 (diff) | |
| parent | 345ea0307cb34bc7a00acb8881fa53bedb28b0ca (diff) | |
Merge remote-tracking branch 'origin/4.4'
Conflicts:
qtcreator.pri
Change-Id: Ibb67815f6bb33a4c5ddc33b71f9c436624685e11
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 { |