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

Change-Id: I905dcd29377bf1b2e0ee086823b54277d18e78dd

4 files changed, 45 insertions, 2 deletions

diff --git a/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp b/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp
index e2c0055ea1..8af446173d 100644
--- a/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp
+++ b/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp
@@ -549,7 +549,6 @@ void tst_qmldiskcache::cacheResources()
 
     {
         CleanlyLoadingComponent component(&engine, QUrl("qrc:/test.qml"));
-        qDebug() << component.errorString();
         QScopedPointer<QObject> obj(component.create());
         QVERIFY(!obj.isNull());
         QCOMPARE(obj->property("value").toInt(), 20);
@@ -558,12 +557,36 @@ void tst_qmldiskcache::cacheResources()
     const QStringList entries = QDir(qmlCacheDirectory).entryList(QDir::NoDotAndDotDot | QDir::Files);
     QCOMPARE(entries.count(), 1);
 
+    QDateTime cacheFileTimeStamp;
+
     {
         QFile cacheFile(qmlCacheDirectory + QLatin1Char('/') + entries.constFirst());
         QVERIFY2(cacheFile.open(QIODevice::ReadOnly), qPrintable(cacheFile.errorString()));
         QV4::CompiledData::Unit unit;
         QVERIFY(cacheFile.read(reinterpret_cast<char *>(&unit), sizeof(unit)) == sizeof(unit));
-        QCOMPARE(qint64(unit.sourceTimeStamp), QFileInfo(QCoreApplication::applicationFilePath()).lastModified().toMSecsSinceEpoch());
+
+        cacheFileTimeStamp = QFileInfo(cacheFile.fileName()).lastModified();
+
+        QDateTime referenceTimeStamp = QFileInfo(":/test.qml").lastModified();
+        if (!referenceTimeStamp.isValid())
+            referenceTimeStamp = QFileInfo(QCoreApplication::applicationFilePath()).lastModified();
+        QCOMPARE(qint64(unit.sourceTimeStamp), referenceTimeStamp.toMSecsSinceEpoch());
+    }
+
+    waitForFileSystem();
+
+    {
+        CleanlyLoadingComponent component(&engine, QUrl("qrc:///test.qml"));
+        QScopedPointer<QObject> obj(component.create());
+        QVERIFY(!obj.isNull());
+        QCOMPARE(obj->property("value").toInt(), 20);
+    }
+
+    {
+        const QStringList entries = QDir(qmlCacheDirectory).entryList(QDir::NoDotAndDotDot | QDir::Files);
+        QCOMPARE(entries.count(), 1);
+
+        QCOMPARE(QFileInfo(qmlCacheDirectory + QLatin1Char('/') + entries.constFirst()).lastModified().toMSecsSinceEpoch(), cacheFileTimeStamp.toMSecsSinceEpoch());
     }
 }
 
diff --git a/tests/auto/qml/qqmllanguage/data/QtObjectWithChildren.qml b/tests/auto/qml/qqmllanguage/data/QtObjectWithChildren.qml
new file mode 100644
index 0000000000..bb28e22110
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/QtObjectWithChildren.qml
@@ -0,0 +1,5 @@
+import QtQml 2.0
+
+QtObject {
+    default property list<QtObject> myChildren;
+}
diff --git a/tests/auto/qml/qqmllanguage/data/defaultListProperty.qml b/tests/auto/qml/qqmllanguage/data/defaultListProperty.qml
new file mode 100644
index 0000000000..d68ffd2979
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/defaultListProperty.qml
@@ -0,0 +1,6 @@
+import QtQml 2.0
+
+QtObjectWithChildren {
+    QtObject {
+    }
+}
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index ad06946b0b..658b4f5852 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -254,6 +254,8 @@ private slots:
     void arrayBuffer_data();
     void arrayBuffer();
 
+    void defaultListProperty();
+
 private:
     QQmlEngine engine;
     QStringList defaultImportPathList;
@@ -4233,6 +4235,13 @@ void tst_qqmllanguage::arrayBuffer()
     QCOMPARE(object->property("ok").toBool(), true);
 }
 
+void tst_qqmllanguage::defaultListProperty()
+{
+    QQmlComponent component(&engine, testFileUrl("defaultListProperty.qml"));
+    VERIFY_ERRORS(0);
+    QScopedPointer<QObject> o(component.create());
+}
+
 QTEST_MAIN(tst_qqmllanguage)
 
 #include "tst_qqmllanguage.moc"