From bed7788402fe0cab9eb36d37e9fff9e65b3fbfe6 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 24 Jan 2024 13:17:26 +0100 Subject: QFileDialog::getOpenFileContent: default new parent parameter Amends 7c5cf8cae054954975a3e262f7fe3cd9897d67f4, which removed the old function that didn't have any parent parameter from the API, and added a new one with the parent parameter in its stead. However, to make sure that the new function is source compatible with existing code, the parent parameter must be defaulted to nullptr (which it already is in the new version of saveFileContent). Found during header review. Pick-to: 6.7 Change-Id: I3e734905be9788ae1b206c7a65328e604667f5e4 Reviewed-by: Marc Mutz --- src/widgets/dialogs/qfiledialog.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h index b3958beeed..d59392753a 100644 --- a/src/widgets/dialogs/qfiledialog.h +++ b/src/widgets/dialogs/qfiledialog.h @@ -214,7 +214,7 @@ public: static void getOpenFileContent(const QString &nameFilter, const std::function &fileContentsReady, - QWidget *parent); + QWidget *parent= nullptr); static void saveFileContent(const QByteArray &fileContent, const QString &fileNameHint, -- cgit v1.2.3