diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2018-03-20 11:16:34 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2018-03-20 11:20:38 +0200 |
| commit | 3f281b049c814602130dd433cedae84e44b28838 (patch) | |
| tree | c127c9320077bc34742d2762241f94ab896c23f7 /doc | |
| parent | 486d4c68f3f0ea8294fbdb702f1cba1826367216 (diff) | |
| parent | 6f28abfa588d36076ad24f39a17d6752fd070ab6 (diff) | |
Merge remote-tracking branch 'origin/3.0' into master
Change-Id: I601b783a9d2eed009737b2779803457949cbb014
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/config/ifw.qdocconf | 6 | ||||
| -rw-r--r-- | doc/config/macros.qdocconf | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/config/ifw.qdocconf b/doc/config/ifw.qdocconf index dd133c3f9..884539f27 100644 --- a/doc/config/ifw.qdocconf +++ b/doc/config/ifw.qdocconf @@ -1,4 +1,3 @@ -include(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" diff --git a/doc/config/macros.qdocconf b/doc/config/macros.qdocconf deleted file mode 100644 index 6fe77ba8f..000000000 --- a/doc/config/macros.qdocconf +++ /dev/null @@ -1,2 +0,0 @@ -macro.gui = "\\b" -macro.key = "\\b" |