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

 Conflicts:
	src/corelib/kernel/qmetatype.cpp

Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a

1 files changed, 3 insertions, 2 deletions

diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index 882ad8a5a6..e3d4680d6d 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -2445,14 +2445,15 @@ void QFileDialog::getOpenFileContent(const QString &nameFilter, const std::funct
     (*openFileImpl)();
 #else
     QFileDialog *dialog = new QFileDialog();
+    dialog->setFileMode(QFileDialog::ExistingFile);
     dialog->selectNameFilter(nameFilter);
 
     auto fileSelected = [=](const QString &fileName) {
         QByteArray fileContent;
         if (!fileName.isNull()) {
             QFile selectedFile(fileName);
-            selectedFile.open(QIODevice::ReadOnly);
-            fileContent = selectedFile.readAll();
+            if (selectedFile.open(QIODevice::ReadOnly))
+                fileContent = selectedFile.readAll();
         }
         fileOpenCompleted(fileName, fileContent);
     };