From a147861e4fdc5ecb34cd23bea13524f93cfd76e9 Mon Sep 17 00:00:00 2001 From: Marcus Tillmanns Date: Fri, 3 May 2013 10:17:46 +0200 Subject: [PATCH] * Patching QtQuick2 to allow simultaneous calls to Quick1 and Quick2's qmlRegisterType --- .../qtdeclarative/src/qml/qml/qqml.h | 52 ++++++++++++++-------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/qt-everywhere-commercial-src/qtdeclarative/src/qml/qml/qqml.h b/qt-everywhere-commercial-src/qtdeclarative/src/qml/qml/qqml.h index 597c59e..6e93f2a 100644 --- a/qt-everywhere-commercial-src/qtdeclarative/src/qml/qml/qqml.h +++ b/qt-everywhere-commercial-src/qtdeclarative/src/qml/qml/qqml.h @@ -103,6 +103,9 @@ class QQmlPropertyValueInterceptor; listName[listLen+nameLen] = '>'; \ listName[listLen+nameLen+1] = '\0'; +namespace QtQuick2 +{ + template int qmlRegisterType() { @@ -414,6 +418,8 @@ int qmlRegisterCustomType(const char *uri, int versionMajor, int versionMinor, return QQmlPrivate::qmlregister(QQmlPrivate::TypeRegistration, &type); } +} + class QQmlContext; class QQmlEngine; class QJSValue; @@ -424,6 +430,9 @@ Q_QML_EXPORT QQmlEngine *qmlEngine(const QObject *); Q_QML_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true); Q_QML_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *, const QMetaObject *, bool create); +namespace QtQuick2 +{ + template QObject *qmlAttachedPropertiesObject(const QObject *obj, bool create = true) { @@ -465,6 +474,13 @@ inline int qmlRegisterSingletonType(const char *uri, int versionMajor, int versi return QQmlPrivate::qmlregister(QQmlPrivate::SingletonRegistration, &api); } +} + + + +using namespace QtQuick2; + + QT_END_NAMESPACE QML_DECLARE_TYPE(QObject) -- 1.7.11.msysgit.1