From 461a7483e3563b083f66406e4e78df3dcafd1268 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Thu, 2 Mar 2017 10:33:14 +0100
Subject: [PATCH] Doc: Remove unused QTC_LICENSE_TYPE define

Change-Id: Iba49e6fc6b1d857cc0f87b5bf833f42a4a8a976f
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
---
 doc/config/qt-defines.qdocconf   | 3 +--
 doc/doc.pri                      | 4 +---
 qbs/imports/QtcDocumentation.qbs | 1 -
 qtcreator.qbs                    | 1 -
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/doc/config/qt-defines.qdocconf b/doc/config/qt-defines.qdocconf
index cde37a1c03f..b8daa054972 100644
--- a/doc/config/qt-defines.qdocconf
+++ b/doc/config/qt-defines.qdocconf
@@ -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
diff --git a/doc/doc.pri b/doc/doc.pri
index 207788a0f17..d6357ae3113 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -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 =
@@ -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
diff --git a/qbs/imports/QtcDocumentation.qbs b/qbs/imports/QtcDocumentation.qbs
index 8fbbcaf795c..f1f2d74edbe 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,
diff --git a/qtcreator.qbs b/qtcreator.qbs
index f01ad640242..f28ba82a1aa 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -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: []