diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2018-02-02 13:31:17 +0100 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2018-02-28 12:41:36 +0000 |
| commit | 486d4c68f3f0ea8294fbdb702f1cba1826367216 (patch) | |
| tree | 83b083d9c13e04ab850127b5107b4007fd2ac2e2 /doc | |
| parent | 1ca9e90419f2dcd47ba9640110f642510055451b (diff) | |
Docs: Remove dependency to Qt's macros.qdocconf
The macros.qdocconf from Qt's global documentation config includes a
macro that uses the value of QT_VERSION, which is not defined for
IFW.
The documentation build therefore fails with
'error: Environment variable 'QT_VERSION' undefined'.
To work around this, load the macros we use from a local qdocconf
file.
Change-Id: I1dc02dffc758af8e855e42a0fceabb84434876d2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/config/ifw.qdocconf | 2 | ||||
| -rw-r--r-- | doc/config/macros.qdocconf | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/config/ifw.qdocconf b/doc/config/ifw.qdocconf index 870245eb2..dd133c3f9 100644 --- a/doc/config/ifw.qdocconf +++ b/doc/config/ifw.qdocconf @@ -1,4 +1,4 @@ -include($QT_INSTALL_DOCS/global/macros.qdocconf) +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) diff --git a/doc/config/macros.qdocconf b/doc/config/macros.qdocconf new file mode 100644 index 000000000..6fe77ba8f --- /dev/null +++ b/doc/config/macros.qdocconf @@ -0,0 +1,2 @@ +macro.gui = "\\b" +macro.key = "\\b" |