diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-29 00:38:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-29 00:38:01 +0200 |
| commit | cdb56c42fc1145ad25560720fb95df2bfa760a20 (patch) | |
| tree | 4dbe524a511b9343464e8509bd5352715aebdfa9 /doc | |
| parent | 87583738f960e83918da3b66e455e75c144fbf8e (diff) | |
| parent | e918334045612ec2c7c6203845ad05c4a1972e87 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
mkspecs/features/uikit/xcodebuild.mk
tests/auto/other/lancelot/tst_lancelot.cpp
tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
Change-Id: Ia0ae2de86094120281abd445138877c2cc3e882c
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 da583aedcd..1182af14e9 100644 --- a/doc/global/macros.qdocconf +++ b/doc/global/macros.qdocconf @@ -31,6 +31,7 @@ macro.mdash.HTML = "—" macro.pi.HTML = "Π" macro.beginqdoc.HTML = "/*!" macro.endqdoc.HTML = "*/" +macro.borderedimage = "\\div {class=\"border\"} \\image \1\n\\enddiv" macro.beginfloatleft.HTML = "<div style=\"float: left; margin-right: 2em\">" macro.beginfloatright.HTML = "<div style=\"float: right; margin-left: 2em\">" |