diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 20:43:50 +0100 |
commit | c2f167b41284cee3570434deba85f26f14ff241f (patch) | |
tree | b0f52f86a8df266547d7ec7afa22d0c0d68d3532 /src/widgets/dialogs/qfiledialog.cpp | |
parent | 9f9049b486a47aef0c7e2e3852b20aa4ffdce748 (diff) | |
parent | ff922e7b87de147797fbd759167878aec7625f0c (diff) |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/widgets/dialogs/qfiledialog.cpp')
-rw-r--r-- | src/widgets/dialogs/qfiledialog.cpp | 5 |
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); }; |