diff options
Diffstat (limited to 'tests/auto/quick/qmltests')
10 files changed, 6 insertions, 12 deletions
diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/qmldir b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/qmldir deleted file mode 100644 index f0d8f33b7..000000000 --- a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/qmldir +++ /dev/null @@ -1 +0,0 @@ -module QtWebEngine.Controls1Delegates diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls2Delegates/qmldir b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls2Delegates/qmldir deleted file mode 100644 index 5542aba58..000000000 --- a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls2Delegates/qmldir +++ /dev/null @@ -1 +0,0 @@ -module QtWebEngine.Controls2Delegates diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls2Delegates/AlertDialog.qml b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/AlertDialog.qml index 252678754..252678754 100644 --- a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls2Delegates/AlertDialog.qml +++ b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/AlertDialog.qml diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls2Delegates/ConfirmDialog.qml b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/ConfirmDialog.qml index c4d3dd183..c4d3dd183 100644 --- a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls2Delegates/ConfirmDialog.qml +++ b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/ConfirmDialog.qml diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls2Delegates/FilePicker.qml b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/FilePicker.qml index 0ba92f5ce..0ba92f5ce 100644 --- a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls2Delegates/FilePicker.qml +++ b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/FilePicker.qml diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls2Delegates/Menu.qml b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/Menu.qml index aa03a9d30..aa03a9d30 100644 --- a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls2Delegates/Menu.qml +++ b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/Menu.qml diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls2Delegates/MenuItem.qml b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/MenuItem.qml index dcc1ca4b6..dcc1ca4b6 100644 --- a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls2Delegates/MenuItem.qml +++ b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/MenuItem.qml diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls2Delegates/PromptDialog.qml b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/PromptDialog.qml index 800481797..800481797 100644 --- a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls2Delegates/PromptDialog.qml +++ b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/PromptDialog.qml diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro index c5755e46a..bc034790e 100644 --- a/tests/auto/quick/qmltests/qmltests.pro +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -134,17 +134,15 @@ OTHER_FILES += \ $$PWD/data/icons/qt32.ico \ $$PWD/data/icons/qtmulti.ico \ $$PWD/data/icons/small-favicon.png \ - $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/qmldir \ $$PWD/mock-delegates/TestParams/FilePickerParams.qml \ $$PWD/mock-delegates/TestParams/JSDialogParams.qml \ $$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/Menu.qml \ - $$PWD/mock-delegates/QtWebEngine/Controls2Delegates/MenuItem.qml \ - $$PWD/mock-delegates/QtWebEngine/Controls2Delegates/PromptDialog.qml \ - $$PWD/mock-delegates/QtWebEngine/Controls2Delegates/qmldir + $$PWD/mock-delegates/QtWebEngine/ControlsDelegates/AlertDialog.qml \ + $$PWD/mock-delegates/QtWebEngine/ControlsDelegates/ConfirmDialog.qml \ + $$PWD/mock-delegates/QtWebEngine/ControlsDelegates/FilePicker.qml \ + $$PWD/mock-delegates/QtWebEngine/ControlsDelegates/Menu.qml \ + $$PWD/mock-delegates/QtWebEngine/ControlsDelegates/MenuItem.qml \ + $$PWD/mock-delegates/QtWebEngine/ControlsDelegates/PromptDialog.qml OTHER_FILES += $$QML_TESTS diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp index 653972dfd..a60994f85 100644 --- a/tests/auto/quick/qmltests/tst_qmltests.cpp +++ b/tests/auto/quick/qmltests/tst_qmltests.cpp @@ -153,8 +153,6 @@ int main(int argc, char **argv) sigaction(SIGSEGV, &sigAction, 0); #endif - // TODO: temporary solution. Remove when Quick Controls 1 is removed. - qputenv("QTWEBENGINE_DIALOG_SET", QByteArray("QtQuickControls2")); QScopedPointer<Application> app; // Force to use English language for testing due to error message checks QLocale::setDefault(QLocale("en")); |