From 2e1f0c25780dfffcdc2cb2cbf364b57947d4d956 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 21 Jun 2018 14:08:59 +0200 Subject: [PATCH] Fix documentation build when renaming IDE Do not rename documentation qhp file. The documentation qmake files currently depend on the files having the same base name as the qdocconf file. Also do not change the documentation namespace. There are places where these are mentioned in translated strings. Fixup of 54208113eee147b29a7a7c4df96365569890fd56 Change-Id: Iace171535ea5be6e22fec9760a5d96722b052341 Reviewed-by: Leena Miettinen Reviewed-by: Thomas Hartmann Reviewed-by: Tim Jenssen --- doc/config/qtcreator-project.qdocconf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf index 5762f9c6eb1..983fc3e895e 100644 --- a/doc/config/qtcreator-project.qdocconf +++ b/doc/config/qtcreator-project.qdocconf @@ -54,8 +54,8 @@ include(qt-defines.qdocconf) sources.fileextensions = "*.qdoc" qhp.projects = QtCreator -qhp.QtCreator.file = $IDE_ID.qhp -qhp.QtCreator.namespace = org.qt-project.$IDE_ID.$QTC_VERSION_TAG +qhp.QtCreator.file = qtcreator.qhp +qhp.QtCreator.namespace = org.qt-project.qtcreator.$QTC_VERSION_TAG qhp.QtCreator.virtualFolder = doc qhp.QtCreator.indexTitle = $IDE_DISPLAY_NAME Manual $QTC_VERSION qhp.QtCreator.filterAttributes = $IDE_ID $QTC_VERSION