diff options
-rw-r--r-- | tests/auto/quick/qmltests/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls2Delegates/FilePicker.qml (renamed from tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/FilePicker.qml) | 22 | ||||
-rw-r--r-- | tests/auto/quick/qmltests/qmltests.pro | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/tests/auto/quick/qmltests/CMakeLists.txt b/tests/auto/quick/qmltests/CMakeLists.txt index 1c77e1a05..fd756e6b9 100644 --- a/tests/auto/quick/qmltests/CMakeLists.txt +++ b/tests/auto/quick/qmltests/CMakeLists.txt @@ -17,6 +17,7 @@ set(testList tst_audioMuted.qml tst_desktopBehaviorLoadHtml.qml tst_favicon.qml + tst_filePicker.qml tst_findText.qml tst_focusOnNavigation.qml tst_fullScreenRequest.qml @@ -67,7 +68,6 @@ if(TARGET Qt::QuickControls) #FIXME list(APPEND testList tst_contextMenu.qml tst_download.qml - tst_filePicker.qml ) else() message("\n!!!! QuickControls target is missing, some tests are not executed !!! FIXME \n") diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/FilePicker.qml b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls2Delegates/FilePicker.qml index 745f533f5..0ba92f5ce 100644 --- a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/FilePicker.qml +++ b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls2Delegates/FilePicker.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtWebEngine module of the Qt Toolkit. @@ -26,24 +26,24 @@ ** ****************************************************************************/ -import QtQuick 2.2 -import "../../TestParams" 1.0 +import QtQuick +import "../../TestParams" QtObject { - property bool selectMultiple: false; - property bool selectExisting: false; - property bool selectFolder: false; - property var nameFilters: []; + property bool selectMultiple: false + property bool selectExisting: false + property bool selectFolder: false + property var nameFilters: [] - signal filesSelected(var fileList); - signal rejected(); + signal filesSelected(var fileList) + signal rejected() function open() { FilePickerParams.filePickerOpened = true; FilePickerParams.nameFilters = nameFilters; if (FilePickerParams.selectFiles) - filesSelected(FilePickerParams.selectedFilesUrl) + filesSelected(FilePickerParams.selectedFilesUrl); else - rejected() + rejected(); } } diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro index 6ab2977cb..513af0f3d 100644 --- a/tests/auto/quick/qmltests/qmltests.pro +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -134,7 +134,6 @@ OTHER_FILES += \ $$PWD/data/icons/qt32.ico \ $$PWD/data/icons/qtmulti.ico \ $$PWD/data/icons/small-favicon.png \ - $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/FilePicker.qml \ $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/Menu.qml \ $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/MenuItem.qml \ $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/qmldir \ @@ -143,6 +142,7 @@ OTHER_FILES += \ $$PWD/mock-delegates/TestParams/qmldir \ $$PWD/mock-delegates/QtWebEngine/Controls2Delegates/AlertDialog.qml \ $$PWD/mock-delegates/QtWebEngine/Controls2Delegates/ConfirmDialog.qml \ + $$PWD/mock-delegates/QtWebEngine/Controls2Delegates/FilePicker.qml \ $$PWD/mock-delegates/QtWebEngine/Controls2Delegates/PromptDialog.qml \ $$PWD/mock-delegates/QtWebEngine/Controls2Delegates/qmldir |