diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-24 12:13:42 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-26 09:05:19 +0200 |
| commit | a57085f00b146798a0cca0d52dfa127232c3e659 (patch) | |
| tree | 7b4df3f155d431aeb6f3aae01943a3411c812a7b /src/imports/dialogs-private | |
| parent | 12fd2ccd3fa2dc0133b5a3fb89f9fdf5cf721232 (diff) | |
Fix API of QQmlV4Handle
Change-Id: Iac4a3fefebd33a5990408598486231a5add8e639
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/imports/dialogs-private')
| -rw-r--r-- | src/imports/dialogs-private/qquickfontlistmodel.cpp | 4 | ||||
| -rw-r--r-- | src/imports/dialogs-private/qquickwritingsystemlistmodel.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/dialogs-private/qquickfontlistmodel.cpp b/src/imports/dialogs-private/qquickfontlistmodel.cpp index 233001b723..9d3b90f4d9 100644 --- a/src/imports/dialogs-private/qquickfontlistmodel.cpp +++ b/src/imports/dialogs-private/qquickfontlistmodel.cpp @@ -211,7 +211,7 @@ QQmlV4Handle QQuickFontListModel::get(int idx) const Q_D(const QQuickFontListModel); if (idx < 0 || idx >= count()) - return QQmlV4Handle(Value::undefinedValue()); + return QQmlV4Handle(Encode::undefined()); QQmlEngine *engine = qmlContext(this)->engine(); QV8Engine *v8engine = QQmlEnginePrivate::getV8Engine(engine); @@ -224,7 +224,7 @@ QQmlV4Handle QQuickFontListModel::get(int idx) const p->value = Value::fromReturnedValue(v8engine->fromVariant(data(index(idx, 0), Qt::UserRole + ii + 1))); } - return QQmlV4Handle(o.asValue()); + return QQmlV4Handle(o); } QQmlV4Handle QQuickFontListModel::pointSizes() diff --git a/src/imports/dialogs-private/qquickwritingsystemlistmodel.cpp b/src/imports/dialogs-private/qquickwritingsystemlistmodel.cpp index ffe82fce12..0183d67017 100644 --- a/src/imports/dialogs-private/qquickwritingsystemlistmodel.cpp +++ b/src/imports/dialogs-private/qquickwritingsystemlistmodel.cpp @@ -149,7 +149,7 @@ QQmlV4Handle QQuickWritingSystemListModel::get(int idx) const Q_D(const QQuickWritingSystemListModel); if (idx < 0 || idx >= count()) - return QQmlV4Handle(Value::undefinedValue()); + return QQmlV4Handle(Encode::undefined()); QQmlEngine *engine = qmlContext(this)->engine(); QV8Engine *v8engine = QQmlEnginePrivate::getV8Engine(engine); @@ -162,7 +162,7 @@ QQmlV4Handle QQuickWritingSystemListModel::get(int idx) const p->value = Value::fromReturnedValue(v8engine->fromVariant(data(index(idx, 0), Qt::UserRole + ii + 1))); } - return QQmlV4Handle(o.asValue()); + return QQmlV4Handle(o); } void QQuickWritingSystemListModel::classBegin() |