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

Conflicts:
	src/qml/compiler/qqmltypecompiler.cpp
	src/qml/compiler/qv4isel_moth.cpp
	src/qml/compiler/qv4ssa_p.h
	src/qml/qml/qqmlobjectcreator.cpp

Change-Id: I8bb7fe773d657f908f20ee5e72c2b9bd643f6260

1 files changed, 3 insertions, 39 deletions

diff --git a/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp b/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
index 21e6d9efe6..fe73610bcc 100644
--- a/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
+++ b/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
@@ -327,11 +327,8 @@ class PropertyObject : public QObject
     Q_PROPERTY(MyQmlObject *qmlObject READ qmlObject)
     Q_PROPERTY(MyQObject *qObject READ qObject WRITE setQObject NOTIFY qObjectChanged)
     Q_PROPERTY(QString stringProperty READ stringProperty WRITE setStringProperty)
-    Q_PROPERTY(char charProperty READ charProperty WRITE setCharProperty)
     Q_PROPERTY(QChar qcharProperty READ qcharProperty WRITE setQcharProperty)
     Q_PROPERTY(QChar constQChar READ constQChar STORED false CONSTANT FINAL)
-    Q_PROPERTY(char constChar READ constChar STORED false CONSTANT FINAL)
-    Q_PROPERTY(int constInt READ constInt STORED false CONSTANT FINAL)
 
     Q_CLASSINFO("DefaultProperty", "defaultProperty")
 public:
@@ -368,15 +365,11 @@ public:
     }
 
     QString stringProperty() const { return m_stringProperty;}
-    char charProperty() const { return m_charProperty; }
     QChar qcharProperty() const { return m_qcharProperty; }
 
     QChar constQChar() const { return 0x25cf; /* Unicode: black circle */ }
-    char constChar() const { return 'A'; }
-    int constInt() const { return 123456; }
 
     void setStringProperty(QString arg) { m_stringProperty = arg; }
-    void setCharProperty(char arg) { m_charProperty = arg; }
     void setQcharProperty(QChar arg) { m_qcharProperty = arg; }
 
 signals:
@@ -393,7 +386,6 @@ private:
     MyQmlObject m_qmlObject;
     MyQObject *m_qObject;
     QString m_stringProperty;
-    char m_charProperty;
     QChar m_qcharProperty;
 };
 
@@ -1418,23 +1410,14 @@ void tst_qqmlproperty::write()
     // Char/string-property
     {
         PropertyObject o;
-        QQmlProperty charProperty(&o, "charProperty");
         QQmlProperty qcharProperty(&o, "qcharProperty");
         QQmlProperty stringProperty(&o, "stringProperty");
 
         const int black_circle = 0x25cf;
 
-        QCOMPARE(charProperty.write(QString("foo")), false);
-        QCOMPARE(charProperty.write('Q'), true);
-        QCOMPARE(charProperty.read(), QVariant('Q'));
-        QCOMPARE(charProperty.write(QString("t")), true);
-        QCOMPARE(charProperty.read(), QVariant('t'));
-
         QCOMPARE(qcharProperty.write(QString("foo")), false);
         QCOMPARE(qcharProperty.write('Q'), true);
         QCOMPARE(qcharProperty.read(), QVariant('Q'));
-        QCOMPARE(qcharProperty.write(QString("t")), true);
-        QCOMPARE(qcharProperty.read(), QVariant('t'));
         QCOMPARE(qcharProperty.write(QChar(black_circle)), true);
         QCOMPARE(qcharProperty.read(), QVariant(QChar(black_circle)));
 
@@ -1443,19 +1426,10 @@ void tst_qqmlproperty::write()
         QCOMPARE(o.stringProperty(), QString("bar"));
         QCOMPARE(stringProperty.write(QVariant(1234)), true);
         QCOMPARE(stringProperty.read().toString(), QString::number(1234));
+        QCOMPARE(stringProperty.write('A'), true);
+        QCOMPARE(stringProperty.read().toString(), QString::number('A'));
         QCOMPARE(stringProperty.write(QChar(black_circle)), true);
-        QCOMPARE(stringProperty.read(), QVariant(QString(QChar(black_circle))));
-
-        { // char -> QString
-            QQmlComponent component(&engine);
-            component.setData("import Test 1.0\nPropertyObject { stringProperty: constChar }", QUrl());
-            PropertyObject *obj = qobject_cast<PropertyObject*>(component.create());
-            QVERIFY(obj != 0);
-            if (obj) {
-                QQmlProperty stringProperty(obj, "stringProperty");
-                QCOMPARE(stringProperty.read(), QVariant(QString(obj->constChar())));
-            }
-        }
+        QCOMPARE(stringProperty.read(), QVariant(QChar(black_circle)));
 
         { // QChar -> QString
             QQmlComponent component(&engine);
@@ -1468,16 +1442,6 @@ void tst_qqmlproperty::write()
             }
         }
 
-        { // int -> QString
-            QQmlComponent component(&engine);
-            component.setData("import Test 1.0\nPropertyObject { stringProperty: constInt }", QUrl());
-            PropertyObject *obj = qobject_cast<PropertyObject*>(component.create());
-            QVERIFY(obj != 0);
-            if (obj) {
-                QQmlProperty stringProperty(obj, "stringProperty");
-                QCOMPARE(stringProperty.read(), QVariant(QString::number(obj->constInt())));
-            }
-        }
     }
 
     // VariantMap-property