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

Conflicts:
	examples/network/network-chat/peermanager.cpp
	src/widgets/util/qsystemtrayicon.cpp
	src/widgets/util/qsystemtrayicon_qpa.cpp
	src/widgets/util/qsystemtrayicon_win.cpp
	src/widgets/util/qsystemtrayicon_x11.cpp

Change-Id: I1c026df83818c0ccaf956980370e7522960627db

1 files changed, 8 insertions, 1 deletions

diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
index bd25992457..ca9f7af127 100644
--- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
@@ -194,8 +194,11 @@ static QVector<QComposeTableElement> loadCache(const QComposeCacheFileHeader &co
 static bool saveCache(const QComposeCacheFileHeader &info, const QVector<QComposeTableElement> &vec)
 {
     const QString filePath = getCacheFilePath();
+#if QT_CONFIG(temporaryfile)
     QSaveFile outputFile(filePath);
-
+#else
+    QFile outputFile(filePath);
+#endif
     if (!outputFile.open(QIODevice::WriteOnly))
         return false;
     const char *data = reinterpret_cast<const char*>(&info);
@@ -207,7 +210,11 @@ static bool saveCache(const QComposeCacheFileHeader &info, const QVector<QCompos
 
     if (outputFile.write(data, size) != size)
         return false;
+#if QT_CONFIG(temporaryfile)
     return outputFile.commit();
+#else
+    return true;
+#endif
 }
 
 TableGenerator::TableGenerator() : m_state(NoErrors),