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

Change-Id: Iea0bb0788357bc615d0e9ea411087114b8b3b720

29 files changed, 639 insertions, 9 deletions

diff --git a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp
index f7748b2da9..daeb9b5455 100644
--- a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp
+++ b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp
@@ -28,6 +28,7 @@
 
 #include "../../shared/util.h"
 #include <QQmlApplicationEngine>
+#include <QScopedPointer>
 #include <QSignalSpy>
 #if QT_CONFIG(process)
 #include <QProcess>
@@ -47,6 +48,7 @@ private slots:
     void testNonResolvedPath();
     void application();
     void applicationProperties();
+    void removeObjectsWhenDestroyed();
 private:
     QString buildDir;
     QString srcDir;
@@ -201,6 +203,23 @@ void tst_qqmlapplicationengine::applicationProperties()
     delete test;
 }
 
+void tst_qqmlapplicationengine::removeObjectsWhenDestroyed()
+{
+    QScopedPointer<QQmlApplicationEngine> test(new QQmlApplicationEngine);
+    QVERIFY(test->rootObjects().isEmpty());
+
+    QSignalSpy objectCreated(test.data(), SIGNAL(objectCreated(QObject*,QUrl)));
+    test->load(testFileUrl("basicTest.qml"));
+    QCOMPARE(objectCreated.count(), 1);
+
+    QSignalSpy objectDestroyed(test->rootObjects().first(), SIGNAL(destroyed()));
+    test->rootObjects().first()->deleteLater();
+    objectDestroyed.wait();
+    QCOMPARE(objectDestroyed.count(), 1);
+    QCOMPARE(test->rootObjects().size(), 0);
+}
+
+
 QTEST_MAIN(tst_qqmlapplicationengine)
 
 #include "tst_qqmlapplicationengine.moc"
diff --git a/tests/auto/qml/qqmlbinding/data/bindingOverwriting.qml b/tests/auto/qml/qqmlbinding/data/bindingOverwriting.qml
new file mode 100644
index 0000000000..767ca0c719
--- /dev/null
+++ b/tests/auto/qml/qqmlbinding/data/bindingOverwriting.qml
@@ -0,0 +1,13 @@
+import QtQuick 2.9
+
+Text {
+    visible: text && enabled
+    enabled: font.pixelSize === 25
+    font: enabled ? Qt.font({ "pixelSize": 25 }) : Qt.font({ "pixelSize": 50 })
+
+    Component.onCompleted: {
+        enabled = Qt.binding(function() { return visible; }); // replacement binding, not breaking
+        visible = true; // breaks visible binding
+        font.bold = true; // breaks font binding
+    }
+}
diff --git a/tests/auto/qml/qqmlbinding/tst_qqmlbinding.cpp b/tests/auto/qml/qqmlbinding/tst_qqmlbinding.cpp
index 6f1d82eca5..4b485d2ce8 100644
--- a/tests/auto/qml/qqmlbinding/tst_qqmlbinding.cpp
+++ b/tests/auto/qml/qqmlbinding/tst_qqmlbinding.cpp
@@ -50,6 +50,7 @@ private slots:
     void disabledOnUnknownProperty();
     void disabledOnReadonlyProperty();
     void delayed();
+    void bindingOverwriting();
 
 private:
     QQmlEngine engine;
@@ -303,6 +304,21 @@ void tst_qqmlbinding::delayed()
     delete item;
 }
 
+void tst_qqmlbinding::bindingOverwriting()
+{
+    QQmlTestMessageHandler messageHandler;
+    QLoggingCategory::setFilterRules(QStringLiteral("qt.qml.binding.removal.info=true"));
+
+    QQmlEngine engine;
+    QQmlComponent c(&engine, testFileUrl("bindingOverwriting.qml"));
+    QQuickItem *item = qobject_cast<QQuickItem*>(c.create());
+    QVERIFY(item);
+    delete item;
+
+    QLoggingCategory::setFilterRules(QString());
+    QCOMPARE(messageHandler.messages().count(), 2);
+}
+
 QTEST_MAIN(tst_qqmlbinding)
 
 #include "tst_qqmlbinding.moc"
diff --git a/tests/auto/qml/qqmlecmascript/data/qtbug_59012.qml b/tests/auto/qml/qqmlecmascript/data/qtbug_59012.qml
new file mode 100644
index 0000000000..5283614435
--- /dev/null
+++ b/tests/auto/qml/qqmlecmascript/data/qtbug_59012.qml
@@ -0,0 +1,14 @@
+import QtQuick 2.0
+
+QtObject {
+    Component.onCompleted: {
+        var pieces = [[4,21],[6,22],[8,23],[12,24],[10,25],[8,26],[6,27],[4,28],[2,31],[2,32],[2,33],[2,35],[2,36],[2,37],[2,38],[2,54]]
+        var i = pieces.length;
+        var king = 10
+        var val
+        do {
+            var p = pieces[--i];
+            val = p[0]
+        } while (val !== king);
+    }
+}
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index 6c9cb331a2..07ae9821e9 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -340,6 +340,7 @@ private slots:
     void constkw();
     void redefineGlobalProp();
     void freeze_empty_object();
