diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-07-10 02:47:19 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-07-10 02:47:19 (GMT) |
| commit | 5173a42be2d0121c0f33217cc4d8399070a8aa3b (patch) | |
| tree | 0f8b6cde906ae1d014e730506c2a58fbe2b6079c /tools/qdoc3/test | |
| parent | 883da42f7c75775502c818aa456c8576d8457ff8 (diff) | |
| parent | 0d156972b868c951fa33f21735040ab1e7a76f21 (diff) | |
| download | Qt-5173a42be2d0121c0f33217cc4d8399070a8aa3b.zip Qt-5173a42be2d0121c0f33217cc4d8399070a8aa3b.tar.gz Qt-5173a42be2d0121c0f33217cc4d8399070a8aa3b.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
src/corelib/kernel/qmetaobject.cpp
tools/qdoc3/generator.cpp
tools/qdoc3/test/qt-cpp-ignore.qdocconf
tools/qdoc3/test/qt-inc.qdocconf
Diffstat (limited to 'tools/qdoc3/test')
| -rw-r--r-- | tools/qdoc3/test/qt-cpp-ignore.qdocconf | 3 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-inc.qdocconf | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/qdoc3/test/qt-cpp-ignore.qdocconf b/tools/qdoc3/test/qt-cpp-ignore.qdocconf index c0f8677..5be9fa5 100644 --- a/tools/qdoc3/test/qt-cpp-ignore.qdocconf +++ b/tools/qdoc3/test/qt-cpp-ignore.qdocconf @@ -69,7 +69,8 @@ Cpp.ignoretokens = QAXFACTORY_EXPORT \ QT_END_INCLUDE_NAMESPACE \ PHONON_EXPORT \ Q_DECLARATIVE_EXPORT \ - Q_GADGET + Q_GADGET \ + QWEBKIT_EXPORT Cpp.ignoredirectives = Q_DECLARE_HANDLE \ Q_DECLARE_INTERFACE \ Q_DECLARE_METATYPE \ diff --git a/tools/qdoc3/test/qt-inc.qdocconf b/tools/qdoc3/test/qt-inc.qdocconf index 88d4fcf..bba8e39 100644 --- a/tools/qdoc3/test/qt-inc.qdocconf +++ b/tools/qdoc3/test/qt-inc.qdocconf @@ -101,7 +101,8 @@ Cpp.ignoretokens = QAXFACTORY_EXPORT \ Q_XML_EXPORT \ QDBUS_EXPORT \ Q_DECLARATIVE_EXPORT \ - Q_GADGET + Q_GADGET \ + QWEBKIT_EXPORT Cpp.ignoredirectives = Q_DECLARE_HANDLE \ Q_DECLARE_INTERFACE \ Q_DECLARE_METATYPE \ |