summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/config/qt-cpp-ignore.qdocconf4
-rw-r--r--doc/src/declarative_scenegraphs.qdoc2
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/config/qt-cpp-ignore.qdocconf b/doc/config/qt-cpp-ignore.qdocconf
index a21324c1a..218c7f868 100644
--- a/doc/config/qt-cpp-ignore.qdocconf
+++ b/doc/config/qt-cpp-ignore.qdocconf
@@ -73,7 +73,9 @@ Cpp.ignoretokens = QAXFACTORY_EXPORT \
Q_DECLARATIVE_EXPORT \
Q_GADGET \
QWEBKIT_EXPORT \
- Q_INVOKABLE
+ Q_INVOKABLE \
+ Q_QUICK_EXPORT \
+ Q_QML_EXPORT
Cpp.ignoredirectives = Q_DECLARE_HANDLE \
Q_DECLARE_INTERFACE \
Q_DECLARE_METATYPE \
diff --git a/doc/src/declarative_scenegraphs.qdoc b/doc/src/declarative_scenegraphs.qdoc
index 4b7b249d8..68984f730 100644
--- a/doc/src/declarative_scenegraphs.qdoc
+++ b/doc/src/declarative_scenegraphs.qdoc
@@ -136,7 +136,7 @@
hierarchy of scene-graph branches which are then optimised and drawn in a single call for
the viewport.
- Components of a mesh can now be accessed with specific QDeclarativeMesh functions which are
+ Components of a mesh can now be accessed with specific QQuickMesh functions which are
exposed to QML.
The sections below describe the various scenarios in which a user may wish to use sub-components