summaryrefslogtreecommitdiffstats
path: root/src/core/file_picker_controller.h
Commit message (Collapse)AuthorAgeFilesLines
* Adaptations for Chromium 71Allan Sandfeld Jensen2019-01-281-4/+8
| | | | | | | Change-Id: Ib650113b05dfd4771240804f94e33c07aa317bf2 Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* Update export symbols for webenginecore moduleMichal Klocek2018-06-151-2/+13
| | | | | | | | | | | Use own WEBENGINECORE_EXPORT define, mark most headers private and use WEBENGINECORE_PRIVATE_EXPORT for it. For sanity, add "WARNING" as for private headers even though they are never installed. Change-Id: I523d28c1d00217f48bc63dabf138dd3a7eb482d4 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Pass <input type="file"> result to correct RenderFrameHostViktor Engelmann2017-02-281-4/+4
| | | | | | | | | | | | | | | | | | | 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>
* Add missing consts in file picker controllerMichal Klocek2016-07-141-4/+4
| | | | | | 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 missing include to file_picker_controller.hZeno Albisser2015-04-011-0/+1
| | | | | Change-Id: I8c7b185a062aaf0dd2c02a14f4f7a2fa36db3177 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Not all public functions of FilePickerController need to be slotsAndras Becsi2015-03-161-5/+4
| | | | | | | | For the sake of correct semantics move some function declarations to be plain old public functions instead of slots. Change-Id: I2ea645f49cfc2d0297352c3e7cc237ef59b69e69 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into devAllan Sandfeld Jensen2015-03-131-2/+6
| | | | | | | | | | 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/+77
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>