diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2018-02-28 14:39:24 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2018-03-01 12:46:23 +0000 |
| commit | 96b76723186cedc121ca1b143fe65bad9ed3f595 (patch) | |
| tree | 562a43a8d44fea1ae157d657474714fc5c2fd078 /doc | |
| parent | 5ec853169633d958c653c2a9431225e37843af98 (diff) | |
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 <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/config/ifw.qdocconf | 6 |
1 files changed, 5 insertions, 1 deletions
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" |