diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-10-01 09:55:50 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-01 11:54:18 +0200 |
| commit | 3fbe74cb0b6f01ca930bf4f22f25b4976cbe1ac3 (patch) | |
| tree | 5de8d49d02ce47f674c3080fafe5068aa57ebd92 /src/qml/jsruntime/qv4arrayobject.cpp | |
| parent | a8b27d974a4ced654a4566b6a9822ed92956a2d2 (diff) | |
V4: fix ArrayPrototype::method_isArray() build break
With a recent Clang in C++11 mode:
error: incompatible operand types ('QV4::ArrayObject *' and 'bool')
Task-number: QTBUG-33706
Change-Id: I7bd4fe01176745fb6f8dbdf8f271edb7121eb35e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4arrayobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4arrayobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4arrayobject.cpp b/src/qml/jsruntime/qv4arrayobject.cpp index 8687ca48ce..6f19597e6e 100644 --- a/src/qml/jsruntime/qv4arrayobject.cpp +++ b/src/qml/jsruntime/qv4arrayobject.cpp @@ -133,7 +133,7 @@ uint ArrayPrototype::getLength(ExecutionContext *ctx, ObjectRef o) ReturnedValue ArrayPrototype::method_isArray(SimpleCallContext *ctx) { - bool isArray = ctx->callData->argc ? ctx->callData->args[0].asArrayObject() : false; + bool isArray = ctx->callData->argc && ctx->callData->args[0].asArrayObject(); return Encode(isArray); } |