+    void singleBlockLoops();
 
 private:
 //    static void propertyVarWeakRefCallback(v8::Persistent<v8::Value> object, void* parameter);
@@ -4033,7 +4034,7 @@ void tst_qqmlecmascript::verifyContextLifetime(QQmlContextData *ctxt) {
         QV4::ExecutionEngine *v4 = QV8Engine::getV4(engine);
         QV4::Scope scope(v4);
         QV4::ScopedArrayObject scripts(scope, ctxt->importedScripts.value());
-        QV4::Scoped<QV4::QmlContextWrapper> qml(scope);
+        QV4::Scoped<QV4::QQmlContextWrapper> qml(scope);
         for (quint32 i = 0; i < scripts->getLength(); ++i) {
             QQmlContextData *scriptContext, *newContext;
             qml = scripts->getIndexed(i);
@@ -8348,6 +8349,14 @@ void tst_qqmlecmascript::freeze_empty_object()
     QCOMPARE(v.toBool(), true);
 }
 
+void tst_qqmlecmascript::singleBlockLoops()
+{
+    QQmlComponent component(&engine, testFileUrl("qtbug_59012.qml"));
+
+    QScopedPointer<QObject> obj(component.create());
+    QVERIFY(obj != 0);
+    QVERIFY(!component.isError());
+}
 
 QTEST_MAIN(tst_qqmlecmascript)
 
diff --git a/tests/auto/qml/qqmllanguage/data/cppnamespace.qml b/tests/auto/qml/qqmllanguage/data/cppnamespace.qml
index efedf2b14a..48f7eb6715 100644
--- a/tests/auto/qml/qqmllanguage/data/cppnamespace.qml
+++ b/tests/auto/qml/qqmllanguage/data/cppnamespace.qml
@@ -2,4 +2,5 @@ import Test 1.0
 
 MyNamespacedType {
     myEnum: MyNamespace.Key5
+    property int intProperty: MyNamespace.MyOtherNSEnum.OtherKey2
 }
diff --git a/tests/auto/qml/qqmllanguage/data/registeredCompositeTypeWithEnum.qml b/tests/auto/qml/qqmllanguage/data/registeredCompositeTypeWithEnum.qml
index 5f8c11e5f6..b6a07693f2 100644
--- a/tests/auto/qml/qqmllanguage/data/registeredCompositeTypeWithEnum.qml
+++ b/tests/auto/qml/qqmllanguage/data/registeredCompositeTypeWithEnum.qml
@@ -3,4 +3,5 @@ import Test 1.0
 RegisteredCompositeTypeWithEnum {
     property int enumValue0: RegisteredCompositeTypeWithEnum.EnumValue0
     property int enumValue42: RegisteredCompositeTypeWithEnum.EnumValue42
+    property int enumValue15: RegisteredCompositeTypeWithEnum.ScopedCompositeEnum.EnumValue15
 }
diff --git a/tests/auto/qml/qqmllanguage/data/scopedEnum.qml b/tests/auto/qml/qqmllanguage/data/scopedEnum.qml
new file mode 100644
index 0000000000..7f4177af76
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/scopedEnum.qml
@@ -0,0 +1,21 @@
+import QtQuick 2.0
+import Test 1.0
+
+MyTypeObject {
+    id: obj
+    scopedEnum: MyTypeObject.MyScopedEnum.ScopedVal1
+    intProperty: MyTypeObject.MyScopedEnum.ScopedVal2
+    property int listValue: myModel.get(0).myData
+    property int noScope: MyTypeObject.ScopedVal1
+
+    function assignNewValue() {
+        scopedEnum = MyTypeObject.MyScopedEnum.ScopedVal2
+        noScope = MyTypeObject.ScopedVal2
+    }
+
+    property ListModel myModel: ListModel {
+        ListElement {
+            myData: MyTypeObject.MyScopedEnum.ScopedVal3
+        }
+    }
+}
diff --git a/tests/auto/qml/qqmllanguage/data/scopedEnumList.errors.txt b/tests/auto/qml/qqmllanguage/data/scopedEnumList.errors.txt
new file mode 100644
index 0000000000..67576dfd8d
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/scopedEnumList.errors.txt
@@ -0,0 +1 @@
+7:13:ListElement: cannot use script for property value
diff --git a/tests/auto/qml/qqmllanguage/data/scopedEnumList.qml b/tests/auto/qml/qqmllanguage/data/scopedEnumList.qml
new file mode 100644
index 0000000000..8655139683
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/scopedEnumList.qml
@@ -0,0 +1,10 @@
+import QtQuick 2.0
+import Test 1.0
+
+MyTypeObject {
+    property ListModel myModel: ListModel {
+        ListElement {
+            myData: MyTypeObject.MyScopedEnum
+        }
+    }
+}
diff --git a/tests/auto/qml/qqmllanguage/testtypes.h b/tests/auto/qml/qqmllanguage/testtypes.h
index 7d7a8ac6d3..e4a76b4324 100644
--- a/tests/auto/qml/qqmllanguage/testtypes.h
+++ b/tests/auto/qml/qqmllanguage/testtypes.h
@@ -223,6 +223,7 @@ class MyTypeObject : public QObject
     Q_PROPERTY(Qt::TextFormat qtEnumProperty READ qtEnumProperty WRITE setQtEnumProperty NOTIFY qtEnumPropertyChanged)
     Q_PROPERTY(MyMirroredEnum mirroredEnumProperty READ mirroredEnumProperty WRITE setMirroredEnumProperty NOTIFY mirroredEnumPropertyChanged)
     Q_PROPERTY(MyEnumContainer::RelatedEnum relatedEnumProperty READ relatedEnumProperty WRITE setRelatedEnumProperty)
+    Q_PROPERTY(MyScopedEnum scopedEnum READ scopedEnum WRITE setScopedEnum)
     Q_PROPERTY(QString stringProperty READ stringProperty WRITE setStringProperty NOTIFY stringPropertyChanged)
     Q_PROPERTY(QByteArray byteArrayProperty READ byteArrayProperty WRITE setByteArrayProperty NOTIFY byteArrayPropertyChanged)
     Q_PROPERTY(uint uintProperty READ uintProperty WRITE setUintProperty NOTIFY uintPropertyChanged)
@@ -339,6 +340,14 @@ public:
         relatedEnumPropertyValue = v;
     }
 
