diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-01-10 22:04:54 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2015-01-12 14:52:50 +0100 |
| commit | 447844aa25754db7e868469de4537af4331709ac (patch) | |
| tree | 80245a0d948e87c8cfd7a35eb5fdc93a65105ccd /src/qml/jsapi | |
| parent | 56211be8a0429fb3e3fa268c7698e1df079aa04e (diff) | |
Get rid of Value::engine()
This method is not guaranteed to return an engine. We're safer
checking for the value being an object first and then getting
the engine from there.
Change-Id: I5c95e675337e545f2421613bd31c42d1e58d6f9a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsapi')
| -rw-r--r-- | src/qml/jsapi/qjsvalue.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp index 672cb23b20..d888ea3535 100644 --- a/src/qml/jsapi/qjsvalue.cpp +++ b/src/qml/jsapi/qjsvalue.cpp @@ -516,8 +516,8 @@ QVariant QJSValue::toVariant() const if (d->value.isEmpty()) return d->unboundData; - if (d->value.asObject()) - return d->value.engine()->toVariant(d->value, /*typeHint*/ -1, /*createJSValueForObjects*/ false); + if (Object *o = d->value.asObject()) + return o->engine()->toVariant(d->value, /*typeHint*/ -1, /*createJSValueForObjects*/ false); if (d->value.isString()) return QVariant(d->value.stringValue()->toQString()); |