diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-11-18 15:58:30 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-18 17:03:00 +0100 |
| commit | b864e167281b7ac180ed121126a9accdaa6008d9 (patch) | |
| tree | 555abf4aacc8ed2aacef05056af36865e344dc10 /src/qml/jsruntime/qv4sparsearray.cpp | |
| parent | 96ee6860163bba1e86b032c9c66cb893c666770a (diff) | |
Fix small bug in array sorting
Task-number: QTBUG-34321
Change-Id: I33089499f730bce16a9dfdda04cc8402602bc5fa
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4sparsearray.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4sparsearray.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4sparsearray.cpp b/src/qml/jsruntime/qv4sparsearray.cpp index ec6b0f5ad1..3ee89d5b53 100644 --- a/src/qml/jsruntime/qv4sparsearray.cpp +++ b/src/qml/jsruntime/qv4sparsearray.cpp @@ -57,9 +57,9 @@ bool ArrayElementLessThan::operator()(const Property &p1, const Property &p2) co { Scope scope(m_context); - if (p1.value.isUndefined()) + if (p1.value.isUndefined() || p1.value.isEmpty()) return false; - if (p2.value.isUndefined()) + if (p2.value.isUndefined() || p2.value.isEmpty()) return true; ScopedObject o(scope, m_comparefn); if (o) { @@ -71,7 +71,7 @@ bool ArrayElementLessThan::operator()(const Property &p1, const Property &p2) co callData->args[1] = p2.value; result = __qmljs_call_value(m_context, m_comparefn, callData); - return result->toNumber() <= 0; + return result->toNumber() < 0; } ScopedString p1s(scope, p1.value.toString(m_context)); ScopedString p2s(scope, p2.value.toString(m_context)); |