diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-11 16:49:15 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-17 15:22:28 +0100 |
| commit | 1f7c5244e3adeccf42f0583358f0787498f2661b (patch) | |
| tree | 4b8a03628682f3d6bd847c09d8cf415dce7c6c48 /tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/FilePicker.qml | |
| parent | 8412b9b3442345b17fe6618a56ed9ed08dfb7417 (diff) | |
| parent | 6025803547477884fe1d027b7cb54a70429337c6 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Blacklists tst_Accessibility::focusChild() for now.
Conflicts:
src/core/api/core_api.pro
src/core/net/plugin_response_interceptor_url_loader_throttle.h
src/process/process.pro
Change-Id: I95821a3851120dc16673f4c760e802952eae5c41
Diffstat (limited to 'tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/FilePicker.qml')
| -rw-r--r-- | tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/FilePicker.qml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/FilePicker.qml b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/FilePicker.qml index 5d78807df..745f533f5 100644 --- a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/FilePicker.qml +++ b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/FilePicker.qml @@ -33,12 +33,14 @@ QtObject { property bool selectMultiple: false; property bool selectExisting: false; property bool selectFolder: false; + property var nameFilters: []; signal filesSelected(var fileList); signal rejected(); function open() { FilePickerParams.filePickerOpened = true; + FilePickerParams.nameFilters = nameFilters; if (FilePickerParams.selectFiles) filesSelected(FilePickerParams.selectedFilesUrl) else |