diff options
| author | Mitch Curtis <mitch.curtis@digia.com> | 2014-03-03 13:18:36 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-04 14:05:11 +0100 |
| commit | b02bed1caae6966925b9efb04e1db79c3e9ef687 (patch) | |
| tree | f64b8de7fe2fd89ea6145f7b7876738671853c2b /src/qml/qml/qqml.h | |
| parent | fb81479a16e5a96b87c53c7eaaaa74871cd7d0f7 (diff) | |
Document qmlContext() and qmlEngine().
146b942d59cca446516652d42718197573d34e46 documented them (Qt 5), but
for some reason they aren't visible [1].
c74e4a74ba97d32df7406fb684527d415dd8a6ba (Qt 5.1) then moved them into
the QtQml namespace "to avoid symbol conflicts with QtDeclarative", and
then did the following trick so that they could be called without
qualifying the functions with the namespace:
using namespace QtQml;
For that reason, qdoc shouldn't see the namespace, so we #ifdef it out.
[1] project.org/doc/qt-5.0/qtqml/qqmlengine.html
Change-Id: Id815ae4de7f081c22755eef7c37a2bc6e812b440
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/qml/qml/qqml.h')
| -rw-r--r-- | src/qml/qml/qqml.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h index 633953c81c..6479aedd1b 100644 --- a/src/qml/qml/qqml.h +++ b/src/qml/qml/qqml.h @@ -419,7 +419,9 @@ class QQmlEngine; class QJSValue; class QJSEngine; +#ifndef Q_QDOC namespace QtQml { +#endif // declared in namespace to avoid symbol conflicts with QtDeclarative Q_QML_EXPORT void qmlExecuteDeferred(QObject *); Q_QML_EXPORT QQmlContext *qmlContext(const QObject *); @@ -427,7 +429,9 @@ namespace QtQml { Q_QML_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true); Q_QML_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *, const QMetaObject *, bool create); +#ifndef Q_QDOC } +#endif #ifdef Q_CC_CLANG #pragma clang diagnostic push |