Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
	tests/auto/quick/qquickitem/tst_qquickitem.cpp

Change-Id: If261f8eea84dfa5944bb55de999d1f70aba528fd

5 files changed, 69 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index f185fea1d5..aeb8b08cd4 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -324,6 +324,7 @@ private slots:
     void qtbug_46022();
     void qtbug_52340();
     void qtbug_54589();
+    void qtbug_54687();
 
 private:
 //    static void propertyVarWeakRefCallback(v8::Persistent<v8::Value> object, void* parameter);
@@ -7925,6 +7926,12 @@ void tst_qqmlecmascript::qtbug_54589()
     QCOMPARE(obj->property("result").toBool(), true);
 }
 
+void tst_qqmlecmascript::qtbug_54687()
+{
+    QJSEngine e;
+    // it's simple: this shouldn't crash.
+    engine.evaluate("12\n----12");
+}
 
 QTEST_MAIN(tst_qqmlecmascript)
 
diff --git a/tests/auto/qml/qqmllanguage/data/assignBasicTypes.qml b/tests/auto/qml/qqmllanguage/data/assignBasicTypes.qml
index c91cf581b3..52027232db 100644
--- a/tests/auto/qml/qqmllanguage/data/assignBasicTypes.qml
+++ b/tests/auto/qml/qqmllanguage/data/assignBasicTypes.qml
@@ -26,7 +26,9 @@ MyTypeObject {
     boolProperty: true
     variantProperty: "Hello World!"
     vectorProperty: "10,1,2.2"
+    vector2Property: "2, 3"
     vector4Property: "10,1,2.2,2.3"
+    quaternionProperty: "4,5,6,7"
     urlProperty: "main.qml?with%3cencoded%3edata"
 
     objectProperty: MyTypeObject { intProperty: 8 }
diff --git a/tests/auto/qml/qqmllanguage/testtypes.h b/tests/auto/qml/qqmllanguage/testtypes.h
index 082182e8e6..337ba91532 100644
--- a/tests/auto/qml/qqmllanguage/testtypes.h
+++ b/tests/auto/qml/qqmllanguage/testtypes.h
@@ -33,8 +33,10 @@
 #include <QtCore/qdatetime.h>
 #include <QtGui/qmatrix.h>
 #include <QtGui/qcolor.h>
+#include <QtGui/qvector2d.h>
 #include <QtGui/qvector3d.h>
 #include <QtGui/qvector4d.h>
+#include <QtGui/qquaternion.h>
 #include <QtQml/qqml.h>
 #include <QtQml/qqmlcomponent.h>
 #include <QtQml/qqmlparserstatus.h>
@@ -242,8 +244,10 @@ class MyTypeObject : public QObject
     Q_PROPERTY(QRectF rectFProperty READ rectFProperty WRITE setRectFProperty NOTIFY rectFPropertyChanged)
     Q_PROPERTY(bool boolProperty READ boolProperty WRITE setBoolProperty NOTIFY boolPropertyChanged)
     Q_PROPERTY(QVariant variantProperty READ variantProperty WRITE setVariantProperty NOTIFY variantPropertyChanged)
+    Q_PROPERTY(QVector2D vector2Property READ vector2Property WRITE setVector2Property NOTIFY vector2PropertyChanged)
     Q_PROPERTY(QVector3D vectorProperty READ vectorProperty WRITE setVectorProperty NOTIFY vectorPropertyChanged)
     Q_PROPERTY(QVector4D vector4Property READ vector4Property WRITE setVector4Property NOTIFY vector4PropertyChanged)
+    Q_PROPERTY(QQuaternion quaternionProperty READ quaternionProperty WRITE setQuaternionProperty NOTIFY quaternionPropertyChanged)
     Q_PROPERTY(QUrl urlProperty READ urlProperty WRITE setUrlProperty NOTIFY urlPropertyChanged)
 
     Q_PROPERTY(QQmlScriptString scriptProperty READ scriptProperty WRITE setScriptProperty)
@@ -524,6 +528,15 @@ public:
         emit vectorPropertyChanged();
     }
 
