diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-16 01:01:37 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-16 01:01:37 +0200 |
commit | 67481cae7e1aa6e560eaca94bfa5c14bfa8edc25 (patch) | |
tree | 714eb8ce3dfc4816718562b1286b5ca6c711628a /src/qml | |
parent | bccf872b94944dfa476ccedc1d1a45d380703e15 (diff) | |
parent | 383854f482a34cef14f918c2a3172522249ef542 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I6e69a235f50472b8f7ac19e133a3c071ea8c4d7a
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/qml/qqmlbinding.cpp | 5 | ||||
-rw-r--r-- | src/qml/qml/qqmlprivate.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp index 2f6aabf61e..112e5b558a 100644 --- a/src/qml/qml/qqmlbinding.cpp +++ b/src/qml/qml/qqmlbinding.cpp @@ -298,8 +298,9 @@ protected: case QMetaType::Int: if (result.isInteger()) return doStore<int>(result.integerValue(), pd, flags); - else if (result.isNumber()) - return doStore<int>(result.doubleValue(), pd, flags); + else if (result.isNumber()) { + return doStore<int>(QV4::StaticValue::toInteger(result.doubleValue()), pd, flags); + } break; case QMetaType::Double: if (result.isNumber()) diff --git a/src/qml/qml/qqmlprivate.h b/src/qml/qml/qqmlprivate.h index 27dac71571..9504fc37dc 100644 --- a/src/qml/qml/qqmlprivate.h +++ b/src/qml/qml/qqmlprivate.h @@ -62,7 +62,7 @@ #include <QtCore/qglobal.h> #include <QtCore/qvariant.h> #include <QtCore/qurl.h> -#include <QPointer> +#include <QtCore/qpointer.h> #include <QtCore/qmetaobject.h> #include <QtCore/qdebug.h> |