diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-17 22:33:48 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-22 01:06:20 +0200 |
| commit | 2d781c4ca42f50643fa37200073a2fb2644b3806 (patch) | |
| tree | 9554dbea266f6fbb7820db018e39624b6c0f1353 /src/imports | |
| parent | 21198a676128a52e892557bc434035bcd1ddfaac (diff) | |
Cleanup ExecutionEngine::newBuiltinFunction() usages
And change the return type to be GC safe
Change-Id: I6d7513962370fea4072a3d8c6b2c6f2d1705992e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/localstorage/plugin.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp index 900a5a09a3..c72e61cd99 100644 --- a/src/imports/localstorage/plugin.cpp +++ b/src/imports/localstorage/plugin.cpp @@ -448,9 +448,7 @@ QQmlSqlDatabaseData::QQmlSqlDatabaseData(QV8Engine *engine) Scoped<Object> proto(scope, v4->newObject()); proto->defineDefaultProperty(v4, QStringLiteral("transaction"), qmlsqldatabase_transaction); proto->defineDefaultProperty(v4, QStringLiteral("readTransaction"), qmlsqldatabase_read_transaction); - Property *p = proto->insertMember(v4->newString(QStringLiteral("version")), - Attr_Accessor|Attr_NotConfigurable|Attr_NotEnumerable); - p->setGetter(v4->newBuiltinFunction(v4->rootContext, v4->newString(QStringLiteral("version")), qmlsqldatabase_version)); + proto->defineAccessorProperty(v4->newString(QStringLiteral("version")), qmlsqldatabase_version, 0); proto->defineDefaultProperty(v4, QStringLiteral("changeVersion"), qmlsqldatabase_changeVersion); databaseProto = proto; } @@ -463,13 +461,9 @@ QQmlSqlDatabaseData::QQmlSqlDatabaseData(QV8Engine *engine) { Scoped<Object> proto(scope, v4->newObject()); proto->defineDefaultProperty(v4, QStringLiteral("item"), qmlsqldatabase_rows_item); - Property *p = proto->insertMember(v4->newString(QStringLiteral("length")), - Attr_Accessor|Attr_NotConfigurable|Attr_NotEnumerable); - p->setGetter(v4->newBuiltinFunction(v4->rootContext, v4->newString(QStringLiteral("length")), qmlsqldatabase_rows_length)); - p = proto->insertMember(v4->newString(QStringLiteral("forwardOnly")), - Attr_Accessor|Attr_NotConfigurable|Attr_NotEnumerable); - p->setGetter(v4->newBuiltinFunction(v4->rootContext, v4->newString(QStringLiteral("forwardOnly")), qmlsqldatabase_rows_forwardOnly)); - p->setSetter(v4->newBuiltinFunction(v4->rootContext, v4->newString(QStringLiteral("setForwardOnly")), qmlsqldatabase_rows_setForwardOnly)); + proto->defineAccessorProperty(v4->newString(QStringLiteral("length")), qmlsqldatabase_rows_length, 0); + proto->defineAccessorProperty(v4->newString(QStringLiteral("forwardOnly")), + qmlsqldatabase_rows_forwardOnly, qmlsqldatabase_rows_setForwardOnly); rowsProto = proto; } } |