diff options
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 |