diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-31 08:55:16 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-31 08:55:16 +0200 |
| commit | 71478352376022faa9be6d79f2a760c289945ff5 (patch) | |
| tree | 0f8ff4a88c1b033367337a93d23a329d145ee903 /src/qtquick1/util/qdeclarativepropertychanges.cpp | |
| parent | c38efcb67cf93ba3e91e184c3b891efef4ef75a3 (diff) | |
| parent | 05daa9bfe1a03ffe1cc580b6cfd88e093e2493c0 (diff) | |
Merge branch 'master' into refactor
Conflicts:
src/3rdparty/v8
src/declarative/declarative.pro
src/declarative/items/qsgcanvas.cpp
src/declarative/items/qsgshadereffectsource_p.h
src/declarative/items/qsgview.cpp
src/declarative/particles/qsgcustomparticle.cpp
src/imports/gestures/gestures.pro
src/imports/particles/particles.pro
src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
src/qtquick1/qtquick1.pro
tests/auto/declarative/examples/examples.pro
tests/auto/declarative/qsglistview/qsglistview.pro
tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro
Change-Id: I423344f83e1835116cad531b877fde6e68a8849a
Diffstat (limited to 'src/qtquick1/util/qdeclarativepropertychanges.cpp')
| -rw-r--r-- | src/qtquick1/util/qdeclarativepropertychanges.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/qtquick1/util/qdeclarativepropertychanges.cpp b/src/qtquick1/util/qdeclarativepropertychanges.cpp index 776701e58f..fc063cafb0 100644 --- a/src/qtquick1/util/qdeclarativepropertychanges.cpp +++ b/src/qtquick1/util/qdeclarativepropertychanges.cpp @@ -48,7 +48,7 @@ #include <QtDeclarative/qdeclarativeinfo.h> #include <QtDeclarative/private/qdeclarativecustomparser_p.h> -#include <QtDeclarative/private/qdeclarativeparser_p.h> +#include <QtDeclarative/private/qdeclarativescript_p.h> #include <QtDeclarative/qdeclarativeexpression.h> #include <QtDeclarative/private/qdeclarativebinding_p.h> #include <QtDeclarative/qdeclarativecontext.h> @@ -282,22 +282,22 @@ QDeclarative1PropertyChangesParser::compile(const QList<QDeclarativeCustomParser ds << data.count(); for(int ii = 0; ii < data.count(); ++ii) { - QDeclarativeParser::Variant v = qvariant_cast<QDeclarativeParser::Variant>(data.at(ii).second); + QDeclarativeScript::Variant v = qvariant_cast<QDeclarativeScript::Variant>(data.at(ii).second); QVariant var; bool isScript = v.isScript(); QDeclarativeBinding::Identifier id = 0; switch(v.type()) { - case QDeclarativeParser::Variant::Boolean: + case QDeclarativeScript::Variant::Boolean: var = QVariant(v.asBoolean()); break; - case QDeclarativeParser::Variant::Number: + case QDeclarativeScript::Variant::Number: var = QVariant(v.asNumber()); break; - case QDeclarativeParser::Variant::String: + case QDeclarativeScript::Variant::String: var = QVariant(v.asString()); break; - case QDeclarativeParser::Variant::Invalid: - case QDeclarativeParser::Variant::Script: + case QDeclarativeScript::Variant::Invalid: + case QDeclarativeScript::Variant::Script: var = QVariant(v.asScript()); { // Pre-rewrite the expression |