diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-17 09:52:15 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-17 09:52:15 +0100 |
| commit | aa55356a840cf1b76aea9b6e6137717dfdeff75c (patch) | |
| tree | 48217f4019867899716fa2ab9bfdd240d98af28b /doc/config/compat.qdocconf | |
| parent | 3ad671581149d22eaa2f1562f32cea754bfb1087 (diff) | |
| parent | 46a55f2a75b67c477c7fd0d8d706906475e7ec55 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
doc/config/qt-html-templates-online.qdocconf
doc/config/qt-html-templates.qdocconf
doc/config/qtsensors.qdocconf
Change-Id: Iaf258dbe5311c1f3e190e4b2bff5297f1d4e290e
Diffstat (limited to 'doc/config/compat.qdocconf')
| -rw-r--r-- | doc/config/compat.qdocconf | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/doc/config/compat.qdocconf b/doc/config/compat.qdocconf deleted file mode 100644 index 53a26136..00000000 --- a/doc/config/compat.qdocconf +++ /dev/null @@ -1,31 +0,0 @@ -alias.i = e -alias.include = input - -macro.0 = "\\\\0" -macro.b = "\\\\b" -macro.n = "\\\\n" -macro.r = "\\\\r" -macro.i = "\\li" -macro.i11 = "\\li{1,1}" -macro.i12 = "\\li{1,2}" -macro.i13 = "\\li{1,3}" -macro.i14 = "\\li{1,4}" -macro.i15 = "\\li{1,5}" -macro.i16 = "\\li{1,6}" -macro.i17 = "\\li{1,7}" -macro.i18 = "\\li{1,8}" -macro.i19 = "\\li{1,9}" -macro.i21 = "\\li{2,1}" -macro.i31 = "\\li{3,1}" -macro.i41 = "\\li{4,1}" -macro.i51 = "\\li{5,1}" -macro.i61 = "\\li{6,1}" -macro.i71 = "\\li{7,1}" -macro.i81 = "\\li{8,1}" -macro.i91 = "\\li{9,1}" -macro.img = "\\image" -macro.endquote = "\\endquotation" -macro.relatesto = "\\relates" - -spurious = "Missing comma in .*" \ - "Missing pattern .*" |