diff options
Diffstat (limited to 'src/declarative/qml/v4')
-rw-r--r-- | src/declarative/qml/v4/qv4bindings.cpp | 12 | ||||
-rw-r--r-- | src/declarative/qml/v4/qv4compiler.cpp | 6 | ||||
-rw-r--r-- | src/declarative/qml/v4/qv4irbuilder.cpp | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/declarative/qml/v4/qv4bindings.cpp b/src/declarative/qml/v4/qv4bindings.cpp index 2e8a360f36..0822321255 100644 --- a/src/declarative/qml/v4/qv4bindings.cpp +++ b/src/declarative/qml/v4/qv4bindings.cpp @@ -48,7 +48,7 @@ #include <private/qdeclarativefastproperties_p.h> #include <private/qdeclarativedebugtrace_p.h> -#include <private/qsganchors_p_p.h> // For AnchorLine +#include <private/qquickanchors_p_p.h> // For AnchorLine #include <QtDeclarative/qdeclarativeinfo.h> #include <QtCore/qnumeric.h> @@ -444,9 +444,9 @@ static bool testCompareVariants(const QVariant &qtscriptRaw, const QVariant &v4) QDeclarative1AnchorLine ra = qvariant_cast<QDeclarative1AnchorLine>(v4); return la == ra; - } else if (type == qMetaTypeId<QSGAnchorLine>()) { - QSGAnchorLine la = qvariant_cast<QSGAnchorLine>(qtscript); - QSGAnchorLine ra = qvariant_cast<QSGAnchorLine>(v4); + } else if (type == qMetaTypeId<QQuickAnchorLine>()) { + QQuickAnchorLine la = qvariant_cast<QQuickAnchorLine>(qtscript); + QQuickAnchorLine ra = qvariant_cast<QQuickAnchorLine>(v4); return la == ra; } else if (type == QMetaType::Double) { @@ -529,8 +529,8 @@ static void testBindingResult(const QString &binding, int line, int column, default: if (resultType == qMetaTypeId<QDeclarative1AnchorLine>()) { v4value = qVariantFromValue<QDeclarative1AnchorLine>(*(QDeclarative1AnchorLine *)result.typeDataPtr()); - } else if (resultType == qMetaTypeId<QSGAnchorLine>()) { - v4value = qVariantFromValue<QSGAnchorLine>(*(QSGAnchorLine *)result.typeDataPtr()); + } else if (resultType == qMetaTypeId<QQuickAnchorLine>()) { + v4value = qVariantFromValue<QQuickAnchorLine>(*(QQuickAnchorLine *)result.typeDataPtr()); } else { iserror = true; v4Result = "Unknown V4 type"; diff --git a/src/declarative/qml/v4/qv4compiler.cpp b/src/declarative/qml/v4/qv4compiler.cpp index ba739a9aab..a9d2338307 100644 --- a/src/declarative/qml/v4/qv4compiler.cpp +++ b/src/declarative/qml/v4/qv4compiler.cpp @@ -48,7 +48,7 @@ #include <private/qdeclarativejsast_p.h> #include <private/qdeclarativefastproperties_p.h> #include <private/qdeclarativejsengine_p.h> -#include <private/qsganchors_p_p.h> // For AnchorLine +#include <private/qquickanchors_p_p.h> // For AnchorLine QT_BEGIN_NAMESPACE @@ -341,7 +341,7 @@ void QV4CompilerPrivate::visitName(IR::Name *e) default: if (propTy == qMetaTypeId<QDeclarative1AnchorLine>()) { regType = PODValueType; - } else if (propTy == qMetaTypeId<QSGAnchorLine>()) { + } else if (propTy == qMetaTypeId<QQuickAnchorLine>()) { regType = PODValueType; } else if (QDeclarativeMetaType::isQObject(propTy)) { regType = QObjectStarType; @@ -940,7 +940,7 @@ void QV4CompilerPrivate::visitRet(IR::Ret *s) test.regType = qMetaTypeId<QDeclarative1AnchorLine>(); break; case IR::SGAnchorLineType: - test.regType = qMetaTypeId<QSGAnchorLine>(); + test.regType = qMetaTypeId<QQuickAnchorLine>(); break; case IR::ObjectType: test.regType = QMetaType::QObjectStar; diff --git a/src/declarative/qml/v4/qv4irbuilder.cpp b/src/declarative/qml/v4/qv4irbuilder.cpp index 760c2bc23d..cfe77217fd 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/qsganchors_p_p.h> // For AnchorLine +#include <private/qquickanchors_p_p.h> // For AnchorLine #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<QSGAnchorLine>()) + else if (t == qMetaTypeId<QQuickAnchorLine>()) return IR::SGAnchorLineType; else if (const QMetaObject *m = engine->metaObjectForType(t)) { meta = m; |