From 96b76723186cedc121ca1b143fe65bad9ed3f595 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 28 Feb 2018 14:39:24 +0100 Subject: Avoid including macro.qdocconf from Qt documentation From Qt 5.11 onwards, macro.qdocconf requires QT_VERSION environment variable to be defined. Just copy the two custom commands we use in IFW. Task-number: QTIFW-1103 Change-Id: Ib2d81e0f9e7b5518206efaf2a219ceb8109f6490 Reviewed-by: Leena Miettinen --- doc/config/ifw.qdocconf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/config/ifw.qdocconf b/doc/config/ifw.qdocconf index 870245eb2..884539f27 100644 --- a/doc/config/ifw.qdocconf +++ b/doc/config/ifw.qdocconf @@ -1,4 +1,3 @@ -include($QT_INSTALL_DOCS/global/macros.qdocconf) include($QT_INSTALL_DOCS/global/qt-cpp-defines.qdocconf) include($QT_INSTALL_DOCS/global/compat.qdocconf) include($QT_INSTALL_DOCS/global/fileextensions.qdocconf) @@ -45,6 +44,11 @@ qhp.InstallerFramework.subprojects.manual.type = manual macro.ifwversion = $IFW_VERSION +# commands borrowed from qtbase/doc/global/macros.qdocconf + +macro.gui = "\\b" +macro.key = "\\b" + # Doxygen compatibility commands macro.see = "\\sa" -- cgit v1.2.3