diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-08 15:48:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-08 15:49:18 +0100 |
| commit | dd756011da13b95fdb630a1bbb90234f1e60f415 (patch) | |
| tree | a6259b1e9b6463108796ce912e3d1752e301505f /doc/global | |
| parent | 0c50edbe84914469973a3b10e0170023ccdd66fe (diff) | |
| parent | b6bf2a33f4c33a212da7b58a049b3b5b20b3f327 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
configure.json
mkspecs/win32-icc/qmake.conf
Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f
Diffstat (limited to 'doc/global')
| -rw-r--r-- | doc/global/compat.qdocconf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/global/compat.qdocconf b/doc/global/compat.qdocconf index 12d061a28a..df3f49c653 100644 --- a/doc/global/compat.qdocconf +++ b/doc/global/compat.qdocconf @@ -6,4 +6,5 @@ macro.endquote = "\\endquotation" macro.relatesto = "\\relates" spurious = "Missing comma in .*" \ - "Missing pattern .*" + "Missing pattern .*" \ + "Unable to parse (QML|JavaScript).*" |