+    enum class MyScopedEnum : int { ScopedVal1, ScopedVal2, ScopedVal3 };
+    Q_ENUM(MyScopedEnum)
+    MyScopedEnum scopedEnumPropertyValue;
+    MyScopedEnum scopedEnum() const { return scopedEnumPropertyValue; }
+    void setScopedEnum(MyScopedEnum v) {
+        scopedEnumPropertyValue = v;
+    }
+
     QString stringPropertyValue;
     QString stringProperty() const {
        return stringPropertyValue;
@@ -738,6 +747,13 @@ namespace MyNamespace {
     };
     Q_ENUM_NS(MyNSEnum);
 
+    enum class MyOtherNSEnum {
+        OtherKey1 = 1,
+        OtherKey2
+    };
+    Q_ENUM_NS(MyOtherNSEnum);
+
+
     class MyNamespacedType : public QObject
     {
         Q_OBJECT
@@ -1171,9 +1187,11 @@ class MyCompositeBaseType : public QObject
 {
     Q_OBJECT
     Q_ENUMS(CompositeEnum)
+    Q_ENUMS(ScopedCompositeEnum)
 
 public:
     enum CompositeEnum { EnumValue0, EnumValue42 = 42 };
+    enum class ScopedCompositeEnum : int { EnumValue15 = 15 };
     static QObject *qmlAttachedProperties(QObject *parent) { return new QObject(parent); }
 };
 
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index e67fa18309..cc5b8cacbc 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -208,6 +208,7 @@ private slots:
     void lowercaseEnumRuntime();
     void lowercaseEnumCompileTime_data();
     void lowercaseEnumCompileTime();
+    void scopedEnum();
     void literals_data();
     void literals();
 
@@ -541,6 +542,8 @@ void tst_qqmllanguage::errors_data()
     QTest::newRow("singularProperty") << "singularProperty.qml" << "singularProperty.errors.txt" << false;
     QTest::newRow("singularProperty.2") << "singularProperty.2.qml" << "singularProperty.2.errors.txt" << false;
 
+    QTest::newRow("scopedEnumList") << "scopedEnumList.qml" << "scopedEnumList.errors.txt" << false;
+
     const QString expectedError = isCaseSensitiveFileSystem(dataDirectory()) ?
         QStringLiteral("incorrectCase.errors.sensitive.txt") :
         QStringLiteral("incorrectCase.errors.insensitive.txt");
@@ -1601,6 +1604,9 @@ void tst_qqmllanguage::cppnamespace()
         VERIFY_ERRORS(0);
         QObject *object = component.create();
         QVERIFY(object != 0);
+
+        QCOMPARE(object->property("intProperty").toInt(), (int)MyNamespace::MyOtherNSEnum::OtherKey2);
+
         delete object;
     }
 
@@ -3064,7 +3070,7 @@ void tst_qqmllanguage::qmlAttachedPropertiesObjectMethod()
     QObject object;
 
     QCOMPARE(qmlAttachedPropertiesObject<MyQmlObject>(&object, false), (QObject *)0);
-    QCOMPARE(qmlAttachedPropertiesObject<MyQmlObject>(&object, true), (QObject *)0);
+    QVERIFY(qmlAttachedPropertiesObject<MyQmlObject>(&object, true));
 
     {
         QQmlComponent component(&engine, testFileUrl("qmlAttachedPropertiesObjectMethod.1.qml"));
@@ -3501,6 +3507,7 @@ void tst_qqmllanguage::registeredCompositeTypeWithEnum()
 
     QCOMPARE(o->property("enumValue0").toInt(), static_cast<int>(MyCompositeBaseType::EnumValue0));
     QCOMPARE(o->property("enumValue42").toInt(), static_cast<int>(MyCompositeBaseType::EnumValue42));
+    QCOMPARE(o->property("enumValue15").toInt(), static_cast<int>(MyCompositeBaseType::ScopedCompositeEnum::EnumValue15));
 
     delete o;
 }
@@ -3681,6 +3688,23 @@ void tst_qqmllanguage::lowercaseEnumCompileTime()
     VERIFY_ERRORS(qPrintable(errorFile));
 }
 