+    QVector2D vector2PropertyValue;
+    QVector2D vector2Property() const {
+        return vector2PropertyValue;
+    }
+    void setVector2Property(const QVector2D &v) {
+        vector2PropertyValue = v;
+        emit vector2PropertyChanged();
+    }
+
     QVector4D vector4PropertyValue;
     QVector4D vector4Property() const {
         return vector4PropertyValue;
@@ -533,6 +546,15 @@ public:
         emit vector4PropertyChanged();
     }
 
+    QQuaternion quaternionPropertyValue;
+    QQuaternion quaternionProperty() const {
+        return quaternionPropertyValue;
+    }
+    void setQuaternionProperty(const QQuaternion &v) {
+        quaternionPropertyValue = v;
+        emit quaternionPropertyChanged();
+    }
+
     QUrl urlPropertyValue;
     QUrl urlProperty() const {
         return urlPropertyValue;
@@ -586,7 +608,9 @@ signals:
     void boolPropertyChanged();
     void variantPropertyChanged();
     void vectorPropertyChanged();
+    void vector2PropertyChanged();
     void vector4PropertyChanged();
+    void quaternionPropertyChanged();
     void urlPropertyChanged();
 
 };
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index c74b4dd1f1..4e4b939e8b 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -677,6 +677,7 @@ void tst_qqmllanguage::assignBasicTypes()
     QCOMPARE(object->boolProperty(), true);
     QCOMPARE(object->variantProperty(), QVariant("Hello World!"));
     QCOMPARE(object->vectorProperty(), QVector3D(10, 1, 2.2f));
+    QCOMPARE(object->vector2Property(), QVector2D(2, 3));
     QCOMPARE(object->vector4Property(), QVector4D(10, 1, 2.2f, 2.3f));
     const QUrl encoded = QUrl::fromEncoded("main.qml?with%3cencoded%3edata", QUrl::TolerantMode);
     QCOMPARE(object->urlProperty(), component.url().resolved(encoded));
diff --git a/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp b/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp
index e0c2324dc6..b8ea98df2b 100644
--- a/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp
+++ b/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp
@@ -60,6 +60,7 @@ private slots:
     void QTBUG_35233();
     void disallowExtending();
     void QTBUG_35906();
+    void QTBUG_48136();
 };
 
 class LazyPropertyMap : public QQmlPropertyMap, public QQmlParserStatus
@@ -462,6 +463,40 @@ void tst_QQmlPropertyMap::QTBUG_35906()
     QCOMPARE(value.toInt(), 42);
 }
 
+void tst_QQmlPropertyMap::QTBUG_48136()
+{
+    static const char key[] = "mykey";
+    QQmlPropertyMap map;
+
+    //
+    // Test that the notify signal is emitted correctly
+    //
+
+    const int propIndex = map.metaObject()->indexOfProperty(key);
+    const QMetaProperty prop = map.metaObject()->property(propIndex);
+    QSignalSpy notifySpy(&map, QByteArray::number(QSIGNAL_CODE) + prop.notifySignal().methodSignature());
+
+    map.insert(key, 42);
+    QCOMPARE(notifySpy.count(), 1);
+    map.insert(key, 43);
+    QCOMPARE(notifySpy.count(), 2);
+    map.insert(key, 43);
+    QCOMPARE(notifySpy.count(), 2);
+    map.insert(key, 44);
+    QCOMPARE(notifySpy.count(), 3);
+
+    //
+    // Test that the valueChanged signal is emitted correctly
+    //
+    QSignalSpy valueChangedSpy(&map, &QQmlPropertyMap::valueChanged);
+    map.setProperty(key, 44);
+    QCOMPARE(valueChangedSpy.count(), 0);
+    map.setProperty(key, 45);
+    QCOMPARE(valueChangedSpy.count(), 1);
+    map.setProperty(key, 45);
+    QCOMPARE(valueChangedSpy.count(), 1);
+}
+
 QTEST_MAIN(tst_QQmlPropertyMap)
 
 #include "tst_qqmlpropertymap.moc"