diff options
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqml.h | 30 | ||||
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 28 |
3 files changed, 8 insertions, 52 deletions
diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp index 8bb3b95e48..62c73cd9aa 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp @@ -126,7 +126,7 @@ void QQmlPreviewHandler::removeEngine(QQmlEngine *qmlEngine) const bool found = m_engines.removeOne(qmlEngine); Q_ASSERT(found); for (QObject *obj : m_createdObjects) - if (obj && QtQml::qmlEngine(obj) == qmlEngine) + if (obj && ::qmlEngine(obj) == qmlEngine) delete obj; m_createdObjects.removeAll(nullptr); } 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); diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index f1c79fe8b3..5965431512 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -1490,8 +1490,6 @@ void QQmlEnginePrivate::doDeleteInEngineThread() delete d; } -namespace QtQml { - void qmlExecuteDeferred(QObject *object) { QQmlData *data = QQmlData::get(object); @@ -1563,32 +1561,6 @@ QObject *qmlAttachedPropertiesObject(QObject *object, QQmlAttachedPropertiesFunc return resolveAttachedProperties(func, data, object, create); } -} // namespace QtQml - -#if QT_DEPRECATED_SINCE(5, 1) -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - -// Also define symbols outside namespace to keep binary compatibility with Qt 5.0 - -Q_QML_EXPORT void qmlExecuteDeferred(QObject *obj) -{ - QtQml::qmlExecuteDeferred(obj); -} - -Q_QML_EXPORT QQmlContext *qmlContext(const QObject *obj) -{ - return QtQml::qmlContext(obj); -} - -Q_QML_EXPORT QQmlEngine *qmlEngine(const QObject *obj) -{ - return QtQml::qmlEngine(obj); -} - -QT_WARNING_POP -#endif // QT_DEPRECATED_SINCE(5, 1) - class QQmlDataExtended { public: QQmlDataExtended(); |