diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-06-18 16:03:42 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-06-20 10:01:52 +0000 |
| commit | 54208113eee147b29a7a7c4df96365569890fd56 (patch) | |
| tree | 9b460906aeb228030d8174ba1bd340da6a481ec0 /doc/config | |
| parent | f112edd905598b0559d6edd06885d08588ba7348 (diff) | |
| download | qt-creator-54208113eee147b29a7a7c4df96365569890fd56.tar.gz | |
Pass IDE_DISPLAY_NAME et al to qdoc and use it for manual
Change-Id: I5d52c9561d4c49df503c0e99c8765979516e5b5c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'doc/config')
| -rw-r--r-- | doc/config/macros.qdocconf | 4 | ||||
| -rw-r--r-- | doc/config/qtcreator-project.qdocconf | 24 |
2 files changed, 14 insertions, 14 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" |