From 74b6e8512df979eff4e4caee6ed52e12cc1f9144 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 25 Jun 2012 09:32:57 +0200 Subject: Fix compilation. qmlRegisterUncreatableType actually exists in declarative. Change-Id: Ia75855389fac95537eb6e3d8573db4ff55fad63c Reviewed-by: Lorn Potter Reviewed-by: Lincoln Ramsay --- src/imports/sensors/sensors.cpp | 38 -------------------------------------- 1 file changed, 38 deletions(-) (limited to 'src/imports/sensors/sensors.cpp') diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp index 0c479eb7..54f94679 100644 --- a/src/imports/sensors/sensors.cpp +++ b/src/imports/sensors/sensors.cpp @@ -56,44 +56,6 @@ QT_BEGIN_NAMESPACE -// QtQml doesn't have this for some reason. It has qmlRegisterRevision -// and qmlRegisterUncreatableType but they both only do half the job. This one -// registers an uncreatable type and sets the revision so that derived classes will -// pick up new properties. -template -int qmlRegisterUncreatableType(const char *uri, int versionMajor, int versionMinor, const char *qmlName, const QString& reason) -{ - QByteArray name(T::staticMetaObject.className()); - - QByteArray pointerName(name + '*'); - QByteArray listName("QQmlListProperty<" + name + ">"); - - QQmlPrivate::RegisterType type = { - 1, - - qRegisterMetaType(pointerName.constData()), - qRegisterMetaType >(listName.constData()), - 0, 0, - reason, - - uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject, - - QQmlPrivate::attachedPropertiesFunc(), - QQmlPrivate::attachedPropertiesMetaObject(), - - QQmlPrivate::StaticCastSelector::cast(), - QQmlPrivate::StaticCastSelector::cast(), - QQmlPrivate::StaticCastSelector::cast(), - - 0, 0, - - 0, - metaObjectRevision - }; - - return QQmlPrivate::qmlregister(QQmlPrivate::TypeRegistration, &type); -} - class QSensorsDeclarativeModule : public QQmlExtensionPlugin { Q_OBJECT -- cgit v1.2.3