summaryrefslogtreecommitdiffstats
path: root/src/core/file_picker_controller.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Use range-based for instead of Q_FOREACHJüri Valdmann2018-06-061-3/+4
| | | | | Change-Id: Ibf016b795ff98fddfa29fb5dc63924a2d2159d71 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Pass <input type="file"> result to correct RenderFrameHostViktor Engelmann2017-02-281-9/+8
| | | | | | | | | | | | | | | | | | | In WebContentsDelegateQt::RunFileChooser, we get a content::RenderFrameHost*, to which chromium wants us to pass the files that were selected. We now store that pointer in the FilePickerController, so that we can pass the files there in FilePickerController::filesSelectedInChooser. The attribute content::WebContents *m_contents is no longer needed then, because that was only used to obtain the main frame to which the files were sent (this caused problems when the file input was inside an iframe - we sent the result to the wrong frame in that case, so the file input object remained blocked). Task-number: QTBUG-59168 Change-Id: Ic2fdacb225e5a1a9e46ced6a1e4a9ff428f18a62 Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Adaptations to Chromium 53Allan Sandfeld Jensen2016-09-141-1/+1
| | | | | Change-Id: I15053486edfd42ee607250b4f14fb6eaa325c959 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Add missing consts in file picker controllerMichal Klocek2016-07-141-3/+3
| | | | | | Change-Id: I13a7e2d5b676e9c80561021610f4d647d75c63dd Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Unify license header usage.Jani Heikkinen2016-02-011-13/+16
| | | | | | | | | Update files using old header.LGPL3 to use header.LGPL Update files using old header.FLD to use new header.FDL Update files using old header.BSD to use new header.BSD Change-Id: I36a67aaa8c3ca6c7946308defc9c03c3571a7d23 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Add tst_filePicker.qml test for UIDelegateAdam Kallai2015-04-241-2/+9
| | | | | | | | Testing single, multiple file and directory upload. Change-Id: I9da9e1f780a7f97a300fcaa38738ea781b85a4a7 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Fix initialization order in file_picker_controller.cppAndras Becsi2015-04-151-1/+1
| | | | | | Change-Id: I315c3476c943e81a43b21892c30f0550961194a1 Reviewed-by: Adam Kallai <kadam@inf.u-szeged.hu> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Merge remote-tracking branch 'origin/5.5' into devAllan Sandfeld Jensen2015-03-131-0/+4
| | | | | | | | | | Conflicts: src/webengine/api/qquickwebengineview_p_p.h src/webengine/ui_delegates_manager.cpp src/webengine/ui_delegates_manager.h src/webenginewidgets/api/qwebenginepage_p.h Change-Id: I8052de4d3b2e68a950832226f6f99e2aafca5505
* Refactor FilePickerControllerAdam Kallai2015-03-051-0/+118
Move FilePickerController classes to the QtWebEngine core to providing common functionality of files selecetion for WebEngine and WebEngineWidgtes. Change-Id: I6ab407095460ef5b63b454f7d62b98215383fc21 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>