#include "qquickdrag_p.h"
#include "qquickdroparea_p.h"
#include "qquickmultipointtoucharea_p.h"
+#include <private/qdeclarativemetatype_p.h>
static QDeclarativePrivate::AutoParentResult qquickitem_autoParent(QObject *obj, QObject *parent)
{
return QDeclarativePrivate::Parented;
}
+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)
{
QDeclarativePrivate::RegisterAutoParent autoparent = { 0, &qquickitem_autoParent };
qmlRegisterType<QQuickPen>();
qmlRegisterType<QQuickFlickableVisibleArea>();
qRegisterMetaType<QQuickAnchorLine>("QQuickAnchorLine");
+ QDeclarativeMetaType::setQQuickAnchorLineCompareFunction(compareQQuickAnchorLines);
qmlRegisterUncreatableType<QQuickKeyNavigationAttached>(uri,major,minor,"KeyNavigation",QQuickKeyNavigationAttached::tr("KeyNavigation is only available via attached properties"));
qmlRegisterUncreatableType<QQuickKeysAttached>(uri,major,minor,"Keys",QQuickKeysAttached::tr("Keys is only available via attached properties"));
return false;
}
+int QDeclarativeMetaType::QQuickAnchorLineMetaTypeId()
+{
+ static int id = 0;
+ if (!id) {
+ id = QMetaType::type("QQuickAnchorLine");
+ Q_ASSERT(id != 0);
+ }
+ return id;
+}
+
+QDeclarativeMetaType::CompareFunction QDeclarativeMetaType::anchorLineCompareFunction = 0;
+
+void QDeclarativeMetaType::setQQuickAnchorLineCompareFunction(CompareFunction fun)
+{
+ anchorLineCompareFunction = fun;
+}
+
+bool QDeclarativeMetaType::QQuickAnchorLineCompare(const void *p1, const void *p2)
+{
+ Q_ASSERT(anchorLineCompareFunction != 0);
+ return anchorLineCompareFunction(p1, p2);
+}
+
QT_END_NAMESPACE
static QList<QDeclarativePrivate::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);
+
struct ModuleApiInstance {
ModuleApiInstance()
: scriptCallback(0), qobjectCallback(0), qobjectApi(0) {}
};
static ModuleApi moduleApi(const QString &, int, int);
static QHash<QString, QList<ModuleApi> > moduleApis();
+
+private:
+ static CompareFunction anchorLineCompareFunction;
};
class QHashedStringRef;
#include <private/qdeclarativefastproperties_p.h>
#include <private/qdeclarativedebugtrace_p.h>
-#include <private/qquickanchors_p_p.h> // For AnchorLine
+#include <private/qdeclarativemetatype_p.h>
#include <QtDeclarative/qdeclarativeinfo.h>
#include <QtCore/qnumeric.h>
QDeclarative1AnchorLine ra = qvariant_cast<QDeclarative1AnchorLine>(v4);
return la == ra;
- } else if (type == qMetaTypeId<QQuickAnchorLine>()) {
- QQuickAnchorLine la = qvariant_cast<QQuickAnchorLine>(qtscript);
- QQuickAnchorLine ra = qvariant_cast<QQuickAnchorLine>(v4);
-
- return la == ra;
+ } else if (type == QDeclarativeMetaType::QQuickAnchorLineMetaTypeId()) {
+ return QDeclarativeMetaType::QQuickAnchorLineCompare(qtscript.constData(), v4.constData());
} else if (type == QMetaType::Double) {
double la = qvariant_cast<double>(qtscript);
default:
if (resultType == qMetaTypeId<QDeclarative1AnchorLine>()) {
v4value = qVariantFromValue<QDeclarative1AnchorLine>(*(QDeclarative1AnchorLine *)result.typeDataPtr());
- } else if (resultType == qMetaTypeId<QQuickAnchorLine>()) {
- v4value = qVariantFromValue<QQuickAnchorLine>(*(QQuickAnchorLine *)result.typeDataPtr());
+ } else if (resultType == QDeclarativeMetaType::QQuickAnchorLineMetaTypeId()) {
+ v4value = QVariant(QDeclarativeMetaType::QQuickAnchorLineMetaTypeId(), result.typeDataPtr());
} else {
iserror = true;
v4Result = "Unknown V4 type";
#include <private/qdeclarativejsast_p.h>
#include <private/qdeclarativefastproperties_p.h>
#include <private/qdeclarativejsengine_p.h>
-#include <private/qquickanchors_p_p.h> // For AnchorLine
QT_BEGIN_NAMESPACE
default:
if (propTy == qMetaTypeId<QDeclarative1AnchorLine>()) {
regType = PODValueType;
- } else if (propTy == qMetaTypeId<QQuickAnchorLine>()) {
+ } else if (propTy == QDeclarativeMetaType::QQuickAnchorLineMetaTypeId()) {
regType = PODValueType;
} else if (QDeclarativeMetaType::isQObject(propTy)) {
regType = QObjectStarType;
test.regType = qMetaTypeId<QDeclarative1AnchorLine>();
break;
case IR::SGAnchorLineType:
- test.regType = qMetaTypeId<QQuickAnchorLine>();
+ test.regType = QDeclarativeMetaType::QQuickAnchorLineMetaTypeId();
break;
case IR::ObjectType:
test.regType = QMetaType::QObjectStar;
#include "qv4irbuilder_p.h"
#include "qv4compiler_p_p.h"
-#include <private/qquickanchors_p_p.h> // For AnchorLine
+#include <private/qdeclarativemetatype_p.h>
#include <private/qdeclarativetypenamecache_p.h>
DEFINE_BOOL_CONFIG_OPTION(qmlVerboseCompiler, QML_VERBOSE_COMPILER)
default:
if (t == qMetaTypeId<QDeclarative1AnchorLine>())
return IR::AnchorLineType;
- else if (t == qMetaTypeId<QQuickAnchorLine>())
+ else if (t == QDeclarativeMetaType::QQuickAnchorLineMetaTypeId())
return IR::SGAnchorLineType;
else if (engine->metaObjectForType(t)) {
return IR::ObjectType;