Skip to content

Commit

Permalink
Doc: Remove unused QTC_LICENSE_TYPE define
Browse files Browse the repository at this point in the history
Change-Id: Iba49e6fc6b1d857cc0f87b5bf833f42a4a8a976f
Reviewed-by: Kai Koehne <[email protected]>
  • Loading branch information
e4z9 committed Mar 6, 2017
1 parent ade7393 commit 461a748
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 7 deletions.
3 changes: 1 addition & 2 deletions doc/config/qt-defines.qdocconf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ defines = Q_QDOC \
Q_BYTE_ORDER \
QT_DEPRECATED \
Q_NO_USING_KEYWORD \
__cplusplus \
$QTC_LICENSE_TYPE
__cplusplus

versionsym = QT_VERSION_STR
4 changes: 1 addition & 3 deletions doc/doc.pri
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ COMPAT =

VERSION_TAG = $$replace(QTCREATOR_VERSION, "[-.]", )

isEmpty(LICENSE_TYPE):LICENSE_TYPE=opensource

# unset the installdir for qdoc, so we force generation
# of URLs for the links to the Qt documentation
QMAKE_DOCS_INSTALLDIR =
Expand All @@ -17,7 +15,7 @@ defineReplace(cmdEnv) {
}

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
Expand Down
1 change: 0 additions & 1 deletion qbs/imports/QtcDocumentation.qbs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion qtcreator.qbs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ Project {
name: "Qt Creator"
minimumQbsVersion: "1.6.0"
property bool withAutotests: qbs.buildVariant === "debug"
property string licenseType: "opensource"
property path ide_source_tree: path
property pathList additionalPlugins: []
property pathList additionalLibs: []
Expand Down

0 comments on commit 461a748

Please sign in to comment.