Merge remote-tracking branch 'origin/5.10' into 5.11

 Conflicts:
	src/imports/shapes/qquickshape.cpp
	src/imports/shapes/qquickshape_p_p.h
	src/qml/compiler/qqmlpropertycachecreator_p.h
	src/qml/jsruntime/qv4value_p.h
	src/quick/items/qquickloader_p.h
	tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
	tools/qmlprofiler/qmlprofilerapplication.cpp

Change-Id: Iafc66ae84bf78630ed72a986acb678e9d19e3a69

3 files changed, 31 insertions, 1 deletions

diff --git a/tests/auto/qml/qqmlecmascript/data/nans.qml b/tests/auto/qml/qqmlecmascript/data/nans.qml
new file mode 100644
index 0000000000..ece69f2d79
--- /dev/null
+++ b/tests/auto/qml/qqmlecmascript/data/nans.qml
@@ -0,0 +1,5 @@
+import QtQuick 2.0
+
+QtObject {
+    property var prop: undefined
+}
diff --git a/tests/auto/qml/qqmlecmascript/testtypes.h b/tests/auto/qml/qqmlecmascript/testtypes.h
index 2db35d0219..8d89df31db 100644
--- a/tests/auto/qml/qqmlecmascript/testtypes.h
+++ b/tests/auto/qml/qqmlecmascript/testtypes.h
@@ -1663,7 +1663,8 @@ class SingletonWithEnum : public QObject
     Q_ENUMS(TestEnum)
 public:
     enum TestEnum {
-        TestValue = 42
+        TestValue = 42,
+        TestValue_MinusOne = -1
     };
 };
 
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index f48cb2743c..b7d5db9914 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -348,6 +348,7 @@ private slots:
     void forInIterator();
     void localForInIterator();
     void shadowedFunctionName();
+    void anotherNaN();
 
 private:
 //    static void propertyVarWeakRefCallback(v8::Persistent<v8::Value> object, void* parameter);
@@ -7922,6 +7923,15 @@ void tst_qqmlecmascript::singletonWithEnum()
     QVariant prop = obj->property("testValue");
     QCOMPARE(prop.type(), QVariant::Int);
     QCOMPARE(prop.toInt(), int(SingletonWithEnum::TestValue));
+
+    {
+        QQmlExpression expr(qmlContext(obj.data()), obj.data(), "SingletonWithEnum.TestValue_MinusOne");
+        bool valueUndefined = false;
+        QVariant result = expr.evaluate(&valueUndefined);
+        QVERIFY2(!expr.hasError(), qPrintable(expr.error().toString()));
+        QVERIFY(!valueUndefined);
+        QCOMPARE(result.toInt(), -1);
+    }
 }
 
 void tst_qqmlecmascript::lazyBindingEvaluation()
@@ -8369,6 +8379,20 @@ void tst_qqmlecmascript::qtbug_60547()
     QCOMPARE(object->property("counter"), QVariant(int(1)));
 }
 
+void tst_qqmlecmascript::anotherNaN()
+{
+    QQmlComponent component(&engine, testFileUrl("nans.qml"));
+    QScopedPointer<QObject> object(component.create());
+    QVERIFY2(!object.isNull(), qPrintable(component.errorString()));
+    object->setProperty("prop", std::numeric_limits<double>::quiet_NaN()); // don't crash
+
+    std::uint64_t anotherNaN = 0xFFFFFF01000000F7ul;
+    double d;
+    std::memcpy(&d, &anotherNaN, sizeof(d));
+    QVERIFY(std::isnan(d));
+    object->setProperty("prop", d);  // don't crash
+}
+
 void tst_qqmlecmascript::delayLoadingArgs()
 {
     QJSEngine engine;