diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-09-25 13:52:15 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-28 13:33:32 +0200 |
commit | 4d40fa24c3ee8def2f27bd237fc8dec25cf3f473 (patch) | |
tree | cb4ad758f03cf204cbae1e7d086bfeaf73a64bc3 /src/imports/dialogs-private | |
parent | abd82c68d564c97a4452a3afa2d63320e7292b30 (diff) |
Move Value::toInteger(double) and related to Primitive
Also clean up a few other direct uses of Value
Change-Id: Ie27d42c1b31b9e6d16d0a60071cb5e4e1c5b9e8b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/imports/dialogs-private')
-rw-r--r-- | src/imports/dialogs-private/qquickfontlistmodel.cpp | 2 | ||||
-rw-r--r-- | src/imports/dialogs-private/qquickwritingsystemlistmodel.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/dialogs-private/qquickfontlistmodel.cpp b/src/imports/dialogs-private/qquickfontlistmodel.cpp index 327f214145..96d1824ef6 100644 --- a/src/imports/dialogs-private/qquickfontlistmodel.cpp +++ b/src/imports/dialogs-private/qquickfontlistmodel.cpp @@ -221,7 +221,7 @@ QQmlV4Handle QQuickFontListModel::get(int idx) const ScopedString s(scope); for (int ii = 0; ii < d->roleNames.keys().count(); ++ii) { Property *p = o->insertMember((s = v4engine->newIdentifier(d->roleNames[Qt::UserRole + ii + 1])), PropertyAttributes()); - p->value = Value::fromReturnedValue(v8engine->fromVariant(data(index(idx, 0), Qt::UserRole + ii + 1))); + p->value = v8engine->fromVariant(data(index(idx, 0), Qt::UserRole + ii + 1)); } return QQmlV4Handle(o); diff --git a/src/imports/dialogs-private/qquickwritingsystemlistmodel.cpp b/src/imports/dialogs-private/qquickwritingsystemlistmodel.cpp index 0183d67017..f2b4ff8b8f 100644 --- a/src/imports/dialogs-private/qquickwritingsystemlistmodel.cpp +++ b/src/imports/dialogs-private/qquickwritingsystemlistmodel.cpp @@ -159,7 +159,7 @@ QQmlV4Handle QQuickWritingSystemListModel::get(int idx) const ScopedString s(scope); for (int ii = 0; ii < d->roleNames.keys().count(); ++ii) { Property *p = o->insertMember((s = v4engine->newIdentifier(d->roleNames[Qt::UserRole + ii + 1])), PropertyAttributes()); - p->value = Value::fromReturnedValue(v8engine->fromVariant(data(index(idx, 0), Qt::UserRole + ii + 1))); + p->value = v8engine->fromVariant(data(index(idx, 0), Qt::UserRole + ii + 1)); } return QQmlV4Handle(o); |