From a2c73d3f0305847343d5015c095073eae0ead197 Mon Sep 17 00:00:00 2001 From: Rhys Weatherley Date: Wed, 15 Sep 2010 10:32:03 +1000 Subject: Rename "interface" in qdeclarativeinterface.h to "qmlInterface" The "interface" name is #define'd to "struct" in Windows COM headers in some SDK's, and creates problems when such headers are mixed with QML bindings. Reviewed-by: Joona Petrell --- src/declarative/qml/qdeclarative.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h index c6b64ae..985ab72 100644 --- a/src/declarative/qml/qdeclarative.h +++ b/src/declarative/qml/qdeclarative.h @@ -269,7 +269,7 @@ int qmlRegisterInterface(const char *typeName) QByteArray pointerName(name + '*'); QByteArray listName("QDeclarativeListProperty<" + name + ">"); - QDeclarativePrivate::RegisterInterface interface = { + QDeclarativePrivate::RegisterInterface qmlInterface = { 0, qRegisterMetaType(pointerName.constData()), @@ -278,7 +278,7 @@ int qmlRegisterInterface(const char *typeName) qobject_interface_iid() }; - return QDeclarativePrivate::qmlregister(QDeclarativePrivate::InterfaceRegistration, &interface); + return QDeclarativePrivate::qmlregister(QDeclarativePrivate::InterfaceRegistration, &qmlInterface); } template -- cgit v0.12