diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-24 16:37:45 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-24 18:27:41 +0100 |
| commit | 22041acdfe85c9a9b814e11cd86e8ee5a55be82d (patch) | |
| tree | 1b4d1bfa0ebba9e5d1495b5ca7055dba94642c46 /src/qml/jsapi | |
| parent | 6ae57f01bb1495a74b23a81c590672ce788d5400 (diff) | |
| parent | 2407cd29e628671f7f5144e0d241d4249a3ab612 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/imports/dialogs/qquickmessagedialog.cpp
src/imports/dialogs/qquickmessagedialog_p.h
src/qml/debugger/qqmlprofilerservice_p.h
src/qml/jsruntime/qv4regexpobject.cpp
tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro
Change-Id: Ic8a43366b44d6970966acbf03b206d0dee00c28d
Diffstat (limited to 'src/qml/jsapi')
| -rw-r--r-- | src/qml/jsapi/qjsvalue.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp index 0734e92b19..c8de31ef78 100644 --- a/src/qml/jsapi/qjsvalue.cpp +++ b/src/qml/jsapi/qjsvalue.cpp @@ -746,7 +746,7 @@ static bool js_equal(const QString &string, QV4::ValueRef value) if (value->isNumber()) return __qmljs_string_to_number(string) == value->asDouble(); if (value->isBoolean()) - return __qmljs_string_to_number(string) == value->booleanValue(); + return __qmljs_string_to_number(string) == double(value->booleanValue()); if (value->isObject()) { Scope scope(value->objectValue()->engine()); ScopedValue p(scope, __qmljs_to_primitive(value, PREFERREDTYPE_HINT)); |