diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2013-09-13 10:53:12 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-17 13:09:51 +0200 |
| commit | 7ebd0523e10fee949eec2a05b20e0897c3eeb1ba (patch) | |
| tree | 52adcf2cd058268c4928227a2163947b0ca0f7b4 /src/qml/jsapi | |
| parent | 5a16b044057258aaa3e8d12cd232003bb252eb5a (diff) | |
Fix wrong return type
Android g++4.8 errors out with
jsapi/qjsvalueiterator.cpp: In member function 'QString QJSValueIterator::name() const':
jsapi/qjsvalueiterator.cpp:155:16: error: converting 'false' to pointer type for argument 1
of 'QString::QString(const char*)' [-Werror=conversion-null]
return false;
Change-Id: I589418e34c7e1ae72f2bf547067ea8e5944119b8
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/jsapi')
| -rw-r--r-- | src/qml/jsapi/qjsvalueiterator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsapi/qjsvalueiterator.cpp b/src/qml/jsapi/qjsvalueiterator.cpp index aa1ecd6e54..545250f27a 100644 --- a/src/qml/jsapi/qjsvalueiterator.cpp +++ b/src/qml/jsapi/qjsvalueiterator.cpp @@ -152,7 +152,7 @@ bool QJSValueIterator::next() QString QJSValueIterator::name() const { if (!QJSValuePrivate::get(d_ptr->value)->value.isObject()) - return false; + return QString(); if (d_ptr->currentName) return d_ptr->currentName->toQString(); if (d_ptr->currentIndex < UINT_MAX) |