diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2011-11-22 15:10:42 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-23 10:03:40 +0100 |
| commit | 384fd7cdf1cb3061126c74c4f591cd2c0acdfedc (patch) | |
| tree | 3ca056562d4fc9e12a8c982f7f4956ddba556d8c /src/declarative/qml/v4/qv4irbuilder.cpp | |
| parent | 23a6a1c26b3206a53f8b3019c3a7dcff8a623a24 (diff) | |
v4: Get rid of dependency on QQuickAnchorLine type
Delegate the meta-type id query and value comparison to
QDeclarativeMetaType.
Register a comparison function for QQuickAnchorLine in
QQuickItemsModule, so that not even QDeclarativeMetaType needs to
know the type declaration. (This is needed in order to be able to
move the items to a separate library.)
Change-Id: I6404d01b74143946ae0a79fa18d1777b675e4194
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/declarative/qml/v4/qv4irbuilder.cpp')
| -rw-r--r-- | src/declarative/qml/v4/qv4irbuilder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/v4/qv4irbuilder.cpp b/src/declarative/qml/v4/qv4irbuilder.cpp index 125e1d002a..c65b348c9f 100644 --- a/src/declarative/qml/v4/qv4irbuilder.cpp +++ b/src/declarative/qml/v4/qv4irbuilder.cpp @@ -42,7 +42,7 @@ #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) @@ -72,7 +72,7 @@ static IR::Type irTypeFromVariantType(int t, QDeclarativeEnginePrivate *engine, 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; |