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

Conflicts:
	src/qml/debugger/qv4debugservice.cpp
	src/qml/jsruntime/qv4value_inl_p.h
	src/qml/jsruntime/qv4value_p.h
	src/qml/memory/qv4mm.cpp
	src/qml/memory/qv4mm_p.h
	src/qml/qml/qqmlnotifier_p.h
	src/qml/qml/qqmlproperty.cpp
	src/quick/items/qquickflickable.cpp
	src/quick/items/qquicktextedit.cpp
	tests/auto/quick/qquickwindow/BLACKLIST

The extra changes in qqmlbinding.cpp are ported from changes to
qqmlproperty.cpp that occurred in parallel with writeBinding() being
moved to qqmlbinding.cpp.

Change-Id: I16d1920abf448c29a01822256f52153651a56356

7 files changed, 258 insertions, 1 deletions

diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index 2ca3e42991..b61eca730f 100644
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -25,7 +25,8 @@ PUBLICTESTS += \
     qtqmlmodules \
     qquickfolderlistmodel \
     qqmlapplicationengine \
-    qqmlsettings
+    qqmlsettings \
+    qqmlstatemachine
 
 PRIVATETESTS += \
     animation \
diff --git a/tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp b/tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp
index 81215f7a18..4f1c9ae53e 100644
--- a/tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp
+++ b/tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp
@@ -165,6 +165,7 @@ private slots:
     void readProperty();
     void propertyChange();
     void disconnectOnDestroy();
+    void lotsOfBindings();
 
 private:
     void createObjects();
@@ -312,6 +313,39 @@ void tst_qqmlnotifier::disconnectOnDestroy()
     exportedObject->verifyReceiverCount();
 }
 
+class TestObject : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int a READ a NOTIFY aChanged)
+
+public:
+    int a() const { return 0; }
+
+signals:
+    void aChanged();
+};
+
+void tst_qqmlnotifier::lotsOfBindings()
+{
+    TestObject o;
+    QQmlEngine *e = new QQmlEngine;
+
+    e->rootContext()->setContextProperty(QStringLiteral("test"), &o);
+
+    QList<QQmlComponent *> components;
+    for (int i = 0; i < 20000; ++i) {
+        QQmlComponent *component = new QQmlComponent(e);
+        component->setData("import QtQuick 2.0; Item { width: test.a; }", QUrl());
+        component->create(e->rootContext());
+        components.append(component);
+    }
+
+    o.aChanged();
+
+    qDeleteAll(components);
+    delete e;
+}
+
 QTEST_MAIN(tst_qqmlnotifier)
 
 #include "tst_qqmlnotifier.moc"
diff --git a/tests/auto/qml/qqmlproperty/data/readonlyPrimitiveVsVar.qml b/tests/auto/qml/qqmlproperty/data/readonlyPrimitiveVsVar.qml
new file mode 100644
index 0000000000..253d61d1da
--- /dev/null
+++ b/tests/auto/qml/qqmlproperty/data/readonlyPrimitiveVsVar.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+
+QtObject {
+    readonly property var r_var: 1;
+    readonly property int r_int: 1;
+    property var w_var: 1;
+    property int w_int: 1;
+}
diff --git a/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp b/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
index 1d6c2d87ff..d6b1c86b88 100644
--- a/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
+++ b/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
@@ -146,6 +146,7 @@ private slots:
     void warnOnInvalidBinding();
     void registeredCompositeTypeProperty();
     void deeplyNestedObject();
+    void readOnlyDynamicProperties();
 
     void copy();
 private:
@@ -2039,6 +2040,20 @@ void tst_qqmlproperty::deeplyNestedObject()
     QCOMPARE(p.read(), QVariant(14));
 }
 
