QDeclarativeContextData *ctxtdata = QDeclarativeContextData::get(ctxt);
- QDeclarativeEnginePrivate *engine = QDeclarativeEnginePrivate::get(qmlEngine(obj));
+ QDeclarativeEnginePrivate *engine = QDeclarativeEnginePrivate::get(ctxt->engine());
QDeclarativeCompiledData *cdata = 0;
QDeclarativeTypeData *typeData = 0;
if (engine && ctxtdata && !ctxtdata->url.isEmpty()) {
} else {
QDeclarativeContextData *ctxtdata = QDeclarativeContextData::get(script.context());
- QDeclarativeEnginePrivate *engine = QDeclarativeEnginePrivate::get(qmlEngine(script.scopeObject()));
+ QDeclarativeEnginePrivate *engine = QDeclarativeEnginePrivate::get(script.context()->engine());
QDeclarativeCompiledData *cdata = 0;
QDeclarativeTypeData *typeData = 0;
if (engine && ctxtdata && !ctxtdata->url.isEmpty()) {
}
if (cdata)
- d->init(ctxtdata, cdata->primitives.at(id), cdata, script.scopeObject(),
+ d->init(ctxtdata, cdata->primitives.at(id), true, script.scopeObject(),
cdata->name, script.d.data()->lineNumber);
else
defaultConstruction = true;
QDeclarativeScriptString scriptStr = hasRunScriptScript ? runScriptScript : script;
- const QString &str = scriptStr.script();
- if (!str.isEmpty()) {
- QDeclarativeExpression expr(scriptStr.context(), scriptStr.scopeObject(), str);
- QDeclarativeData *ddata = QDeclarativeData::get(q);
- if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty())
- expr.setSourceLocation(ddata->outerContext->url.toString(), ddata->lineNumber);
+ if (!scriptStr.script().isEmpty()) {
+ QDeclarativeExpression expr(scriptStr);
expr.evaluate();
if (expr.hasError())
qmlInfo(q) << expr.error();
void QDeclarativeStateChangeScript::execute(Reason)
{
Q_D(QDeclarativeStateChangeScript);
- const QString &script = d->script.script();
- if (!script.isEmpty()) {
- QDeclarativeExpression expr(d->script.context(), d->script.scopeObject(), script);
- QDeclarativeData *ddata = QDeclarativeData::get(this);
- if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty())
- expr.setSourceLocation(ddata->outerContext->url.toString(), ddata->lineNumber);
+ if (!d->script.script().isEmpty()) {
+ QDeclarativeExpression expr(d->script);
expr.evaluate();
if (expr.hasError())
qmlInfo(this, expr.error());