summaryrefslogtreecommitdiff
path: root/src/plugins/platforms/ios/qiosdocumentpickercontroller.mm
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into ↵v5.15.9-lts-lgpl5.15Tarja Sundqvist2023-03-231-0/+15
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Iaff6b55275e50d19973e1020853d8622587069f9
| * QIOSFileDialog/QIOSDocumentPickerController - handle dismissed view controllerTimur Pocheptsov2022-03-131-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we use a native view controller for selecting documents, we have two methods to implement from UIDocumentPickerDelegate (a file was selected or the selection was cancelled). Unfortunately, swiping a view away was not handled, so neither 'accept' nor 'reject' was called. Depending on the classes using QIOSFileDialog, this may leave them in some incorrect state, not knowing that they are 'closed' anyway. As suggested by Tor Arne, the solution is to implement UIAdaptivePresentationControllerDelegate's method, namely -presentationControllerDidDismiss:, which never gets called if the controller was dismissed programatically (the case of accept/reject). Fixes: QTBUG-93505 Change-Id: I28404aa280465ef8eb0f5c26c8c2e4e4a6c66641 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit bb30beb72642bf7c33f502f81e0dc7f4951ba8ec) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Revert "Update commercial license headers"Tarja Sundqvist2021-03-241-20/+20
|/ | | | | | | | | | | This reverts commit 7a27444682c4cabc74b82bbce71481a49d748722. Revert of commercial license header changes is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I112b51ad8a0ec8506de9c2ec2f2d72fac9b37300 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Update commercial license headersTarja Sundqvist2021-01-261-20/+20
| | | | | | | | | | | | | | | | | Updated header.COMM to files in tqtc-qtbase/src/openg, tqtc-qtbase/src/openglextensions, tqtc-qtbase/src/, tqtc-qtbase/src/platformheaders, tqtc-qtbase/src/platformsupport and tqtc-qtbase/src/plugins. The commercial license header may contains some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4154 Change-Id: If366ee14b640372751d03bc1e169d15c877b3235 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Add native iOS file dialogHarald Meyer2020-03-141-0/+103
This patch adds native iOS file open and directory picking support for the QFileDialog using the iOS UIDocumentPickerViewController class. Change-Id: Ia724a59742650a01c62067aed3477f82ab1fd546 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>