Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: I48b9c2e4f3a75c18470c55f73f2089dc1401de54

2 files changed, 25 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlbinding/data/nanPropertyToInt.qml b/tests/auto/qml/qqmlbinding/data/nanPropertyToInt.qml
new file mode 100644
index 0000000000..366dbf0464
--- /dev/null
+++ b/tests/auto/qml/qqmlbinding/data/nanPropertyToInt.qml
@@ -0,0 +1,14 @@
+import QtQuick 2.11
+
+Item {
+    visible: true
+    width: 320
+    height: 200
+    property int val: other.val
+
+    Rectangle {
+        id: other
+        anchors.fill: parent;
+        property int val: undefined / 2
+    }
+}
diff --git a/tests/auto/qml/qqmlbinding/tst_qqmlbinding.cpp b/tests/auto/qml/qqmlbinding/tst_qqmlbinding.cpp
index 2c2d311ff7..2610402455 100644
--- a/tests/auto/qml/qqmlbinding/tst_qqmlbinding.cpp
+++ b/tests/auto/qml/qqmlbinding/tst_qqmlbinding.cpp
@@ -56,6 +56,7 @@ private slots:
     void bindingOverwriting();
     void bindToQmlComponent();
     void bindingDoesNoWeirdConversion();
+    void bindNaNToInt();
 
 private:
     QQmlEngine engine;
@@ -398,6 +399,16 @@ void tst_qqmlbinding::bindingDoesNoWeirdConversion()
     QVERIFY(colorLabel);
 }
 
+//QTBUG-72442
+void tst_qqmlbinding::bindNaNToInt()
+{
+    QQmlEngine engine;
+    QQmlComponent c(&engine, testFileUrl("nanPropertyToInt.qml"));
+    QScopedPointer<QQuickItem> item(qobject_cast<QQuickItem*>(c.create()));
+
+    QVERIFY(item != nullptr);
+    QCOMPARE(item->property("val").toInt(), 0);
+}
 QTEST_MAIN(tst_qqmlbinding)
 
 #include "tst_qqmlbinding.moc"