diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-29 01:00:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-29 01:00:10 +0200 |
| commit | 0e1866017fd389629629b150ce252820592506cd (patch) | |
| tree | 681142ae0e610ef7af2a43ca2d62c3ea5ed5f91a /doc | |
| parent | 9567a34bc0d9be87d3b0d6cbcb841837ca1d5659 (diff) | |
| parent | 9a8175a13124e156948914854d2fda7436065b08 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I6083c3e61b7dbe188f83676f7e7bb268e5ccf2f3
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/global/macros.qdocconf | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/global/macros.qdocconf b/doc/global/macros.qdocconf index dbf8c5cc6a..704b1da277 100644 --- a/doc/global/macros.qdocconf +++ b/doc/global/macros.qdocconf @@ -19,6 +19,7 @@ macro.QD = "\\e{Qt Designer}" macro.QL = "\\e{Qt Linguist}" macro.QQV = "\\e{Qt QML Viewer}" macro.QtVersion = "$QT_VERSION" +macro.QtVer = "$QT_VER" macro.param = "\\e" macro.raisedaster.HTML = "<sup>*</sup>" macro.rarrow.HTML = "→" @@ -40,6 +41,10 @@ macro.endfloat.HTML = "</div>" macro.clearfloat.HTML = "<br style=\"clear: both\" />" macro.emptyspan.HTML = "<span></span>" +# Expands to the minor version based on the QT_VER environment variable +macro.QtMinorVersion = "$QT_VER" +macro.QtMinorVersion.match = "\\d+\\.(\\d+)" + # Embed YouTube content by video ID - Example: \youtube dQw4w9WgXcQ # Also requires a <ID>.jpg thumbnail for offline docs. In .qdocconf, add: # |