+void tst_qqmllanguage::scopedEnum()
+{
+    QQmlComponent component(&engine, testFileUrl("scopedEnum.qml"));
+
+    MyTypeObject *o = qobject_cast<MyTypeObject *>(component.create());
+    QVERIFY(o != 0);
+
+    QCOMPARE(o->scopedEnum(), MyTypeObject::MyScopedEnum::ScopedVal1);
+    QCOMPARE(o->intProperty(), (int)MyTypeObject::MyScopedEnum::ScopedVal2);
+    QCOMPARE(o->property("listValue").toInt(), (int)MyTypeObject::MyScopedEnum::ScopedVal3);
+    QCOMPARE(o->property("noScope").toInt(), (int)MyTypeObject::MyScopedEnum::ScopedVal1);
+
+    QMetaObject::invokeMethod(o, "assignNewValue");
+    QCOMPARE(o->scopedEnum(), MyTypeObject::MyScopedEnum::ScopedVal2);
+    QCOMPARE(o->property("noScope").toInt(), (int)MyTypeObject::MyScopedEnum::ScopedVal2);
+}
+
 void tst_qqmllanguage::literals_data()
 {
     QTest::addColumn<QString>("property");
diff --git a/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp b/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp
index 555ca5713e..e442dd1421 100644
--- a/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp
+++ b/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp
@@ -1204,8 +1204,8 @@ void tst_qqmllistmodel::role_mode_data()
     QTest::newRow("default1") << "{append({'a':1});dynamicRoles}" << 0 << "";
 
     QTest::newRow("enableDynamic0") << "{dynamicRoles=true;dynamicRoles}" << 1 << "";
-    QTest::newRow("enableDynamic1") << "{append({'a':1});dynamicRoles=true;dynamicRoles}" << 0 << "<Unknown File>: QML ListModel: unable to enable dynamic roles as this model is not empty!";
-    QTest::newRow("enableDynamic2") << "{dynamicRoles=true;append({'a':1});dynamicRoles=false;dynamicRoles}" << 1 << "<Unknown File>: QML ListModel: unable to enable static roles as this model is not empty!";
+    QTest::newRow("enableDynamic1") << "{append({'a':1});dynamicRoles=true;dynamicRoles}" << 0 << "<Unknown File>: QML ListModel: unable to enable dynamic roles as this model is not empty";
+    QTest::newRow("enableDynamic2") << "{dynamicRoles=true;append({'a':1});dynamicRoles=false;dynamicRoles}" << 1 << "<Unknown File>: QML ListModel: unable to enable static roles as this model is not empty";
 }
 
 void tst_qqmllistmodel::role_mode()
diff --git a/tests/auto/qmltest/listview/BLACKLIST b/tests/auto/qmltest/listview/BLACKLIST
index 083e2f8978..ffb4f94e2c 100644
--- a/tests/auto/qmltest/listview/BLACKLIST
+++ b/tests/auto/qmltest/listview/BLACKLIST
@@ -1,4 +1,4 @@
 # Blacklist for testing
 [ListView::test_listInteractiveCurrentIndexEnforce]
 linux
-macos-10.12
+osx-10.12
diff --git a/tests/auto/qmltest/selftests/BLACKLIST b/tests/auto/qmltest/selftests/BLACKLIST
index 9cb2313810..ffce42e4c0 100644
--- a/tests/auto/qmltest/selftests/BLACKLIST
+++ b/tests/auto/qmltest/selftests/BLACKLIST
@@ -6,3 +6,8 @@
 # QTBUG-53793: seems to be failing on Linux a little too often...
 [tst_grabImage::test_equals]
 linux
