Merge remote-tracking branch 'origin/8.0' into 9.0

 Conflicts:
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
	src/plugins/qmldesigner/designercore/imagecache/meshimagecachecollector.cpp

Change-Id: I38f196e8f42cf11f7b613e7a723745600e35c5e9

1 files changed, 13 insertions, 2 deletions

diff --git a/src/plugins/studiowelcome/userpresets.cpp b/src/plugins/studiowelcome/userpresets.cpp
index a643df3fdd..86fdb2e557 100644
--- a/src/plugins/studiowelcome/userpresets.cpp
+++ b/src/plugins/studiowelcome/userpresets.cpp
@@ -21,7 +21,14 @@ FileStoreIo::FileStoreIo(const QString &fileName)
 
 QByteArray FileStoreIo::read() const
 {
-    m_file->open(QFile::ReadOnly | QFile::Text);
+    if (!m_file->exists())
+        return {};
+
+    if (!m_file->open(QFile::ReadOnly | QFile::Text)) {
+        qWarning() << "Cannot load User Preset(s)";
+        return {};
+    }
+
     QByteArray data = m_file->readAll();
     m_file->close();
 
@@ -30,7 +37,11 @@ QByteArray FileStoreIo::read() const
 
 void FileStoreIo::write(const QByteArray &data)
 {
-    m_file->open(QFile::WriteOnly | QFile::Text);
+    if (!m_file->open(QFile::WriteOnly | QFile::Text)) {
+        qWarning() << "Cannot save User Preset(s)";
+        return;
+    }
+
     m_file->write(data);
     m_file->close();
 }