summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-01-09 10:29:38 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-01-09 10:29:38 (GMT)
commita657665e31e9fdabfc4e3913b4656046efe8b78d (patch)
treeb6729687025cb47f70a3cfe9510d56237a3e0621 /src
parent41f7ccb2dd21dcd4b0f2aa172bb813095cb2ade3 (diff)
downloadQt-a657665e31e9fdabfc4e3913b4656046efe8b78d.zip
Qt-a657665e31e9fdabfc4e3913b4656046efe8b78d.tar.gz
Qt-a657665e31e9fdabfc4e3913b4656046efe8b78d.tar.bz2
Optimization: Passing QScriptEngine to QScriptValue is much faster
Diffstat (limited to 'src')
-rw-r--r--src/declarative/qml/qmlobjectscriptclass.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/declarative/qml/qmlobjectscriptclass.cpp b/src/declarative/qml/qmlobjectscriptclass.cpp
index f372561..cb665d1 100644
--- a/src/declarative/qml/qmlobjectscriptclass.cpp
+++ b/src/declarative/qml/qmlobjectscriptclass.cpp
@@ -256,37 +256,37 @@ QScriptValue QmlObjectScriptClass::property(QObject *obj, const Identifier &name
qreal rv = 0;
void *args[] = { &rv, 0 };
QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
- return QScriptValue(rv);
+ return QScriptValue(scriptEngine, rv);
} else if (lastData->propType == QMetaType::Int) {
int rv = 0;
void *args[] = { &rv, 0 };
QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
- return QScriptValue(rv);
+ return QScriptValue(scriptEngine, rv);
} else if (lastData->propType == QMetaType::Bool) {
bool rv = false;
void *args[] = { &rv, 0 };
QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
- return QScriptValue(rv);
+ return QScriptValue(scriptEngine, rv);
} else if (lastData->propType == QMetaType::QString) {
QString rv;
void *args[] = { &rv, 0 };
QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
- return QScriptValue(rv);
+ return QScriptValue(scriptEngine, rv);
} else if (lastData->propType == QMetaType::UInt) {
uint rv = 0;
void *args[] = { &rv, 0 };
QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
- return QScriptValue(rv);
+ return QScriptValue(scriptEngine, rv);
} else if (lastData->propType == QMetaType::Float) {
float rv = 0;
void *args[] = { &rv, 0 };
QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
- return QScriptValue(rv);
+ return QScriptValue(scriptEngine, rv);
} else if (lastData->propType == QMetaType::Double) {
double rv = 0;
void *args[] = { &rv, 0 };
QMetaObject::metacall(obj, QMetaObject::ReadProperty, lastData->coreIndex, args);
- return QScriptValue(rv);
+ return QScriptValue(scriptEngine, rv);
} else {
QVariant var = obj->metaObject()->property(lastData->coreIndex).read(obj);
return enginePriv->scriptValueFromVariant(var);