+[tst_grabImage::test_sizeProps]
+linux
+[tst_grabImage::test_save]
+linux
+
diff --git a/tests/auto/qmltest/selftests/tst_grabImage.qml b/tests/auto/qmltest/selftests/tst_grabImage.qml
index 954daaba42..7ce7e93a07 100644
--- a/tests/auto/qmltest/selftests/tst_grabImage.qml
+++ b/tests/auto/qmltest/selftests/tst_grabImage.qml
@@ -1,5 +1,6 @@
 /****************************************************************************
 **
+** Copyright (C) 2017 Crimson AS <info@crimson.no>
 ** Copyright (C) 2016 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
@@ -45,9 +46,66 @@ TestCase {
         oldImage = grabImage(rect);
         // Don't change anything...
         newImage = grabImage(rect);
-        verify(newImage.equals(oldImage));
+        try {
+            compare(newImage.size, oldImage.size);
+            verify(newImage.equals(oldImage));
+        } catch (ex) {
+            oldImage.save("tst_grabImage_test_equals_oldImage.png")
+            newImage.save("tst_grabImage_test_equals_newImage.png")
+            throw ex;
+        }
 
         verify(!newImage.equals(null));
         verify(!newImage.equals(undefined));
     }
+
+    function test_sizeProps() {
+        var rect = createTemporaryQmlObject("import QtQuick 2.0; Rectangle { color: 'red'; width: 10; height: 20; }", testCase);
+        var image = grabImage(rect);
+
+        try {
+            compare(image.width, 10)
+            compare(image.height, 20)
+            compare(image.size, Qt.size(10, 20))
+        } catch (ex) {
+            image.save("tst_grabImage_test_sizeProps.png")
+            throw ex;
+        }
+    }
+
+    function test_save() {
+        var rect = createTemporaryQmlObject("import QtQuick 2.0; Rectangle { color: 'red'; width: 10; height: 20; }", testCase);
+        var grabbedImage = grabImage(rect);
+        grabbedImage.save("tst_grabImage_test_save.png")
+
+        // Now try to load it
+        var url = Qt.resolvedUrl("tst_grabImage_test_save.png")
+        var image = createTemporaryQmlObject("import QtQuick 2.0; Image { source: \"" + url + "\" }", testCase);
+        tryCompare(image, "status", Image.Ready)
+        var grabbedImage2 = grabImage(image);
+
+        try {
+            verify(grabbedImage2.equals(grabbedImage))
+        } catch (ex) {
+            grabbedImage2.save("tst_grabImage_test_save2.png")
+            throw ex;
+        }
+    }
+
+    function test_saveThrowsWhenFailing() {
+        var rect = createTemporaryQmlObject("import QtQuick 2.0; Rectangle { color: 'red'; width: 10; height: 20; }", testCase);
+        var grabbedImage = grabImage(rect);
+        var didThrow = false;
+
+        try {
+            // Format doesn't exist, so this will throw
+            grabbedImage.save("tst_grabImage_test_saveThrowsWhenFailing.never-gonna-give-you-up");
+        } catch (ex) {
+            didThrow = true;
+        }
+
+        if (!didThrow) {
+            fail("save() should have thrown, but didn't!")
+        }
+    }
 }
diff --git a/tests/auto/qmltest/textedit/BLACKLIST b/tests/auto/qmltest/textedit/BLACKLIST
index 08a86c1b89..e06cba3e8f 100644
--- a/tests/auto/qmltest/textedit/BLACKLIST
+++ b/tests/auto/qmltest/textedit/BLACKLIST
@@ -1,6 +1,6 @@
 # Blacklist for testing
 [TextEdit::test_textentry]
-macos-10.12
+osx-10.12
 [TextEdit::test_textentry_char]
-macos-10.12
+osx-10.12
 
diff --git a/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp b/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp
index 26b687a4a6..0a3796402a 100644
--- a/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp
+++ b/tests/auto/quick/qquickscreen/tst_qquickscreen.cpp
@@ -113,6 +113,9 @@ void tst_qquickscreen::fullScreenList()
         QQuickScreenInfo *info = qobject_cast<QQuickScreenInfo *>(screensArray.property(i).toQObject());
         QVERIFY(info != nullptr);
         QCOMPARE(screenList[i]->name(), info->name());
+        QCOMPARE(screenList[i]->manufacturer(), info->manufacturer());
+        QCOMPARE(screenList[i]->model(), info->model());
+        QCOMPARE(screenList[i]->serialNumber(), info->serialNumber());
         QCOMPARE(screenList[i]->size().width(), info->width());
         QCOMPARE(screenList[i]->size().height(), info->height());
         QCOMPARE(screenList[i]->availableVirtualGeometry().width(), info->desktopAvailableWidth());
diff --git a/tests/auto/quick/qquicktextinput/BLACKLIST b/tests/auto/quick/qquicktextinput/BLACKLIST
new file mode 100644
index 0000000000..e9f4f11c58
--- /dev/null
+++ b/tests/auto/quick/qquicktextinput/BLACKLIST
@@ -0,0 +1,3 @@
+# QTBUG-41895
+[tripleClickSelectsAll]
+windows
diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index 9b1657e2a2..ebc2e32b79 100644
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -86,7 +86,8 @@ QUICKTESTS =  \
     qquickdesignersupport \
     qquickscreen \
     touchmouse \
-    scenegraph
+    scenegraph \
+    sharedimage
 
 SUBDIRS += $$PUBLICTESTS
 
diff --git a/tests/auto/quick/sharedimage/data/yellow.png b/tests/auto/quick/sharedimage/data/yellow.png
new file mode 100644
index 0000000000..51e8aaf38c
--- /dev/null
+++ b/tests/auto/quick/sharedimage/data/yellow.png
diff --git a/tests/auto/quick/sharedimage/sharedimage.pro b/tests/auto/quick/sharedimage/sharedimage.pro
new file mode 100644
index 0000000000..00ec2c1131
--- /dev/null
+++ b/tests/auto/quick/sharedimage/sharedimage.pro
@@ -0,0 +1,12 @@
+CONFIG += testcase
+TARGET = tst_sharedimage
+CONFIG -= app_bundle
+
+SOURCES += tst_sharedimage.cpp
+
+QT += testlib quick-private
+
+TESTDATA = data/*
+
+OTHER_FILES += \
+    data/yellow.png
diff --git a/tests/auto/quick/sharedimage/tst_sharedimage.cpp b/tests/auto/quick/sharedimage/tst_sharedimage.cpp
new file mode 100644
index 0000000000..b91fc8a0de
--- /dev/null
+++ b/tests/auto/quick/sharedimage/tst_sharedimage.cpp
@@ -0,0 +1,103 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest>
+#include <private/qquickimage_p.h>
+#include <QQmlApplicationEngine>
+
+class tst_sharedimage : public QObject
+{
+    Q_OBJECT
+public:
+    tst_sharedimage()
+    {
+    }
+
+private slots:
+    void initTestCase();
+    void compareToPlainLoad_data();
+    void compareToPlainLoad();
+};
+
+void tst_sharedimage::initTestCase()
+{
+#if !QT_CONFIG(systemsemaphore)
+    QSKIP("Shared image not supported");
+#endif
+}
+
+void tst_sharedimage::compareToPlainLoad_data()
+{
+    QString imagePath = QFINDTESTDATA("data/yellow.png");
+    if (imagePath.startsWith(QLatin1Char('/')))
+        imagePath.remove(0, 1);
+    QString plainImage("Image { source: \"file:///%1\"; cache: false; %2 }");
+    QString sharedImage("Image { source: \"image://shared/%1\"; cache: false; %2 }");
+    QString script("import QtQuick 2.0\nimport Qt.labs.sharedimage 1.0\n%1\n");
+
+    QString plain = script.arg(plainImage).arg(imagePath);
+    QString shared = script.arg(sharedImage).arg(imagePath);
+
+    QTest::addColumn<QByteArray>("plainScript");
+    QTest::addColumn<QByteArray>("sharedScript");
+
+    QString opts = QStringLiteral("asynchronous: false;");
+    QTest::newRow("sync") << plain.arg(opts).toLatin1() << shared.arg(opts).toLatin1();
+
+    opts = QStringLiteral("asynchronous: true");
+    QTest::newRow("async") << plain.arg(opts).toLatin1() << shared.arg(opts).toLatin1();
+
+    opts = QStringLiteral("sourceSize: Qt.size(50, 50)");
+    QTest::newRow("scaled, stretch") << plain.arg(opts).toLatin1() << shared.arg(opts).toLatin1();
+
+    opts = QStringLiteral("sourceSize: Qt.size(50, 50); fillMode: Image.PreserveAspectFit");
+    QTest::newRow("scaled, aspectfit") << plain.arg(opts).toLatin1() << shared.arg(opts).toLatin1();
+}
+
+void tst_sharedimage::compareToPlainLoad()
+{
+    QFETCH(QByteArray, plainScript);
+    QFETCH(QByteArray, sharedScript);
+
+    QImage images[2];
+    for (int i = 0; i < 2; i++) {
+        QQmlApplicationEngine engine;
+        engine.loadData(i ? sharedScript : plainScript);
+        QVERIFY(engine.rootObjects().size());
+        QQuickImage *obj = qobject_cast<QQuickImage*>(engine.rootObjects().at(0));
+        QVERIFY(obj != 0);
+        QTRY_VERIFY(!obj->image().isNull());
+        images[i] = obj->image();
+    }
+
+    QCOMPARE(images[1], images[0].convertToFormat(images[1].format()));
+}
+
+QTEST_MAIN(tst_sharedimage)
+
+#include "tst_sharedimage.moc"
diff --git a/tests/manual/scenegraph_lancelot/data/text/text_advance_bidi_ltr.qml b/tests/manual/scenegraph_lancelot/data/text/text_advance_bidi_ltr.qml
new file mode 100644
index 0000000000..2f40aece89
--- /dev/null
+++ b/tests/manual/scenegraph_lancelot/data/text/text_advance_bidi_ltr.qml
@@ -0,0 +1,56 @@
+import QtQuick 2.0
+
+Item {
+    width: 320
+    height: 480
+
+    property string firstWord: "One, שתיים, "
+    property string secondWord: "Three"
+
+    Text {
+        id: referenceText
+        text: firstWord + secondWord
+        anchors.centerIn: parent
+        font.italic: true
+        font.pixelSize: 30
+    }
+
+    Text {
+        id: firstWordItem
+        anchors.left: referenceText.left
+        anchors.top: referenceText.bottom
+        text: firstWord
+        font: referenceText.font
+    }
+
+    Text {
+        id: secondWordItem
+        anchors.left: firstWordItem.left
+        anchors.leftMargin: firstWordItem.advance.width
+        anchors.baseline: firstWordItem.baseline
+        anchors.baselineOffset: firstWordItem.advance.height
+        text: secondWord
+        font: referenceText.font
+    }
+
+    Text {
+        id: firstWordItemRichText
+        anchors.left: referenceText.left
+        anchors.top: secondWordItem.bottom
+        text: firstWord
+        font: referenceText.font
+        textFormat: Text.RichText
+    }
+
+    Text {
+        id: secondWordItemRichText
+        anchors.left: firstWordItemRichText.left
+        anchors.leftMargin: firstWordItemRichText.advance.width
+        anchors.baseline: firstWordItemRichText.baseline
+        anchors.baselineOffset: firstWordItemRichText.advance.height
+        text: secondWord
+        font: referenceText.font
+        textFormat: Text.RichText
+    }
+
+}
diff --git a/tests/manual/scenegraph_lancelot/data/text/text_advance_hebrew.qml b/tests/manual/scenegraph_lancelot/data/text/text_advance_hebrew.qml
new file mode 100644
index 0000000000..0a9dce4d82
--- /dev/null
+++ b/tests/manual/scenegraph_lancelot/data/text/text_advance_hebrew.qml
@@ -0,0 +1,54 @@
+import QtQuick 2.0
+
+Item {
+    width: 320
+    height: 480
+
+    property string firstWord: "תורת רב־לשוני אנא "
+    property string secondWord: "של"
+
+    Text {
+        id: referenceText
+        text: firstWord + secondWord
+        anchors.centerIn: parent
+        font.italic: true
+        font.pixelSize: 30
+    }
+
+    Text {
+        id: firstWordItem
+        anchors.right: referenceText.right
+        anchors.top: referenceText.bottom
+        text: firstWord
+        font: referenceText.font
+    }
+
+    Text {
+        id: secondWordItem
+        anchors.right: firstWordItem.left
+        anchors.baseline: firstWordItem.baseline
+        anchors.baselineOffset: firstWordItem.advance.height
+        text: secondWord
+        font: referenceText.font
+    }
+
+    Text {
+        id: firstWordItemRichText
+        anchors.right: referenceText.right
+        anchors.top: secondWordItem.bottom
+        text: firstWord
+        font: referenceText.font
+        textFormat: Text.RichText
+    }
+
+    Text {
+        id: secondWordItemRichText
+        anchors.right: firstWordItemRichText.left
+        anchors.baseline: firstWordItemRichText.baseline
+        anchors.baselineOffset: firstWordItemRichText.advance.height
+        text: secondWord
+        font: referenceText.font
+        textFormat: Text.RichText
+    }
+
+}
diff --git a/tests/manual/scenegraph_lancelot/data/text/text_advance_latin.qml b/tests/manual/scenegraph_lancelot/data/text/text_advance_latin.qml
new file mode 100644
index 0000000000..ccab5d8c64
--- /dev/null
+++ b/tests/manual/scenegraph_lancelot/data/text/text_advance_latin.qml
@@ -0,0 +1,55 @@
+import QtQuick 2.0
+
+Item {
+    width: 320
+    height: 480
+
+    property string firstWord: "Hello "
+    property string secondWord: "World"
+
+    Text {
+        id: referenceText
+        text: firstWord + secondWord
+        anchors.centerIn: parent
+        font.italic: true
+        font.pixelSize: 30
+    }
+
+    Text {
+        id: firstWordItem
+        anchors.left: referenceText.left
+        anchors.top: referenceText.bottom
+        text: firstWord
+        font: referenceText.font
+    }
+
+    Text {
+        id: secondWordItem
+        anchors.left: firstWordItem.left
+        anchors.leftMargin: firstWordItem.advance.width
+        anchors.baseline: firstWordItem.baseline
+        anchors.baselineOffset: firstWordItem.advance.height
+        text: secondWord
+        font: referenceText.font
+    }
+
+    Text {
+        id: firstWordItemRichText
+        anchors.left: referenceText.left
+        anchors.top: secondWordItem.bottom
+        text: firstWord
+        font: referenceText.font
+        textFormat: Text.RichText
+    }
+
+    Text {
+        id: secondWordItemRichText
+        anchors.left: firstWordItemRichText.left
+        anchors.leftMargin: firstWordItemRichText.advance.width
+        anchors.baseline: firstWordItemRichText.baseline
+        anchors.baselineOffset: firstWordItemRichText.advance.height
+        text: secondWord
+        font: referenceText.font
+        textFormat: Text.RichText
+    }
+}
diff --git a/tests/manual/scenegraph_lancelot/data/text/text_advance_multiline.qml b/tests/manual/scenegraph_lancelot/data/text/text_advance_multiline.qml
new file mode 100644
index 0000000000..ae0f10718c
--- /dev/null
+++ b/tests/manual/scenegraph_lancelot/data/text/text_advance_multiline.qml
@@ -0,0 +1,55 @@
+import QtQuick 2.0
+
+Item {
+    width: 320
+    height: 480
+
+    property string firstWord: "One,\nTwo, "
+    property string secondWord: "Three"
+
+    Text {
+        id: referenceText
+        text: firstWord + secondWord
+        anchors.centerIn: parent
+        font.italic: true
+        font.pixelSize: 30
+    }
+
+    Text {
+        id: firstWordItem
+        anchors.left: referenceText.left
+        anchors.top: referenceText.bottom
+        text: firstWord
+        font: referenceText.font
+    }
+
+    Text {
+        id: secondWordItem
+        anchors.left: firstWordItem.left
+        anchors.leftMargin: firstWordItem.advance.width
+        anchors.baseline: firstWordItem.baseline
+        anchors.baselineOffset: firstWordItem.advance.height
+        text: secondWord
+        font: referenceText.font
+    }
+
+    Text {
+        id: firstWordItemRichText
+        anchors.left: referenceText.left
+        anchors.top: secondWordItem.bottom
+        text: firstWord
+        font: referenceText.font
+        textFormat: Text.RichText
+    }
+
+    Text {
+        id: secondWordItemRichText
+        anchors.left: firstWordItemRichText.left
+        anchors.leftMargin: firstWordItemRichText.advance.width
+        anchors.baseline: firstWordItemRichText.baseline
+        anchors.baselineOffset: firstWordItemRichText.advance.height
+        text: secondWord
+        font: referenceText.font
+        textFormat: Text.RichText
+    }
+}
diff --git a/tests/manual/scenegraph_lancelot/data/text/text_advance_multiparagraph.qml b/tests/manual/scenegraph_lancelot/data/text/text_advance_multiparagraph.qml
new file mode 100644
index 0000000000..76f0910680
--- /dev/null
+++ b/tests/manual/scenegraph_lancelot/data/text/text_advance_multiparagraph.qml
@@ -0,0 +1,39 @@
+import QtQuick 2.0
+
+Item {
+    width: 320
+    height: 480
+
+    property string firstWord: "<p>One,</p><p>Two, "
+    property string secondWord: "Three</p>"
+
+    Text {
+        id: referenceText
+        text: firstWord + secondWord
+        anchors.centerIn: parent
+        font.italic: true
+        font.pixelSize: 30
+        textFormat: Text.RichText
+    }
+
+
+    Text {
+        id: firstWordItemRichText
+        anchors.left: referenceText.left
+        anchors.top: referenceText.bottom
+        text: firstWord
+        font: referenceText.font
+        textFormat: Text.RichText
+    }
+
+    Text {
+        id: secondWordItemRichText
+        anchors.left: firstWordItemRichText.left
+        anchors.leftMargin: firstWordItemRichText.advance.width
+        anchors.baseline: firstWordItemRichText.baseline
+        anchors.baselineOffset: firstWordItemRichText.advance.height
+        text: secondWord
+        font: referenceText.font
+        textFormat: Text.RichText
+    }
+}
diff --git a/tests/manual/scenegraph_lancelot/data/text/text_advance_multiparagraph_multifontsizes.qml b/tests/manual/scenegraph_lancelot/data/text/text_advance_multiparagraph_multifontsizes.qml
new file mode 100644
index 0000000000..de33d65cdc
--- /dev/null
+++ b/tests/manual/scenegraph_lancelot/data/text/text_advance_multiparagraph_multifontsizes.qml
@@ -0,0 +1,39 @@
+import QtQuick 2.0
+
+Item {
+    width: 320
+    height: 480
+
+    property string firstWord: "<p style=\"font-size: 40pt\">One,</p><p>Two, "
+    property string secondWord: "Three</p>"
+
+    Text {
+        id: referenceText
+        text: firstWord + secondWord
+        anchors.centerIn: parent
+        font.italic: true
+        font.pixelSize: 30
+        textFormat: Text.RichText
+    }
+
+
+    Text {
+        id: firstWordItemRichText
+        anchors.left: referenceText.left
+        anchors.top: referenceText.bottom
+        text: firstWord
+        font: referenceText.font
+        textFormat: Text.RichText
+    }
+
+    Text {
+        id: secondWordItemRichText
+        anchors.left: firstWordItemRichText.left
+        anchors.leftMargin: firstWordItemRichText.advance.width
+        anchors.baseline: firstWordItemRichText.baseline
+        anchors.baselineOffset: firstWordItemRichText.advance.height
+        text: secondWord
+        font: referenceText.font
+        textFormat: Text.RichText
+    }
+}