diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-03-09 12:11:17 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-03-09 12:14:55 +0100 |
| commit | cec29f34eaa286103978167ac30c429c4bd16a68 (patch) | |
| tree | b9383e19c93a80936c217600c3c4786512687cb8 /qbs | |
| parent | 34c16ed7bcd6c222839a05aee8cfa911e92fa918 (diff) | |
| parent | 33fa4b401c8e4f49cbee3bd31c7c21ade37faf6d (diff) | |
Merge remote-tracking branch 'origin/4.2' into 4.3
Conflicts:
doc/src/qtcreator.qdoc
tests/system/suite_general/suite.conf
Change-Id: Ia298b177d6920a1d853e342b62cf98f7c48a278a
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcDocumentation.qbs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/qbs/imports/QtcDocumentation.qbs b/qbs/imports/QtcDocumentation.qbs index 8fbbcaf795..f1f2d74edb 100644 --- a/qbs/imports/QtcDocumentation.qbs +++ b/qbs/imports/QtcDocumentation.qbs @@ -19,7 +19,6 @@ Product { property string versionTag: qtc.qtcreator_version.replace(/\.|-/g, "") Qt.core.qdocEnvironment: [ - "QTC_LICENSE_TYPE=" + project.licenseType, "QTC_VERSION=" + qtc.qtcreator_version, "QTC_VERSION_TAG=" + qtc.qtcreator_version, "SRCDIR=" + sourceDirectory, |