diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-07-20 00:58:11 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-07-20 00:58:11 (GMT) |
| commit | babb3bb4bb0de6cd2129d29fd6a90695bcbd53e2 (patch) | |
| tree | c0a44c57e54e77dd31e2a68959e03256124cdfbd /src/declarative/qml/qmldom.cpp | |
| parent | 45cbfefe9d68152841beb6474c94eece0a085eb5 (diff) | |
| parent | 1dc2e92b4630a0c19d1d2bdf5a05cd18003c566a (diff) | |
| download | Qt-babb3bb4bb0de6cd2129d29fd6a90695bcbd53e2.zip Qt-babb3bb4bb0de6cd2129d29fd6a90695bcbd53e2.tar.gz Qt-babb3bb4bb0de6cd2129d29fd6a90695bcbd53e2.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmldom.cpp')
| -rw-r--r-- | src/declarative/qml/qmldom.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp index e293a93..293ea6a 100644 --- a/src/declarative/qml/qmldom.cpp +++ b/src/declarative/qml/qmldom.cpp @@ -43,7 +43,6 @@ #include "qmldom_p.h" #include "private/qmlcompiler_p.h" #include "private/qmlengine_p.h" -#include "qmlcompiledcomponent_p.h" #include <QtCore/QByteArray> #include <QtCore/QDebug> #include <QtCore/QString> @@ -165,7 +164,7 @@ bool QmlDomDocument::load(QmlEngine *engine, const QByteArray &data, const QUrl d->errors.clear(); d->imports.clear(); - QmlCompiledComponent component; + QmlCompiledData component; QmlCompiler compiler; QmlCompositeTypeData *td = ((QmlEnginePrivate *)QmlEnginePrivate::get(engine))->typeManager.getImmediate(data, url); @@ -588,7 +587,7 @@ QmlDomProperty QmlDomDynamicProperty::defaultValue() const int QmlDomDynamicProperty::position() const { if (isValid()) { - return d->property.range.offset; + return d->property.location.range.offset; } else return -1; } @@ -600,7 +599,7 @@ int QmlDomDynamicProperty::position() const int QmlDomDynamicProperty::length() const { if (isValid()) - return d->property.range.length; + return d->property.location.range.length; else return -1; } @@ -770,7 +769,7 @@ QByteArray QmlDomObject::objectType() const Text { id: MyText } \endqml */ -QByteArray QmlDomObject::objectId() const +QString QmlDomObject::objectId() const { if (d->object) return d->object->id; else return QByteArray(); @@ -1384,7 +1383,6 @@ QmlDomValue::Type QmlDomValue::type() const return PropertyBinding; case QmlParser::Value::ValueSource: return ValueSource; - case QmlParser::Value::Component: case QmlParser::Value::CreatedObject: return Object; case QmlParser::Value::SignalObject: |