diff options
| -rw-r--r-- | doc/config/macros.qdocconf | 4 | ||||
| -rw-r--r-- | doc/config/qtcreator-project.qdocconf | 24 | ||||
| -rw-r--r-- | docs.pri | 8 |
3 files changed, 21 insertions, 15 deletions
diff --git a/doc/config/macros.qdocconf b/doc/config/macros.qdocconf index 3bc993963e..d6c97fe4eb 100644 --- a/doc/config/macros.qdocconf +++ b/doc/config/macros.qdocconf @@ -17,8 +17,8 @@ macro.note = "\\b{Note:}" macro.oslash.HTML = "ø" macro.ouml.HTML = "ö" macro.QA = "Qt Assistant" -macro.QC = "Qt Creator" -macro.QCE = "Qt Creator Enterprise" +macro.QC = "$IDE_DISPLAY_NAME" +macro.QCE = "$IDE_DISPLAY_NAME Enterprise" macro.QD = "Qt Designer" macro.QL = "Qt Linguist" macro.QMLD = "Qt Quick Designer" diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf index e98ab0bc1d..5762f9c6eb 100644 --- a/doc/config/qtcreator-project.qdocconf +++ b/doc/config/qtcreator-project.qdocconf @@ -1,6 +1,6 @@ -project = "QtCreator" -description = "Qt Creator Manual" -url = http://doc.qt.io/qtcreator +project = "$IDE_DISPLAY_NAME" +description = "$IDE_DISPLAY_NAME Manual" +url = http://doc.qt.io/$IDE_ID headerdirs = sourcedirs = ../src @@ -54,17 +54,17 @@ include(qt-defines.qdocconf) sources.fileextensions = "*.qdoc" qhp.projects = QtCreator -qhp.QtCreator.file = qtcreator.qhp -qhp.QtCreator.namespace = org.qt-project.qtcreator.$QTC_VERSION_TAG +qhp.QtCreator.file = $IDE_ID.qhp +qhp.QtCreator.namespace = org.qt-project.$IDE_ID.$QTC_VERSION_TAG qhp.QtCreator.virtualFolder = doc -qhp.QtCreator.indexTitle = Qt Creator Manual $QTC_VERSION -qhp.QtCreator.filterAttributes = qtcreator $QTC_VERSION -qhp.QtCreator.customFilters.QtCreator.name = Qt Creator $QTC_VERSION -qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator $QTC_VERSION +qhp.QtCreator.indexTitle = $IDE_DISPLAY_NAME Manual $QTC_VERSION +qhp.QtCreator.filterAttributes = $IDE_ID $QTC_VERSION +qhp.QtCreator.customFilters.QtCreator.name = $IDE_DISPLAY_NAME $QTC_VERSION +qhp.QtCreator.customFilters.QtCreator.filterAttributes = $IDE_ID $QTC_VERSION qhp.QtCreator.indexRoot = 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.type = manual @@ -73,5 +73,5 @@ qhp.QtCreator.subprojects.manual.type = manual macro.see = "\\sa" macro.function = "\\fn" -navigation.landingpage = "Qt Creator Manual" -buildversion = "Qt Creator Manual $QTC_VERSION" +navigation.landingpage = "$IDE_DISPLAY_NAME Manual" +buildversion = "$IDE_DISPLAY_NAME Manual $QTC_VERSION" @@ -5,6 +5,12 @@ 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.value = $$QTCREATOR_DISPLAY_VERSION qtcvertag.name = QTC_VERSION_TAG @@ -17,7 +23,7 @@ qtcdocsdir.name = QTC_DOCS_DIR qtcdocsdir.value = $$IDE_SOURCE_TREE/doc qtccopyrightyear.name = 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_HTML_INSTALLDIR = $$INSTALL_DOC_PATH |