summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-12 01:01:03 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-12 01:01:04 +0100
commit11d7788c18bf062c204782b3661e67b45e818819 (patch)
tree7e6df60892757c060ecf9d2698b893f8b93315e7 /src/widgets
parentb3c0e9afa0041d4d45e47880732deda1dd1013b9 (diff)
parent3162345670ffe67a71a62abaeda0d8eb8ad0682e (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp b/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp
index 7ccd827a04..4b4fb869f9 100644
--- a/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp
@@ -146,13 +146,13 @@ dialog.exec();
//! [14]
//! [15]
-auto fileOpenCompleted = [](const QString &fileName, const QByteArray &fileContent) {
+auto fileContentReady = [](const QString &fileName, const QByteArray &fileContent) {
if (fileName.isEmpty()) {
// No file was selected
} else {
// Use fileName and fileContent
}
-}
+};
QFileDialog::getOpenFileContent("Images (*.png *.xpm *.jpg)", fileContentReady);
//! [15]