diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-06-24 04:25:07 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-06-24 04:25:07 (GMT) |
commit | 94d62da58286df177286adcbe688c40629d2c551 (patch) | |
tree | 773f3b055e77d1947cc4aba6f556630070017848 /tools/qdoc3/test | |
parent | 124f5714e8e6ec1945d536e622b51304f2b32dd7 (diff) | |
parent | 0570b26f90f031b09970f8fca1a67339b66ee33f (diff) | |
download | Qt-94d62da58286df177286adcbe688c40629d2c551.zip Qt-94d62da58286df177286adcbe688c40629d2c551.tar.gz Qt-94d62da58286df177286adcbe688c40629d2c551.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
mkspecs/features/qt.prf
src/corelib/global/qglobal.h
Diffstat (limited to 'tools/qdoc3/test')
-rw-r--r-- | tools/qdoc3/test/qt-cpp-ignore.qdocconf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/qdoc3/test/qt-cpp-ignore.qdocconf b/tools/qdoc3/test/qt-cpp-ignore.qdocconf index 7bde3fe..c0f8677 100644 --- a/tools/qdoc3/test/qt-cpp-ignore.qdocconf +++ b/tools/qdoc3/test/qt-cpp-ignore.qdocconf @@ -12,6 +12,7 @@ Cpp.ignoretokens = QAXFACTORY_EXPORT \ QM_EXPORT_ICONVIEW \ QM_EXPORT_NETWORK \ QM_EXPORT_OPENGL \ + QM_EXPORT_OPENVG \ QM_EXPORT_SQL \ QM_EXPORT_TABLE \ QM_EXPORT_WORKSPACE \ @@ -50,6 +51,7 @@ Cpp.ignoretokens = QAXFACTORY_EXPORT \ Q_INTERNAL_WIN_NO_THROW \ Q_NETWORK_EXPORT \ Q_OPENGL_EXPORT \ + Q_OPENVG_EXPORT \ Q_OUTOFLINE_TEMPLATE \ Q_SQL_EXPORT \ Q_SVG_EXPORT \ |