diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-09 14:08:24 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-09 14:08:24 +0200 |
| commit | 6a6eaec0e8c2d4cd1ffbe2fe154a3a3caad54dc9 (patch) | |
| tree | 5d8352f302bc979332eed01e250554b69961311e /src/imports/controls/doc/qtquickcontrols2.qdocconf | |
| parent | c02d23360186b43fcd570e1c7fc666cb14b487d6 (diff) | |
| parent | b172b30368bafc839b92f767324496a509267fc7 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/quicktemplates2/qquickpage.cpp
Change-Id: I4c8b62fb1d7c20c6d3c870eb47e0402a20051098
Diffstat (limited to 'src/imports/controls/doc/qtquickcontrols2.qdocconf')
| -rw-r--r-- | src/imports/controls/doc/qtquickcontrols2.qdocconf | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf index 73f9bdfc..0d823489 100644 --- a/src/imports/controls/doc/qtquickcontrols2.qdocconf +++ b/src/imports/controls/doc/qtquickcontrols2.qdocconf @@ -80,6 +80,14 @@ macro.endstyleproperty = "\\br" macro.stylemethod.HTML = "<div class=\"qmlproto\"><table class=\"qmlname\"><tbody><tr valign=\"top\" class=\"odd\" id=\"\5\"><td class=\"tblQmlFuncNode\"><p><span class=\"type\">\1</span> <span class=\"name\">\2</span>(<span class="type">\3</span> <i>\4</i>)</p></td></tr></tbody></table></div>" macro.endstylemethod = "\\br" +# \stylemethod2 {returntype} {methodname} {arg1type} {arg1name} {arg2type} {arg2name} {html-target-id} +# \target html-target-id +# This method returns ... +# (empty line) +# \endstylemethod2 +macro.stylemethod2.HTML = "<div class=\"qmlproto\"><table class=\"qmlname\"><tbody><tr valign=\"top\" class=\"odd\" id=\"\7\"><td class=\"tblQmlFuncNode\"><p><span class=\"type\">\1</span> <span class=\"name\">\2</span>(<span class="type">\3</span> <i>\4</i>, <span class="type">\5</span> <i>\6</i>)</p></td></tr></tbody></table></div>" +macro.endstylemethod2 = "\\br" + # \stylecolor {#6A00FF} {(default)} macro.stylecolor.HTML = "<div style=\"padding:10px;color:#fff;background:\1;\">\1 \2</div>" |