diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-09-15 00:32:03 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-09-15 00:32:03 (GMT) |
| commit | a2c73d3f0305847343d5015c095073eae0ead197 (patch) | |
| tree | e1f9fceda357fede4fafdec5390deb500923b1fb /src | |
| parent | 30b415bf8644961d3e5b108b0b7c1b1abf07f685 (diff) | |
| download | Qt-a2c73d3f0305847343d5015c095073eae0ead197.zip Qt-a2c73d3f0305847343d5015c095073eae0ead197.tar.gz Qt-a2c73d3f0305847343d5015c095073eae0ead197.tar.bz2 | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qdeclarative.h | 4 |
1 files 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<T *>(pointerName.constData()), @@ -278,7 +278,7 @@ int qmlRegisterInterface(const char *typeName) qobject_interface_iid<T *>() }; - return QDeclarativePrivate::qmlregister(QDeclarativePrivate::InterfaceRegistration, &interface); + return QDeclarativePrivate::qmlregister(QDeclarativePrivate::InterfaceRegistration, &qmlInterface); } template<typename T> |