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 18:41:27 +0100 |
| commit | ff922e7b87de147797fbd759167878aec7625f0c (patch) | |
| tree | a326819f23e2421723f144522f9362ba608d6bb1 /src/plugins/platforms/ios/qiosfiledialog.h | |
| parent | e464e1eb8eb63c631fb0916c3ea4540a88d8aad3 (diff) | |
| parent | 75f52bd0ddc4afbd181c14b310d256e3507052d6 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/kernel/qmetatype.cpp
Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a
Diffstat (limited to 'src/plugins/platforms/ios/qiosfiledialog.h')
| -rw-r--r-- | src/plugins/platforms/ios/qiosfiledialog.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/ios/qiosfiledialog.h b/src/plugins/platforms/ios/qiosfiledialog.h index 5cb1b45e20..eab05091ef 100644 --- a/src/plugins/platforms/ios/qiosfiledialog.h +++ b/src/plugins/platforms/ios/qiosfiledialog.h @@ -65,7 +65,7 @@ public: void selectNameFilter(const QString &) override {} QString selectedNameFilter() const override { return QString(); } - void selectedFilesChanged(QList<QUrl> selection); + void selectedFilesChanged(const QList<QUrl> &selection); private: QUrl m_directory; @@ -74,6 +74,7 @@ private: UIViewController *m_viewController; bool showImagePickerDialog(QWindow *parent); + bool showNativeDocumentPickerDialog(QWindow *parent); }; QT_END_NAMESPACE |