feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Pass IDE_DISPLAY_NAME et al to qdoc and use it for manual

Browse Source 
Change-Id: I5d52c9561d4c49df503c0e99c8765979516e5b5c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Eike Ziller
2018-06-18 16:03:42 +02:00
parent f112edd905
commit 54208113ee
3 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/config/macros.qdocconf
View File

@@ -17,8 +17,8 @@ macro.note = "\\b{Note:}"
macro.oslash.HTML = "&oslash;" macro.oslash.HTML = "&oslash;"
macro.ouml.HTML = "&ouml;" macro.ouml.HTML = "&ouml;"
macro.QA = "Qt Assistant" macro.QA = "Qt Assistant"
macro.QC = "Qt Creator" macro.QC = "$IDE_DISPLAY_NAME"
macro.QCE = "Qt Creator Enterprise" macro.QCE = "$IDE_DISPLAY_NAME Enterprise"
macro.QD = "Qt Designer" macro.QD = "Qt Designer"
macro.QL = "Qt Linguist" macro.QL = "Qt Linguist"
macro.QMLD = "Qt Quick Designer" macro.QMLD = "Qt Quick Designer"

24
doc/config/qtcreator-project.qdocconf
View File

@@ -1,6 +1,6 @@
project = "QtCreator" project = "$IDE_DISPLAY_NAME"
description = "Qt Creator Manual" description = "$IDE_DISPLAY_NAME Manual"
url = http://doc.qt.io/qtcreator url = http://doc.qt.io/$IDE_ID
headerdirs = headerdirs =
sourcedirs = ../src sourcedirs = ../src
@@ -54,17 +54,17 @@ include(qt-defines.qdocconf)
sources.fileextensions = "*.qdoc" sources.fileextensions = "*.qdoc"
qhp.projects = QtCreator qhp.projects = QtCreator
qhp.QtCreator.file = qtcreator.qhp qhp.QtCreator.file = $IDE_ID.qhp
qhp.QtCreator.namespace = org.qt-project.qtcreator.$QTC_VERSION_TAG qhp.QtCreator.namespace = org.qt-project.$IDE_ID.$QTC_VERSION_TAG
qhp.QtCreator.virtualFolder = doc qhp.QtCreator.virtualFolder = doc
qhp.QtCreator.indexTitle = Qt Creator Manual $QTC_VERSION qhp.QtCreator.indexTitle = $IDE_DISPLAY_NAME Manual $QTC_VERSION
qhp.QtCreator.filterAttributes = qtcreator $QTC_VERSION qhp.QtCreator.filterAttributes = $IDE_ID $QTC_VERSION
qhp.QtCreator.customFilters.QtCreator.name = Qt Creator $QTC_VERSION qhp.QtCreator.customFilters.QtCreator.name = $IDE_DISPLAY_NAME $QTC_VERSION
qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator $QTC_VERSION qhp.QtCreator.customFilters.QtCreator.filterAttributes = $IDE_ID $QTC_VERSION
qhp.QtCreator.indexRoot = qhp.QtCreator.indexRoot =
qhp.QtCreator.subprojects = manual qhp.QtCreator.subprojects = manual
qhp.QtCreator.subprojects.manual.title = Qt Creator Manual qhp.QtCreator.subprojects.manual.title = $IDE_DISPLAY_NAME Manual
qhp.QtCreator.subprojects.manual.indexTitle = All Topics qhp.QtCreator.subprojects.manual.indexTitle = All Topics
qhp.QtCreator.subprojects.manual.type = manual qhp.QtCreator.subprojects.manual.type = manual
@@ -73,5 +73,5 @@ qhp.QtCreator.subprojects.manual.type = manual
macro.see = "\\sa" macro.see = "\\sa"
macro.function = "\\fn" macro.function = "\\fn"
navigation.landingpage = "Qt Creator Manual" navigation.landingpage = "$IDE_DISPLAY_NAME Manual"
buildversion = "Qt Creator Manual $QTC_VERSION" buildversion = "$IDE_DISPLAY_NAME Manual $QTC_VERSION"

8
docs.pri
View File

@@ -5,6 +5,12 @@
isEmpty(VERSION): error("Include qtcreator.pri before including docs.pri!") isEmpty(VERSION): error("Include qtcreator.pri before including docs.pri!")
qtcname.name = IDE_DISPLAY_NAME
qtcname.value = "$$IDE_DISPLAY_NAME"
qtcid.name = IDE_ID
qtcid.value = $$IDE_ID
qtccasedid.name = IDE_CASED_ID
qtccasedid.value = $$IDE_CASED_ID
qtcver.name = QTC_VERSION qtcver.name = QTC_VERSION
qtcver.value = $$QTCREATOR_DISPLAY_VERSION qtcver.value = $$QTCREATOR_DISPLAY_VERSION
qtcvertag.name = QTC_VERSION_TAG qtcvertag.name = QTC_VERSION_TAG
@@ -17,7 +23,7 @@ qtcdocsdir.name = QTC_DOCS_DIR
qtcdocsdir.value = $$IDE_SOURCE_TREE/doc qtcdocsdir.value = $$IDE_SOURCE_TREE/doc
qtccopyrightyear.name = QTCREATOR_COPYRIGHT_YEAR qtccopyrightyear.name = QTCREATOR_COPYRIGHT_YEAR
qtccopyrightyear.value = $$QTCREATOR_COPYRIGHT_YEAR qtccopyrightyear.value = $$QTCREATOR_COPYRIGHT_YEAR
QDOC_ENV += qtcver qtcvertag qtdocs qdocindex qtcdocsdir qtccopyrightyear QDOC_ENV += qtcname qtcid qtccasedid qtcver qtcvertag qtdocs qdocindex qtcdocsdir qtccopyrightyear
DOC_INDEX_PATHS += $$IDE_BUILD_TREE/doc DOC_INDEX_PATHS += $$IDE_BUILD_TREE/doc
DOC_HTML_INSTALLDIR = $$INSTALL_DOC_PATH DOC_HTML_INSTALLDIR = $$INSTALL_DOC_PATH