diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-29 04:09:01 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-29 04:09:01 (GMT) |
| commit | 575ad2c60482b279f828cfa87186b5fbb10f76c6 (patch) | |
| tree | 101df52cd4b769dc8d10ef60714f25d819636e70 /tools/qdoc3/test | |
| parent | a913e326409062bbc1cad4d5898181c7b81cba23 (diff) | |
| parent | 638f46a96b68d21137c4903c68015752ebdf58dc (diff) | |
| download | Qt-575ad2c60482b279f828cfa87186b5fbb10f76c6.zip Qt-575ad2c60482b279f828cfa87186b5fbb10f76c6.tar.gz Qt-575ad2c60482b279f828cfa87186b5fbb10f76c6.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
mkspecs/features/qt.prf
Diffstat (limited to 'tools/qdoc3/test')
| -rw-r--r-- | tools/qdoc3/test/macros.qdocconf | 5 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-build-docs.qdocconf | 2 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-cpp-ignore.qdocconf | 1 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt.qdocconf | 2 |
4 files changed, 10 insertions, 0 deletions
diff --git a/tools/qdoc3/test/macros.qdocconf b/tools/qdoc3/test/macros.qdocconf index f7dcdc0..dbb8ab8 100644 --- a/tools/qdoc3/test/macros.qdocconf +++ b/tools/qdoc3/test/macros.qdocconf @@ -28,3 +28,8 @@ macro.begincomment = "\\c{/*}" macro.endcomment = "\\c{*/}" macro.uuml.HTML = "ü" macro.mdash.HTML = "—" + +macro.beginfloatleft.HTML = "<div style=\"float: left; margin-right: 2em\">" +macro.beginfloatright.HTML = "<div style=\"float: right; margin-left: 2em\">" +macro.endfloat.HTML = "</div>" +macro.clearfloat.HTML = "<div style=\"clear: both\">" diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf index deaf8a8..c0b8334 100644 --- a/tools/qdoc3/test/qt-build-docs.qdocconf +++ b/tools/qdoc3/test/qt-build-docs.qdocconf @@ -112,3 +112,5 @@ imagedirs = $QT_SOURCE_TREE/doc/src/images \ outputdir = $QT_BUILD_TREE/doc/html tagfile = $QT_BUILD_TREE/doc/html/qt.tags base = file:$QT_BUILD_TREE/doc/html + +HTML.generatemacrefs = "true" diff --git a/tools/qdoc3/test/qt-cpp-ignore.qdocconf b/tools/qdoc3/test/qt-cpp-ignore.qdocconf index 5be9fa5..dcf33dc 100644 --- a/tools/qdoc3/test/qt-cpp-ignore.qdocconf +++ b/tools/qdoc3/test/qt-cpp-ignore.qdocconf @@ -26,6 +26,7 @@ Cpp.ignoretokens = QAXFACTORY_EXPORT \ QT_WIDGET_PLUGIN_EXPORT \ Q_COMPAT_EXPORT \ Q_CORE_EXPORT \ + Q_CORE_EXPORT_INLINE \ Q_EXPLICIT \ Q_EXPORT \ Q_EXPORT_CODECS_CN \ diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index 7bd4e52..9b5937d 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -114,3 +114,5 @@ imagedirs = $QTDIR/doc/src/images \ outputdir = $QTDIR/doc/html tagfile = $QTDIR/doc/html/qt.tags base = file:$QTDIR/doc/html + +HTML.generatemacrefs = "true" |