From fc50edecbce8f6db9bb663aa63d970e6f04604c8 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Thu, 26 Aug 2021 14:31:07 +0200 Subject: Nuke all qmake files from tests Change-Id: Ibad2e50d840a2eb0ccb9ac65158e512249a2bc79 Reviewed-by: Allan Sandfeld Jensen (cherry picked from commit 24a695b4b7fda581c15600b111d6b6c3459ca1d9) Reviewed-by: Qt Cherry-pick Bot --- .../core/certificateerror/certificateerror.pro | 3 --- tests/auto/core/core.pro | 12 ----------- tests/auto/core/devtools/devtools.pro | 1 - tests/auto/core/origins/origins.pro | 8 -------- tests/auto/core/origins/tst_origins.qrc | 23 --------------------- .../qwebengineclientcertificatestore.pro | 1 - .../tst_qwebengineclientcertificatestore.qrc | 8 -------- .../qwebenginecookiestore.pro | 2 -- .../tst_qwebenginecookiestore.qrc | 6 ------ .../core/qwebenginesettings/qwebenginesettings.pro | 2 -- .../qwebengineurlrequestinterceptor.pro | 2 -- .../tst_qwebengineurlrequestinterceptor.qrc | 24 ---------------------- tests/auto/core/tests.pri | 17 --------------- 13 files changed, 109 deletions(-) delete mode 100644 tests/auto/core/certificateerror/certificateerror.pro delete mode 100644 tests/auto/core/core.pro delete mode 100644 tests/auto/core/devtools/devtools.pro delete mode 100644 tests/auto/core/origins/origins.pro delete mode 100644 tests/auto/core/origins/tst_origins.qrc delete mode 100644 tests/auto/core/qwebengineclientcertificatestore/qwebengineclientcertificatestore.pro delete mode 100644 tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.qrc delete mode 100644 tests/auto/core/qwebenginecookiestore/qwebenginecookiestore.pro delete mode 100644 tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.qrc delete mode 100644 tests/auto/core/qwebenginesettings/qwebenginesettings.pro delete mode 100644 tests/auto/core/qwebengineurlrequestinterceptor/qwebengineurlrequestinterceptor.pro delete mode 100644 tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.qrc delete mode 100644 tests/auto/core/tests.pri (limited to 'tests/auto/core') diff --git a/tests/auto/core/certificateerror/certificateerror.pro b/tests/auto/core/certificateerror/certificateerror.pro deleted file mode 100644 index 73ba7515b..000000000 --- a/tests/auto/core/certificateerror/certificateerror.pro +++ /dev/null @@ -1,3 +0,0 @@ -include(../tests.pri) -include(../../shared/https.pri) -QT *= core-private diff --git a/tests/auto/core/core.pro b/tests/auto/core/core.pro deleted file mode 100644 index 23b25bd97..000000000 --- a/tests/auto/core/core.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = subdirs -QT_FOR_CONFIG += network-private - -SUBDIRS += \ - qwebenginecookiestore \ - qwebenginesettings \ - qwebengineurlrequestinterceptor \ - devtools \ - origins - -qtConfig(ssl): SUBDIRS += certificateerror qwebengineclientcertificatestore - diff --git a/tests/auto/core/devtools/devtools.pro b/tests/auto/core/devtools/devtools.pro deleted file mode 100644 index e99c7f493..000000000 --- a/tests/auto/core/devtools/devtools.pro +++ /dev/null @@ -1 +0,0 @@ -include(../tests.pri) diff --git a/tests/auto/core/origins/origins.pro b/tests/auto/core/origins/origins.pro deleted file mode 100644 index 6cf0b2b92..000000000 --- a/tests/auto/core/origins/origins.pro +++ /dev/null @@ -1,8 +0,0 @@ -include(../tests.pri) -include(../../shared/http.pri) - -qtConfig(webengine-webchannel):qtHaveModule(websockets) { - QT += websockets - DEFINES += WEBSOCKETS -} - diff --git a/tests/auto/core/origins/tst_origins.qrc b/tests/auto/core/origins/tst_origins.qrc deleted file mode 100644 index ae5245378..000000000 --- a/tests/auto/core/origins/tst_origins.qrc +++ /dev/null @@ -1,23 +0,0 @@ - - - - resources/createObjectURL.html - resources/dedicatedWorker.html - resources/dedicatedWorker.js - resources/mixedSchemes.html - resources/mixedSchemesWithCsp.html - resources/mixedSchemes_frame.html - resources/mixedXHR.html - resources/mixedXHR.txt - resources/serviceWorker.html - resources/serviceWorker.js - resources/sharedWorker.html - resources/sharedWorker.js - resources/subdir/frame2.html - resources/subdir/index.html - resources/subdir_frame1.html - resources/viewSource.html - resources/websocket.html - resources/websocket2.html - - diff --git a/tests/auto/core/qwebengineclientcertificatestore/qwebengineclientcertificatestore.pro b/tests/auto/core/qwebengineclientcertificatestore/qwebengineclientcertificatestore.pro deleted file mode 100644 index e99c7f493..000000000 --- a/tests/auto/core/qwebengineclientcertificatestore/qwebengineclientcertificatestore.pro +++ /dev/null @@ -1 +0,0 @@ -include(../tests.pri) diff --git a/tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.qrc b/tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.qrc deleted file mode 100644 index db481fef6..000000000 --- a/tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.qrc +++ /dev/null @@ -1,8 +0,0 @@ - - - resources/certificate.crt - resources/privatekey.key - resources/certificate1.crt - resources/privatekey1.key - - diff --git a/tests/auto/core/qwebenginecookiestore/qwebenginecookiestore.pro b/tests/auto/core/qwebenginecookiestore/qwebenginecookiestore.pro deleted file mode 100644 index 9c239f1a7..000000000 --- a/tests/auto/core/qwebenginecookiestore/qwebenginecookiestore.pro +++ /dev/null @@ -1,2 +0,0 @@ -include(../tests.pri) -include(../../shared/http.pri) diff --git a/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.qrc b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.qrc deleted file mode 100644 index afeae268b..000000000 --- a/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - resources/index.html - resources/content.html - - diff --git a/tests/auto/core/qwebenginesettings/qwebenginesettings.pro b/tests/auto/core/qwebenginesettings/qwebenginesettings.pro deleted file mode 100644 index 70786e70f..000000000 --- a/tests/auto/core/qwebenginesettings/qwebenginesettings.pro +++ /dev/null @@ -1,2 +0,0 @@ -include(../tests.pri) -QT *= core-private gui-private diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/qwebengineurlrequestinterceptor.pro b/tests/auto/core/qwebengineurlrequestinterceptor/qwebengineurlrequestinterceptor.pro deleted file mode 100644 index 9c239f1a7..000000000 --- a/tests/auto/core/qwebengineurlrequestinterceptor/qwebengineurlrequestinterceptor.pro +++ /dev/null @@ -1,2 +0,0 @@ -include(../tests.pri) -include(../../shared/http.pri) diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.qrc b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.qrc deleted file mode 100644 index 6a34635f7..000000000 --- a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.qrc +++ /dev/null @@ -1,24 +0,0 @@ - - - resources/content.html - resources/favicon.html - resources/firstparty.html - resources/fontawesome.woff - resources/iframe.html - resources/iframe2.html - resources/iframe3.html - resources/image.html - resources/image_in_iframe.html - resources/index.html - resources/media.html - resources/media.mp4 - resources/media_in_iframe.html - resources/resource.html - resources/resource_in_iframe.html - resources/script.js - resources/style.css - resources/sw.html - resources/sw.js - resources/icons/favicon.png - - diff --git a/tests/auto/core/tests.pri b/tests/auto/core/tests.pri deleted file mode 100644 index 2f34f1735..000000000 --- a/tests/auto/core/tests.pri +++ /dev/null @@ -1,17 +0,0 @@ -TEMPLATE = app - -CONFIG += testcase - -VPATH += $$_PRO_FILE_PWD_ -TARGET = tst_$$TARGET - -SOURCES += $${TARGET}.cpp -INCLUDEPATH += $$PWD - -exists($$_PRO_FILE_PWD_/$${TARGET}.qrc): RESOURCES += $${TARGET}.qrc - -QT += testlib network webenginecore - -# This define is used by some tests to look up resources in the source tree -DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD/\\\" -include(../embed_info_plist.pri) -- cgit v1.2.3