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

Removed dependencies.yaml because we don't use it yet in wip/cmake.
Fixed conflict in qmlcachegen.cpp.

Change-Id: Ie1060c737bee1daa85779903598e5b6d5020d922

2 files changed, 4 insertions, 3 deletions

diff --git a/tests/auto/qml/qqmlvaluetypeproviders/data/userType.qml b/tests/auto/qml/qqmlvaluetypeproviders/data/userType.qml
index d2f748c4c4..2aa03ed39f 100644
--- a/tests/auto/qml/qqmlvaluetypeproviders/data/userType.qml
+++ b/tests/auto/qml/qqmlvaluetypeproviders/data/userType.qml
@@ -2,6 +2,7 @@ import QtQuick 2.0
 import Test 1.0
 
 Item {
+    required property TestValueExporter testValueExporter
     property bool success: false
 
     // Test user value type stored as both var and variant
diff --git a/tests/auto/qml/qqmlvaluetypeproviders/tst_qqmlvaluetypeproviders.cpp b/tests/auto/qml/qqmlvaluetypeproviders/tst_qqmlvaluetypeproviders.cpp
index 22074602b7..b44889798c 100644
--- a/tests/auto/qml/qqmlvaluetypeproviders/tst_qqmlvaluetypeproviders.cpp
+++ b/tests/auto/qml/qqmlvaluetypeproviders/tst_qqmlvaluetypeproviders.cpp
@@ -256,6 +256,7 @@ class TestValueExporter : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(TestValue testValue READ testValue WRITE setTestValue)
+    QML_NAMED_ELEMENT(TestValueExporter)
 public:
     TestValue testValue() const { return m_testValue; }
     void setTestValue(const TestValue &v) { m_testValue = v; }
@@ -275,15 +276,14 @@ void tst_qqmlvaluetypeproviders::userType()
 
     qRegisterMetaType<TestValue>();
     QMetaType::registerComparators<TestValue>();
-    qmlRegisterType<TestValueExporter>("Test", 1, 0, "TestValueExporter");
+    qmlRegisterTypesAndRevisions<TestValueExporter>("Test", 1);
 
     TestValueExporter exporter;
 
     QQmlEngine e;
-    e.rootContext()->setContextProperty("testValueExporter", &exporter);
 
     QQmlComponent component(&e, testFileUrl("userType.qml"));
-    QScopedPointer<QObject> obj(component.create());
+    QScopedPointer<QObject> obj(component.createWithInitialProperties({{"testValueExporter", QVariant::fromValue(&exporter)}}));
     QVERIFY(obj != nullptr);
     QCOMPARE(obj->property("success").toBool(), true);
 }