diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-19 09:48:10 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-19 09:48:10 +0100 |
| commit | 739585b2f5684956d9c5b999300b4b7b2cd0daa3 (patch) | |
| tree | c785232d461328db1a2a8e85748e75e402ed8a08 /doc | |
| parent | 0ffc39806e4669eaebe2d20d197b3a6f356be862 (diff) | |
| parent | 13f6eb9773c0a4c64da7070be4ac3bbf66f8c82d (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/corelib/io/qprocess_win.cpp
Change-Id: Ib61b74a69922ec1e9eecbba5f75352b4ec167fa9
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/global/macros.qdocconf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/global/macros.qdocconf b/doc/global/macros.qdocconf index 5544da425a..dbf8c5cc6a 100644 --- a/doc/global/macros.qdocconf +++ b/doc/global/macros.qdocconf @@ -18,6 +18,7 @@ macro.QA = "\\e{Qt Assistant}" macro.QD = "\\e{Qt Designer}" macro.QL = "\\e{Qt Linguist}" macro.QQV = "\\e{Qt QML Viewer}" +macro.QtVersion = "$QT_VERSION" macro.param = "\\e" macro.raisedaster.HTML = "<sup>*</sup>" macro.rarrow.HTML = "→" |