Enable QML/JS disk cache by default

Except on Windows, where there is still one bug to fix.

Change-Id: I1a22f42859733eedd37596a3e8fc09680720ff10
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>

3 files changed, 17 insertions, 1 deletions

diff --git a/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp b/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp
index ca47aae92e..c3a80eebde 100644
--- a/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp
+++ b/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp
@@ -190,7 +190,7 @@ struct TestCompiler
 
 void tst_qmldiskcache::initTestCase()
 {
-    qputenv("QML_DISK_CACHE", "1");
+    qputenv("QML_FORCE_DISK_CACHE", "1");
 }
 
 void tst_qmldiskcache::regenerateAfterChange()
diff --git a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
index 74e54b64e9..9c155eda5b 100644
--- a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
+++ b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
@@ -275,6 +275,12 @@ void tst_qqmlengine::clearComponentCache()
 
     // Modify qml file
     {
+        // On macOS with HFS+ the precision of file times is measured in seconds, so to ensure that
+        // the newly written file has a modification date newer than an existing cache file, we must
+        // wait.
+        // Similar effects of lacking precision have been observed on some Linux systems.
+        QThread::sleep(1);
+
         QFile file("temp.qml");
         QVERIFY(file.open(QIODevice::WriteOnly));
         file.write("import QtQuick 2.0\nQtObject {\nproperty int test: 11\n}\n");
diff --git a/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp b/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp
index f3ba3e8971..f19e82032a 100644
--- a/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp
+++ b/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp
@@ -56,6 +56,7 @@ public slots:
     }
 
 private slots:
+    void initTestCase();
     void basicProperties();
     void showFiles();
     void resetFiltering();
@@ -97,6 +98,15 @@ void tst_qquickfolderlistmodel::checkNoErrors(const QQmlComponent& component)
     QVERIFY(!component.isError());
 }
 
+void tst_qquickfolderlistmodel::initTestCase()
+{
+    // The tests rely on a fixed number of files in the directory with the qml files
+    // (the data dir), so disable the disk cache to avoid creating .qmlc files and
+    // confusing the test.
+    qputenv("QML_DISABLE_DISK_CACHE", "1");
+    QQmlDataTest::initTestCase();
+}
+
 void tst_qquickfolderlistmodel::basicProperties()
 {
     QQmlComponent component(&engine, testFileUrl("basic.qml"));