From 8c02d79c5b7d769c848c0441c4e9a6f1e0a41912 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 7 May 2013 09:45:27 +0200 Subject: Move exports conflicting with QtQml into namespace Move exported qml* symbols that conflict with QtQml into an - automatically imported - namespace. This ensures apps can link against both QtDeclarative and QtQml. To keep the BC promise the old symbols are still exported. Task-number: QTBUG-29584 Change-Id: Icf4e586fee51d2bd82125398e2bb96d6dd355cc5 Reviewed-by: Olivier Goffart Reviewed-by: Thiago Macieira Reviewed-by: Alan Alpert --- src/declarative/qml/qdeclarative.h | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src/declarative/qml/qdeclarative.h') diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h index dd08105e..95cef935 100644 --- a/src/declarative/qml/qdeclarative.h +++ b/src/declarative/qml/qdeclarative.h @@ -404,11 +404,18 @@ inline int qmlRegisterType(const QUrl &url, const char *uri, int versionMajor, i class QDeclarativeContext; class QDeclarativeEngine; -Q_DECLARATIVE_EXPORT void qmlExecuteDeferred(QObject *); -Q_DECLARATIVE_EXPORT QDeclarativeContext *qmlContext(const QObject *); -Q_DECLARATIVE_EXPORT QDeclarativeEngine *qmlEngine(const QObject *); -Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true); -Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *, const QMetaObject *, bool create); + +namespace QtDeclarative { + // declared in namespace to avoid symbol conflicts with QtQml + Q_DECLARATIVE_EXPORT void qmlExecuteDeferred(QObject *); + Q_DECLARATIVE_EXPORT QDeclarativeContext *qmlContext(const QObject *); + Q_DECLARATIVE_EXPORT QDeclarativeEngine *qmlEngine(const QObject *); + Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *, + bool create = true); + Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *, + const QMetaObject *, bool create); +} +using namespace QtDeclarative; template QObject *qmlAttachedPropertiesObject(const QObject *obj, bool create = true) -- cgit v1.2.3