summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-06-25 09:32:57 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-26 01:31:18 +0200
commit74b6e8512df979eff4e4caee6ed52e12cc1f9144 (patch)
treea3a9c5d27ea67b1ab1af111c4d3d9fd77a6e6bae
parent9b5b7ee332a5109827074bcd5522f833add9f54c (diff)
Fix compilation.
qmlRegisterUncreatableType actually exists in declarative. Change-Id: Ia75855389fac95537eb6e3d8573db4ff55fad63c Reviewed-by: Lorn Potter <lorn.potter@nokia.com> Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
-rw-r--r--src/imports/sensors/sensors.cpp38
1 files changed, 0 insertions, 38 deletions
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<T,int>
-// and qmlRegisterUncreatableType<T> 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<typename T, int metaObjectRevision>
-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<T *>(pointerName.constData()),
- qRegisterMetaType<QQmlListProperty<T> >(listName.constData()),
- 0, 0,
- reason,
-
- uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject,
-
- QQmlPrivate::attachedPropertiesFunc<T>(),
- QQmlPrivate::attachedPropertiesMetaObject<T>(),
-
- QQmlPrivate::StaticCastSelector<T,QQmlParserStatus>::cast(),
- QQmlPrivate::StaticCastSelector<T,QQmlPropertyValueSource>::cast(),
- QQmlPrivate::StaticCastSelector<T,QQmlPropertyValueInterceptor>::cast(),
-
- 0, 0,
-
- 0,
- metaObjectRevision
- };
-
- return QQmlPrivate::qmlregister(QQmlPrivate::TypeRegistration, &type);
-}
-
class QSensorsDeclarativeModule : public QQmlExtensionPlugin
{
Q_OBJECT