diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-08-15 17:10:30 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-08-15 17:10:30 (GMT) |
| commit | 540222f0d936a48f57ed36496fcb211cc437cb1b (patch) | |
| tree | 70d18fe3ca5ac8e53410fc2b62d08fa80d88e09a /tools/qdoc3 | |
| parent | 1c4b284b54c8d0166f777b256d1ac3eedd8ea593 (diff) | |
| download | Qt-540222f0d936a48f57ed36496fcb211cc437cb1b.zip Qt-540222f0d936a48f57ed36496fcb211cc437cb1b.tar.gz Qt-540222f0d936a48f57ed36496fcb211cc437cb1b.tar.bz2 | |
Doc: Fixed qdoc warnings.
Diffstat (limited to 'tools/qdoc3')
| -rw-r--r-- | tools/qdoc3/test/qt-cpp-ignore.qdocconf | 3 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-project.qdocconf | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/qdoc3/test/qt-cpp-ignore.qdocconf b/tools/qdoc3/test/qt-cpp-ignore.qdocconf index 044eef4..5b41ae3 100644 --- a/tools/qdoc3/test/qt-cpp-ignore.qdocconf +++ b/tools/qdoc3/test/qt-cpp-ignore.qdocconf @@ -73,7 +73,8 @@ Cpp.ignoretokens = QAXFACTORY_EXPORT \ Q_DECLARATIVE_EXPORT \ Q_GADGET \ QWEBKIT_EXPORT \ - Q_INVOKABLE + Q_INVOKABLE \ + Q_DECL_CONSTEXPR Cpp.ignoredirectives = Q_DECLARE_HANDLE \ Q_DECLARE_INTERFACE \ Q_DECLARE_METATYPE \ diff --git a/tools/qdoc3/test/qt-project.qdocconf b/tools/qdoc3/test/qt-project.qdocconf index fca6545..57bf797 100644 --- a/tools/qdoc3/test/qt-project.qdocconf +++ b/tools/qdoc3/test/qt-project.qdocconf @@ -105,7 +105,7 @@ exampledirs = $QT_SOURCE_TREE/doc/src \ $QT_SOURCE_TREE/examples/tutorials \ $QT_SOURCE_TREE \ $QT_SOURCE_TREE/qmake/examples \ - $QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/docs + $QT_SOURCE_TREE/src/3rdparty/webkit/Source/WebKit/qt/docs imagedirs = $QT_SOURCE_TREE/doc/src/images \ $QT_SOURCE_TREE/examples \ $QT_SOURCE_TREE/doc/src/declarative/pics \ |