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

Conflicts:
	.qmake.conf
	src/qml/qml/qqmlengine.cpp
	src/qmlmodels/qqmlmodelsmodule.cpp

Change-Id: Id60420f8250a9c97fcfe56d4eea19b62c6870404

1 files changed, 6 insertions, 0 deletions

diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp
index 0202bd4df0..9468d64839 100644
--- a/tools/qmlcachegen/qmlcachegen.cpp
+++ b/tools/qmlcachegen/qmlcachegen.cpp
@@ -334,7 +334,11 @@ static bool saveUnitAsCpp(const QString &inputFileName, const QString &outputFil
                           const QV4::CompiledData::SaveableUnitPointer &unit,
                           QString *errorString)
 {
+#if QT_CONFIG(temporaryfile)
     QSaveFile f(outputFileName);
+#else
+    QFile f(outputFileName);
+#endif
     if (!f.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
         *errorString = f.errorString();
         return false;
@@ -392,10 +396,12 @@ static bool saveUnitAsCpp(const QString &inputFileName, const QString &outputFil
     if (!writeStr("};\n}\n}\n"))
         return false;
 
+#if QT_CONFIG(temporaryfile)
     if (!f.commit()) {
         *errorString = f.errorString();
         return false;
     }
+#endif
 
     return true;
 }