diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2010-05-18 11:42:46 +1000 |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2010-05-18 12:29:06 +1000 |
commit | 54c6a0101ba2bf3910126c53738e337712e5bb9a (patch) | |
tree | b7aa9899ced985de5e89d3f70b4ef79abb3c61f4 /src/declarative/util/qdeclarativepropertychanges.cpp | |
parent | 96d5029126707771a3b956e6db0391ae7d619853 (diff) | |
download | qt4-tools-54c6a0101ba2bf3910126c53738e337712e5bb9a.tar.gz |
Add parent parameter to QDeclarativeExpression constructor.
Also rearrange the parameter order to be more clear.
Diffstat (limited to 'src/declarative/util/qdeclarativepropertychanges.cpp')
-rw-r--r-- | src/declarative/util/qdeclarativepropertychanges.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp index 12fef36de6..d99de7a408 100644 --- a/src/declarative/util/qdeclarativepropertychanges.cpp +++ b/src/declarative/util/qdeclarativepropertychanges.cpp @@ -321,7 +321,7 @@ void QDeclarativePropertyChangesPrivate::decode() QDeclarativeProperty prop = property(name); //### better way to check for signal property? if (prop.type() & QDeclarativeProperty::SignalProperty) { - QDeclarativeExpression *expression = new QDeclarativeExpression(qmlContext(q), data.toString(), object); + QDeclarativeExpression *expression = new QDeclarativeExpression(qmlContext(q), object, data.toString()); QDeclarativeData *ddata = QDeclarativeData::get(q); if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty()) expression->setSourceLocation(ddata->outerContext->url.toString(), ddata->lineNumber); @@ -330,7 +330,7 @@ void QDeclarativePropertyChangesPrivate::decode() handler->expression = expression; signalReplacements << handler; } else if (isScript) { - QDeclarativeExpression *expression = new QDeclarativeExpression(qmlContext(q), data.toString(), object); + QDeclarativeExpression *expression = new QDeclarativeExpression(qmlContext(q), object, data.toString()); QDeclarativeData *ddata = QDeclarativeData::get(q); if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty()) expression->setSourceLocation(ddata->outerContext->url.toString(), ddata->lineNumber); |