diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-11-04 13:26:04 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-11-04 13:26:04 (GMT) |
| commit | 7905101fb5ef18c776be515b9287356b1efc5ceb (patch) | |
| tree | 3d865c288848891c1790b8dadcf7128410b233c1 /tools/qdoc3/test | |
| parent | 49d551b24dbb9131db4a5769b8ddd205bbf99093 (diff) | |
| parent | 94b595f37b3a49d44d1a795e5f2b003ac921d4b7 (diff) | |
| download | Qt-7905101fb5ef18c776be515b9287356b1efc5ceb.zip Qt-7905101fb5ef18c776be515b9287356b1efc5ceb.tar.gz Qt-7905101fb5ef18c776be515b9287356b1efc5ceb.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tools/qdoc3/test')
| -rw-r--r-- | tools/qdoc3/test/classic.css | 7 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-cpp-ignore.qdocconf | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tools/qdoc3/test/classic.css b/tools/qdoc3/test/classic.css index 320da66..b8cae8e 100644 --- a/tools/qdoc3/test/classic.css +++ b/tools/qdoc3/test/classic.css @@ -268,10 +268,15 @@ span.string,span.char border-style: solid; border-color: #ddd; font-weight: bold; - padding: 6px 0px 6px 10px; + padding: 6px 10px 6px 10px; margin: 42px 0px 0px 0px; } +.qmlreadonly { + float: right; + color: red +} + .qmldoc { } diff --git a/tools/qdoc3/test/qt-cpp-ignore.qdocconf b/tools/qdoc3/test/qt-cpp-ignore.qdocconf index 1efc215..dcf33dc 100644 --- a/tools/qdoc3/test/qt-cpp-ignore.qdocconf +++ b/tools/qdoc3/test/qt-cpp-ignore.qdocconf @@ -69,6 +69,7 @@ Cpp.ignoretokens = QAXFACTORY_EXPORT \ QT_END_NAMESPACE \ QT_END_INCLUDE_NAMESPACE \ PHONON_EXPORT \ + Q_DECLARATIVE_EXPORT \ Q_GADGET \ QWEBKIT_EXPORT Cpp.ignoredirectives = Q_DECLARE_HANDLE \ |