diff options
author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-08-26 11:56:45 +0200 |
---|---|---|
committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-08-31 07:06:10 +0000 |
commit | 5a59cbfee71907c47587a1e3d340d31abfdc01ba (patch) | |
tree | 33728e76ce100888fc4fad3c00e148cede04a2c8 /src/qml/qml/qqml.h | |
parent | cf6bbc0d65fed17c645d7a3b62d2676fec5b251c (diff) |
Remove superfluous namespace and exports
[ChangeLog][QtQml] The functions qmlExecuteDeferred, qmlContext and
qmlEngine are no longer available in the QtQml namespace. Use their
counterparts in the global namespace.
Change-Id: Ife1ea83ca1d474420c9ee697772b7115247cc400
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/qml/qqml.h')
-rw-r--r-- | src/qml/qml/qqml.h | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h index d346660987..4c3454e7b4 100644 --- a/src/qml/qml/qqml.h +++ b/src/qml/qml/qqml.h @@ -594,29 +594,13 @@ 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 *); - Q_QML_EXPORT QQmlEngine *qmlEngine(const QObject *); - Q_QML_EXPORT QQmlAttachedPropertiesFunc qmlAttachedPropertiesFunction(QObject *, - const QMetaObject *); - Q_QML_EXPORT QObject *qmlAttachedPropertiesObject(QObject *, QQmlAttachedPropertiesFunc func, - bool create = true); -#ifndef Q_QDOC -} - -QT_WARNING_PUSH -QT_WARNING_DISABLE_CLANG("-Wheader-hygiene") - -// This is necessary to allow for QtQuick1 and QtQuick2 scenes in a single application. -using namespace QtQml; - -QT_WARNING_POP - -#endif // Q_QDOC +Q_QML_EXPORT void qmlExecuteDeferred(QObject *); +Q_QML_EXPORT QQmlContext *qmlContext(const QObject *); +Q_QML_EXPORT QQmlEngine *qmlEngine(const QObject *); +Q_QML_EXPORT QQmlAttachedPropertiesFunc qmlAttachedPropertiesFunction(QObject *, + const QMetaObject *); +Q_QML_EXPORT QObject *qmlAttachedPropertiesObject(QObject *, QQmlAttachedPropertiesFunc func, + bool create = true); //The C++ version of protected namespaces in qmldir Q_QML_EXPORT bool qmlProtectModule(const char* uri, int majVersion); |