aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/qml/qml/qqmlmetatype.cpp22
-rw-r--r--src/qml/qml/qqmlmetatype_p.h8
-rw-r--r--src/quick/items/qquickitemsmodule.cpp8
3 files changed, 0 insertions, 38 deletions
diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp
index 96894919a3..42f67f3345 100644
--- a/src/qml/qml/qqmlmetatype.cpp
+++ b/src/qml/qml/qqmlmetatype.cpp
@@ -1878,28 +1878,6 @@ QList<QQmlType*> QQmlMetaType::qmlSingletonTypes()
return retn;
}
-int QQmlMetaType::QQuickAnchorLineMetaTypeId()
-{
- static int id = 0;
- if (!id) {
- id = QMetaType::type("QQuickAnchorLine");
- }
- return id;
-}
-
-QQmlMetaType::CompareFunction QQmlMetaType::anchorLineCompareFunction = 0;
-
-void QQmlMetaType::setQQuickAnchorLineCompareFunction(CompareFunction fun)
-{
- anchorLineCompareFunction = fun;
-}
-
-bool QQmlMetaType::QQuickAnchorLineCompare(const void *p1, const void *p2)
-{
- Q_ASSERT(anchorLineCompareFunction != 0);
- return anchorLineCompareFunction(p1, p2);
-}
-
const QQmlPrivate::CachedQmlUnit *QQmlMetaType::findCachedCompilationUnit(const QUrl &uri)
{
QReadLocker lock(metaTypeDataLock());
diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h
index 44ea7e284a..715ff80c46 100644
--- a/src/qml/qml/qqmlmetatype_p.h
+++ b/src/qml/qml/qqmlmetatype_p.h
@@ -120,11 +120,6 @@ public:
static QList<QQmlPrivate::AutoParentFunction> parentFunctions();
- static int QQuickAnchorLineMetaTypeId();
- typedef bool (*CompareFunction)(const void *, const void *);
- static void setQQuickAnchorLineCompareFunction(CompareFunction);
- static bool QQuickAnchorLineCompare(const void *p1, const void *p2);
-
static const QQmlPrivate::CachedQmlUnit *findCachedCompilationUnit(const QUrl &uri);
static bool namespaceContainsRegistrations(const QString &);
@@ -135,9 +130,6 @@ public:
static QStringList typeRegistrationFailures();
static QReadWriteLock *typeRegistrationLock();
-
-private:
- static CompareFunction anchorLineCompareFunction;
};
struct QQmlMetaTypeData;
diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp
index c9c8eeace3..4c2028b53d 100644
--- a/src/quick/items/qquickitemsmodule.cpp
+++ b/src/quick/items/qquickitemsmodule.cpp
@@ -127,13 +127,6 @@ static QQmlPrivate::AutoParentResult qquickitem_autoParent(QObject *obj, QObject
return QQmlPrivate::IncompatibleParent;
}
-static bool compareQQuickAnchorLines(const void *p1, const void *p2)
-{
- const QQuickAnchorLine &l1 = *static_cast<const QQuickAnchorLine*>(p1);
- const QQuickAnchorLine &l2 = *static_cast<const QQuickAnchorLine*>(p2);
- return l1 == l2;
-}
-
static void qt_quickitems_defineModule(const char *uri, int major, int minor)
{
QQmlPrivate::RegisterAutoParent autoparent = { 0, &qquickitem_autoParent };
@@ -209,7 +202,6 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
qmlRegisterType<QQuickPen>();
qmlRegisterType<QQuickFlickableVisibleArea>();
qRegisterMetaType<QQuickAnchorLine>("QQuickAnchorLine");
- QQmlMetaType::setQQuickAnchorLineCompareFunction(compareQQuickAnchorLines);
qmlRegisterType<QQuickTextDocument>();