+void tst_qqmlproperty::readOnlyDynamicProperties()
+{
+    QQmlComponent comp(&engine, testFileUrl("readonlyPrimitiveVsVar.qml"));
+    QObject *obj = comp.create();
+    QVERIFY(obj != 0);
+
+    QVERIFY(!obj->metaObject()->property(obj->metaObject()->indexOfProperty("r_var")).isWritable());
+    QVERIFY(!obj->metaObject()->property(obj->metaObject()->indexOfProperty("r_int")).isWritable());
+    QVERIFY(obj->metaObject()->property(obj->metaObject()->indexOfProperty("w_var")).isWritable());
+    QVERIFY(obj->metaObject()->property(obj->metaObject()->indexOfProperty("w_int")).isWritable());
+
+    delete obj;
+}
+
 void tst_qqmlproperty::initTestCase()
 {
     QQmlDataTest::initTestCase();
diff --git a/tests/auto/qml/qqmlstatemachine/data/cppsignal.qml b/tests/auto/qml/qqmlstatemachine/data/cppsignal.qml
new file mode 100644
index 0000000000..3d06d823e2
--- /dev/null
+++ b/tests/auto/qml/qqmlstatemachine/data/cppsignal.qml
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Ford Motor Company
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQml 2.0
+
+import QtQml.StateMachine 1.0
+
+import CppObjectEnum 1.0
+
+StateMachine {
+    id: stateMachine
+    initialState: state0
+
+    State {
+        id: state0
+        SignalTransition {
+            targetState: state1
+            signal: _cppObject.mySignal
+            // signalState is mySignal's parameter
+            guard: signalState === CppObject.State1
+        }
+    }
+
+    State {
+        id: state1
+        SignalTransition {
+            targetState: state2
+            signal: _cppObject.mySignal
+            // signalState is mySignal's parameter
+            guard: signalState === CppObject.State2
+        }
+        onEntered: _cppObject.objectState = CppObject.State1
+    }
+
+    FinalState {
+        id: state2
+        onEntered: _cppObject.objectState = CppObject.State2
+    }
+    Component.onCompleted: stateMachine.running = true
+}
diff --git a/tests/auto/qml/qqmlstatemachine/qqmlstatemachine.pro b/tests/auto/qml/qqmlstatemachine/qqmlstatemachine.pro
new file mode 100644
index 0000000000..002af1d707
--- /dev/null
+++ b/tests/auto/qml/qqmlstatemachine/qqmlstatemachine.pro
@@ -0,0 +1,11 @@
+CONFIG += testcase
+TARGET = tst_qqmlstatemachine
+osx:CONFIG -= app_bundle
+
+SOURCES += tst_qqmlstatemachine.cpp
+
+include (../../shared/util.pri)
+
+CONFIG += parallel_test
+QT += core-private gui-private qml-private quick-private gui testlib
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qqmlstatemachine/tst_qqmlstatemachine.cpp b/tests/auto/qml/qqmlstatemachine/tst_qqmlstatemachine.cpp
new file mode 100644
index 0000000000..0d36b66e3f
--- /dev/null
+++ b/tests/auto/qml/qqmlstatemachine/tst_qqmlstatemachine.cpp
@@ -0,0 +1,118 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Ford Motor Company
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QQmlComponent>
+#include <QQmlContext>
+#include <QQmlEngine>
+#include <QTest>
+#include "../../shared/util.h"
+
+class tst_qqmlstatemachine : public QQmlDataTest
+{
+    Q_OBJECT
+public:
+    tst_qqmlstatemachine();
+
+private slots:
+    void tst_cppObjectSignal();
+};
+
+
+class CppObject : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(ObjectState objectState READ objectState WRITE setObjectState NOTIFY objectStateChanged)
+    Q_ENUMS(ObjectState)
+public:
+    enum ObjectState {
+        State0,
+        State1,
+        State2
+    };
+
+public:
+    CppObject()
+        : QObject()
+        , m_objectState(State0)
+    {}
+
+    ObjectState objectState() const { return m_objectState; }
+    void setObjectState(ObjectState objectState) { m_objectState = objectState; emit objectStateChanged();}
+
+signals:
+    void objectStateChanged();
+    void mySignal(int signalState);
+
+private:
+    ObjectState m_objectState;
+};
+
+tst_qqmlstatemachine::tst_qqmlstatemachine()
+{
+    QVERIFY(-1 != qmlRegisterUncreatableType<CppObject>("CppObjectEnum", 1, 0, "CppObject", QString()));
+}
+
+void tst_qqmlstatemachine::tst_cppObjectSignal()
+{
+    CppObject cppObject;
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("cppsignal.qml"));
+    QVERIFY(!component.isError());
+
+    QQmlContext *ctxt = engine.rootContext();
+    ctxt->setContextProperty("_cppObject", &cppObject);
+    QScopedPointer<QObject> rootObject(component.create());
+    QVERIFY(rootObject != 0);
+
+    // wait for state machine to start
+    QTRY_VERIFY(rootObject->property("running").toBool());
+
+    // emit signal from cpp
+    emit cppObject.mySignal(CppObject::State1);
+
+    // check if the signal was propagated
+    QTRY_COMPARE(cppObject.objectState(), CppObject::State1);
+
+    // emit signal from cpp
+    emit cppObject.mySignal(CppObject::State2);
+
+    // check if the signal was propagated
+    QTRY_COMPARE(cppObject.objectState(), CppObject::State2);
+
+    // wait for state machine to finish
+    QTRY_VERIFY(!rootObject->property("running").toBool());
+}
+
+
+QTEST_MAIN(tst_qqmlstatemachine)
+
+#include "tst_qqmlstatemachine.moc"