Commit 461a7483 authored by Eike Ziller's avatar Eike Ziller

Doc: Remove unused QTC_LICENSE_TYPE define

Change-Id: Iba49e6fc6b1d857cc0f87b5bf833f42a4a8a976f
Reviewed-by: Kai Koehne's avatarKai Koehne <kai.koehne@qt.io>
parent ade7393e
...@@ -10,7 +10,6 @@ defines = Q_QDOC \ ...@@ -10,7 +10,6 @@ defines = Q_QDOC \
Q_BYTE_ORDER \ Q_BYTE_ORDER \
QT_DEPRECATED \ QT_DEPRECATED \
Q_NO_USING_KEYWORD \ Q_NO_USING_KEYWORD \
__cplusplus \ __cplusplus
$QTC_LICENSE_TYPE
versionsym = QT_VERSION_STR versionsym = QT_VERSION_STR
...@@ -5,8 +5,6 @@ COMPAT = ...@@ -5,8 +5,6 @@ COMPAT =
VERSION_TAG = $$replace(QTCREATOR_VERSION, "[-.]", ) VERSION_TAG = $$replace(QTCREATOR_VERSION, "[-.]", )
isEmpty(LICENSE_TYPE):LICENSE_TYPE=opensource
# unset the installdir for qdoc, so we force generation # unset the installdir for qdoc, so we force generation
# of URLs for the links to the Qt documentation # of URLs for the links to the Qt documentation
QMAKE_DOCS_INSTALLDIR = QMAKE_DOCS_INSTALLDIR =
...@@ -17,7 +15,7 @@ defineReplace(cmdEnv) { ...@@ -17,7 +15,7 @@ defineReplace(cmdEnv) {
} }
defineReplace(qdoc) { defineReplace(qdoc) {
return("$$cmdEnv(SRCDIR=$$PWD OUTDIR=$$1 QTC_VERSION=$$QTCREATOR_VERSION QTC_VERSION_TAG=$$VERSION_TAG QTC_LICENSE_TYPE=$$LICENSE_TYPE $$QDOC_GLOBAL) $$QDOC_BIN") return("$$cmdEnv(SRCDIR=$$PWD OUTDIR=$$1 QTC_VERSION=$$QTCREATOR_VERSION QTC_VERSION_TAG=$$VERSION_TAG $$QDOC_GLOBAL) $$QDOC_BIN")
} }
QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp
......
...@@ -19,7 +19,6 @@ Product { ...@@ -19,7 +19,6 @@ Product {
property string versionTag: qtc.qtcreator_version.replace(/\.|-/g, "") property string versionTag: qtc.qtcreator_version.replace(/\.|-/g, "")
Qt.core.qdocEnvironment: [ Qt.core.qdocEnvironment: [
"QTC_LICENSE_TYPE=" + project.licenseType,
"QTC_VERSION=" + qtc.qtcreator_version, "QTC_VERSION=" + qtc.qtcreator_version,
"QTC_VERSION_TAG=" + qtc.qtcreator_version, "QTC_VERSION_TAG=" + qtc.qtcreator_version,
"SRCDIR=" + sourceDirectory, "SRCDIR=" + sourceDirectory,
......
...@@ -6,7 +6,6 @@ Project { ...@@ -6,7 +6,6 @@ Project {
name: "Qt Creator" name: "Qt Creator"
minimumQbsVersion: "1.6.0" minimumQbsVersion: "1.6.0"
property bool withAutotests: qbs.buildVariant === "debug" property bool withAutotests: qbs.buildVariant === "debug"
property string licenseType: "opensource"
property path ide_source_tree: path property path ide_source_tree: path
property pathList additionalPlugins: [] property pathList additionalPlugins: []
property pathList additionalLibs: [] property pathList additionalLibs: []
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment