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 --- tests/auto/Info.plist.in | 18 --- tests/auto/auto.pro | 26 ---- tests/auto/cmake/cmake.pro | 8 -- .../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 --- tests/auto/embed_info_plist.pri | 13 -- tests/auto/pdf/pdf.pro | 8 -- .../pdf/qpdfbookmarkmodel/qpdfbookmarkmodel.pro | 5 - tests/auto/pdf/qpdfdocument/qpdfdocument.pro | 6 - .../pdf/qpdfpagenavigation/qpdfpagenavigation.pro | 5 - .../auto/pdf/qpdfpagerenderer/qpdfpagerenderer.pro | 5 - tests/auto/pdf/qpdfsearchmodel/qpdfsearchmodel.pro | 5 - tests/auto/quick/dialogs/dialogs.pro | 13 -- tests/auto/quick/dialogs/dialogs.qrc | 6 - .../auto/quick/inspectorserver/inspectorserver.pro | 4 - tests/auto/quick/publicapi/publicapi.pro | 3 - tests/auto/quick/qmltests/qmltests.pro | 134 --------------------- .../qquickwebenginedefaultsurfaceformat.pro | 6 - .../qquickwebengineview/qquickwebengineview.pro | 6 - .../qquickwebengineviewgraphics.pro | 4 - tests/auto/quick/qtbug-70248/qtbug-70248.pro | 5 - tests/auto/quick/qtbug-70248/test.qrc | 5 - tests/auto/quick/quick.pro | 16 --- tests/auto/quick/tests.pri | 20 --- tests/auto/shared/http.pri | 4 - tests/auto/shared/https.pri | 4 - tests/auto/shared/httpsserver.qrc | 6 - tests/auto/widgets/accessibility/accessibility.pro | 1 - .../defaultsurfaceformat/defaultsurfaceformat.pro | 1 - .../tst_defaultsurfaceformat.qrc | 5 - tests/auto/widgets/favicon/favicon.pro | 1 - tests/auto/widgets/favicon/tst_favicon.qrc | 14 --- tests/auto/widgets/loadsignals/loadsignals.pro | 2 - tests/auto/widgets/loadsignals/tst_loadsignals.qrc | 13 -- tests/auto/widgets/offscreen/offscreen.pro | 6 - tests/auto/widgets/offscreen/tst_offscreen.qrc | 6 - tests/auto/widgets/printing/printing.pro | 10 -- tests/auto/widgets/printing/tst_printing.qrc | 5 - tests/auto/widgets/proxy/proxy.pro | 9 -- tests/auto/widgets/proxypac/proxypac.pri | 5 - tests/auto/widgets/proxypac/proxypac.pro | 4 - tests/auto/widgets/proxypac/proxypac.qrc | 7 -- .../proxypac/proxypac_file/proxypac_file.pro | 9 -- .../widgets/proxypac/proxypac_qrc/proxypac_qrc.pro | 7 -- .../qwebenginedownloadrequest.pro | 3 - .../qwebenginehistory/qwebenginehistory.pro | 1 - .../qwebenginehistory/tst_qwebenginehistory.qrc | 10 -- .../auto/widgets/qwebenginepage/qwebenginepage.pro | 3 - .../widgets/qwebenginepage/tst_qwebenginepage.qrc | 32 ----- .../qwebengineprofile/qwebengineprofile.pro | 4 - .../widgets/qwebenginescript/qwebenginescript.pro | 1 - .../qwebenginescript/tst_qwebenginescript.qrc | 11 -- .../auto/widgets/qwebengineview/qwebengineview.pro | 2 - .../widgets/qwebengineview/tst_qwebengineview.qrc | 11 -- tests/auto/widgets/schemes/schemes.pro | 3 - tests/auto/widgets/shutdown/shutdown.pro | 1 - tests/auto/widgets/spellchecking/spellchecking.pro | 24 ---- .../widgets/spellchecking/tst_spellchecking.qrc | 5 - tests/auto/widgets/tests.pri | 21 ---- tests/auto/widgets/touchinput/touchinput.pro | 2 - tests/auto/widgets/widgets.pro | 47 -------- tests/tests.pro | 7 -- 73 files changed, 737 deletions(-) delete mode 100644 tests/auto/Info.plist.in delete mode 100644 tests/auto/auto.pro delete mode 100644 tests/auto/cmake/cmake.pro 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 delete mode 100644 tests/auto/embed_info_plist.pri delete mode 100644 tests/auto/pdf/pdf.pro delete mode 100644 tests/auto/pdf/qpdfbookmarkmodel/qpdfbookmarkmodel.pro delete mode 100644 tests/auto/pdf/qpdfdocument/qpdfdocument.pro delete mode 100644 tests/auto/pdf/qpdfpagenavigation/qpdfpagenavigation.pro delete mode 100644 tests/auto/pdf/qpdfpagerenderer/qpdfpagerenderer.pro delete mode 100644 tests/auto/pdf/qpdfsearchmodel/qpdfsearchmodel.pro delete mode 100644 tests/auto/quick/dialogs/dialogs.pro delete mode 100644 tests/auto/quick/dialogs/dialogs.qrc delete mode 100644 tests/auto/quick/inspectorserver/inspectorserver.pro delete mode 100644 tests/auto/quick/publicapi/publicapi.pro delete mode 100644 tests/auto/quick/qmltests/qmltests.pro delete mode 100644 tests/auto/quick/qquickwebenginedefaultsurfaceformat/qquickwebenginedefaultsurfaceformat.pro delete mode 100644 tests/auto/quick/qquickwebengineview/qquickwebengineview.pro delete mode 100644 tests/auto/quick/qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro delete mode 100644 tests/auto/quick/qtbug-70248/qtbug-70248.pro delete mode 100644 tests/auto/quick/qtbug-70248/test.qrc delete mode 100644 tests/auto/quick/quick.pro delete mode 100644 tests/auto/quick/tests.pri delete mode 100644 tests/auto/shared/http.pri delete mode 100644 tests/auto/shared/https.pri delete mode 100644 tests/auto/shared/httpsserver.qrc delete mode 100644 tests/auto/widgets/accessibility/accessibility.pro delete mode 100644 tests/auto/widgets/defaultsurfaceformat/defaultsurfaceformat.pro delete mode 100644 tests/auto/widgets/defaultsurfaceformat/tst_defaultsurfaceformat.qrc delete mode 100644 tests/auto/widgets/favicon/favicon.pro delete mode 100644 tests/auto/widgets/favicon/tst_favicon.qrc delete mode 100644 tests/auto/widgets/loadsignals/loadsignals.pro delete mode 100644 tests/auto/widgets/loadsignals/tst_loadsignals.qrc delete mode 100644 tests/auto/widgets/offscreen/offscreen.pro delete mode 100644 tests/auto/widgets/offscreen/tst_offscreen.qrc delete mode 100644 tests/auto/widgets/printing/printing.pro delete mode 100644 tests/auto/widgets/printing/tst_printing.qrc delete mode 100644 tests/auto/widgets/proxy/proxy.pro delete mode 100644 tests/auto/widgets/proxypac/proxypac.pri delete mode 100644 tests/auto/widgets/proxypac/proxypac.pro delete mode 100644 tests/auto/widgets/proxypac/proxypac.qrc delete mode 100644 tests/auto/widgets/proxypac/proxypac_file/proxypac_file.pro delete mode 100644 tests/auto/widgets/proxypac/proxypac_qrc/proxypac_qrc.pro delete mode 100644 tests/auto/widgets/qwebenginedownloadrequest/qwebenginedownloadrequest.pro delete mode 100644 tests/auto/widgets/qwebenginehistory/qwebenginehistory.pro delete mode 100644 tests/auto/widgets/qwebenginehistory/tst_qwebenginehistory.qrc delete mode 100644 tests/auto/widgets/qwebenginepage/qwebenginepage.pro delete mode 100644 tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc delete mode 100644 tests/auto/widgets/qwebengineprofile/qwebengineprofile.pro delete mode 100644 tests/auto/widgets/qwebenginescript/qwebenginescript.pro delete mode 100644 tests/auto/widgets/qwebenginescript/tst_qwebenginescript.qrc delete mode 100644 tests/auto/widgets/qwebengineview/qwebengineview.pro delete mode 100644 tests/auto/widgets/qwebengineview/tst_qwebengineview.qrc delete mode 100644 tests/auto/widgets/schemes/schemes.pro delete mode 100644 tests/auto/widgets/shutdown/shutdown.pro delete mode 100644 tests/auto/widgets/spellchecking/spellchecking.pro delete mode 100644 tests/auto/widgets/spellchecking/tst_spellchecking.qrc delete mode 100644 tests/auto/widgets/tests.pri delete mode 100644 tests/auto/widgets/touchinput/touchinput.pro delete mode 100644 tests/auto/widgets/widgets.pro delete mode 100644 tests/tests.pro diff --git a/tests/auto/Info.plist.in b/tests/auto/Info.plist.in deleted file mode 100644 index e7f314042..000000000 --- a/tests/auto/Info.plist.in +++ /dev/null @@ -1,18 +0,0 @@ - - - - - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleExecutable - $${TARGET} - CFBundleIdentifier - org.qt-project.qt.tests.$${TARGET_HYPHENATED} - CFBundleName - $${TARGET} - LSUIElement - 0 - - diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro deleted file mode 100644 index 257c7b387..000000000 --- a/tests/auto/auto.pro +++ /dev/null @@ -1,26 +0,0 @@ - -include($$QTWEBENGINE_OUT_ROOT/src/buildtools/qtbuildtools-config.pri) -include($$QTWEBENGINE_OUT_ROOT/src/webenginequick/qtwebenginequick-config.pri) -include($$QTWEBENGINE_OUT_ROOT/src/webenginewidgets/qtwebenginewidgets-config.pri) -include($$QTWEBENGINE_OUT_ROOT/src/pdf/qtpdf-config.pri) -include($$QTWEBENGINE_OUT_ROOT/src/pdfwidgets/qtpdfwidgets-config.pri) - -QT_FOR_CONFIG += \ - buildtools-private \ - webenginecore-private \ - webenginequick-private \ - webenginewidgets-private \ - pdf-private \ - pdfwidgets-private - -TEMPLATE = subdirs - -qtConfig(build-qtwebengine-core):qtConfig(webengine-core-support) { - qtConfig(webengine-quick): SUBDIRS += quick - qtConfig(webengine-widgets): SUBDIRS += core widgets -} - -qtConfig(build-qtpdf):qtConfig(webengine-qtpdf-support) { - SUBDIRS += pdf -} - diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro deleted file mode 100644 index 51d30da67..000000000 --- a/tests/auto/cmake/cmake.pro +++ /dev/null @@ -1,8 +0,0 @@ - -# Cause make to do nothing. -TEMPLATE = subdirs - -CMAKE_QT_MODULES_UNDER_TEST = webengine -qtHaveModule(widgets): CMAKE_QT_MODULES_UNDER_TEST += webenginewidgets - -CONFIG += ctest_testcase 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) diff --git a/tests/auto/embed_info_plist.pri b/tests/auto/embed_info_plist.pri deleted file mode 100644 index cca93c35e..000000000 --- a/tests/auto/embed_info_plist.pri +++ /dev/null @@ -1,13 +0,0 @@ -macos { - CONFIG -= app_bundle - - # QTBUG-57354 embed Info.plist so that certain fonts can be found in non-bundle apps - out_info = $$OUT_PWD/Info.plist - embed_info_plist.input = $$PWD/Info.plist.in - embed_info_plist.output = $$out_info - TARGET_HYPHENATED = $$replace(TARGET, [^a-zA-Z0-9-.], -) - QMAKE_SUBSTITUTES += embed_info_plist - QMAKE_LFLAGS += -Wl,-sectcreate,__TEXT,__info_plist,$$shell_quote($$out_info) - PRE_TARGETDEPS += $$out_info - QMAKE_DISTCLEAN += $$out_info -} diff --git a/tests/auto/pdf/pdf.pro b/tests/auto/pdf/pdf.pro deleted file mode 100644 index a2b3fcff2..000000000 --- a/tests/auto/pdf/pdf.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS = \ - qpdfbookmarkmodel \ - qpdfpagenavigation \ - qpdfpagerenderer - -qtHaveModule(printsupport): SUBDIRS += qpdfdocument diff --git a/tests/auto/pdf/qpdfbookmarkmodel/qpdfbookmarkmodel.pro b/tests/auto/pdf/qpdfbookmarkmodel/qpdfbookmarkmodel.pro deleted file mode 100644 index 11a010637..000000000 --- a/tests/auto/pdf/qpdfbookmarkmodel/qpdfbookmarkmodel.pro +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG += testcase -TARGET = tst_qpdfbookmarkmodel -QT += pdf testlib network -macos:CONFIG -= app_bundle -SOURCES += tst_qpdfbookmarkmodel.cpp diff --git a/tests/auto/pdf/qpdfdocument/qpdfdocument.pro b/tests/auto/pdf/qpdfdocument/qpdfdocument.pro deleted file mode 100644 index 8382a25e3..000000000 --- a/tests/auto/pdf/qpdfdocument/qpdfdocument.pro +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG += testcase -TARGET = tst_qpdfdocument -QT += pdf printsupport testlib network -macx:CONFIG -= app_bundle -SOURCES += tst_qpdfdocument.cpp - diff --git a/tests/auto/pdf/qpdfpagenavigation/qpdfpagenavigation.pro b/tests/auto/pdf/qpdfpagenavigation/qpdfpagenavigation.pro deleted file mode 100644 index 8de99543f..000000000 --- a/tests/auto/pdf/qpdfpagenavigation/qpdfpagenavigation.pro +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG += testcase -TARGET = tst_qpdfpagenavigation -QT += pdf testlib network -macos:CONFIG -= app_bundle -SOURCES += tst_qpdfpagenavigation.cpp diff --git a/tests/auto/pdf/qpdfpagerenderer/qpdfpagerenderer.pro b/tests/auto/pdf/qpdfpagerenderer/qpdfpagerenderer.pro deleted file mode 100644 index 9ccb4e82c..000000000 --- a/tests/auto/pdf/qpdfpagerenderer/qpdfpagerenderer.pro +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG += testcase -TARGET = tst_qpdfpagerenderer -QT += pdf testlib network -macos:CONFIG -= app_bundle -SOURCES += tst_qpdfpagerenderer.cpp diff --git a/tests/auto/pdf/qpdfsearchmodel/qpdfsearchmodel.pro b/tests/auto/pdf/qpdfsearchmodel/qpdfsearchmodel.pro deleted file mode 100644 index 205fef175..000000000 --- a/tests/auto/pdf/qpdfsearchmodel/qpdfsearchmodel.pro +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG += testcase -TARGET = tst_qpdfsearchmodel -QT += pdf testlib network -macos:CONFIG -= app_bundle -SOURCES += tst_qpdfsearchmodel.cpp diff --git a/tests/auto/quick/dialogs/dialogs.pro b/tests/auto/quick/dialogs/dialogs.pro deleted file mode 100644 index 79952d8ee..000000000 --- a/tests/auto/quick/dialogs/dialogs.pro +++ /dev/null @@ -1,13 +0,0 @@ -include(../tests.pri) -QT += core-private webenginequick webenginequick-private - -HEADERS += \ - server.h \ - testhandler.h - -SOURCES += \ - server.cpp \ - testhandler.cpp - -RESOURCES += \ - dialogs.qrc diff --git a/tests/auto/quick/dialogs/dialogs.qrc b/tests/auto/quick/dialogs/dialogs.qrc deleted file mode 100644 index a0715dbce..000000000 --- a/tests/auto/quick/dialogs/dialogs.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - index.html - WebView.qml - - diff --git a/tests/auto/quick/inspectorserver/inspectorserver.pro b/tests/auto/quick/inspectorserver/inspectorserver.pro deleted file mode 100644 index 5110a3ae9..000000000 --- a/tests/auto/quick/inspectorserver/inspectorserver.pro +++ /dev/null @@ -1,4 +0,0 @@ -include(../tests.pri) -QT += webenginequick -QT_PRIVATE += core-private webenginequick-private webenginecore-private -DEFINES += IMPORT_DIR=\"\\\"$${ROOT_BUILD_DIR}$${QMAKE_DIR_SEP}imports\\\"\" diff --git a/tests/auto/quick/publicapi/publicapi.pro b/tests/auto/quick/publicapi/publicapi.pro deleted file mode 100644 index bb0e03f65..000000000 --- a/tests/auto/quick/publicapi/publicapi.pro +++ /dev/null @@ -1,3 +0,0 @@ -include(../tests.pri) -QT += webenginequick -QT_PRIVATE += core-private webenginequick-private webenginecore-private diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro deleted file mode 100644 index e5d4b26a1..000000000 --- a/tests/auto/quick/qmltests/qmltests.pro +++ /dev/null @@ -1,134 +0,0 @@ -include($$QTWEBENGINE_OUT_ROOT/src/webenginequick/qtwebenginequick-config.pri) # workaround for QTBUG-68093 -QT_FOR_CONFIG += webenginequick-private - -include(../tests.pri) - -QT += qmltest -DEFINES += QUICK_TEST_SOURCE_DIR=\\\"$$re_escape($$OUT_PWD$${QMAKE_DIR_SEP}webengine.qmltests)\\\" -IMPORTPATH += $$PWD/data - -QML_TESTS = \ - $$PWD/data/tst_action.qml \ - $$PWD/data/tst_activeFocusOnPress.qml \ - $$PWD/data/tst_audioMuted.qml \ - $$PWD/data/tst_contextMenu.qml \ - $$PWD/data/tst_desktopBehaviorLoadHtml.qml \ - $$PWD/data/tst_download.qml \ - $$PWD/data/tst_favicon.qml \ - $$PWD/data/tst_faviconDatabase.qml \ - $$PWD/data/tst_findText.qml \ - $$PWD/data/tst_focusOnNavigation.qml \ - $$PWD/data/tst_fullScreenRequest.qml \ - $$PWD/data/tst_geopermission.qml \ - $$PWD/data/tst_getUserMedia.qml \ - $$PWD/data/tst_inputMethod.qml \ - $$PWD/data/tst_javaScriptDialogs.qml - $$PWD/data/tst_keyboardEvents.qml \ - $$PWD/data/tst_keyboardModifierMapping.qml \ - $$PWD/data/tst_linkHovered.qml \ - $$PWD/data/tst_loadFail.qml \ - $$PWD/data/tst_loadHtml.qml \ - $$PWD/data/tst_loadProgress.qml \ - $$PWD/data/tst_loadRecursionCrash.qml \ - $$PWD/data/tst_loadUrl.qml \ - $$PWD/data/tst_mouseClick.qml \ - $$PWD/data/tst_mouseMove.qml \ - $$PWD/data/tst_navigationHistory.qml \ - $$PWD/data/tst_navigationRequested.qml \ - $$PWD/data/tst_newViewRequest.qml \ - $$PWD/data/tst_notification.qml \ - $$PWD/data/tst_profile.qml \ - $$PWD/data/tst_properties.qml \ - $$PWD/data/tst_runJavaScript.qml \ - $$PWD/data/tst_scrollPosition.qml \ - $$PWD/data/tst_settings.qml \ - $$PWD/data/tst_titleChanged.qml \ - $$PWD/data/tst_unhandledKeyEventPropagation.qml \ - $$PWD/data/tst_userScripts.qml \ - $$PWD/data/tst_viewSource.qml - -qtConfig(webengine-webchannel) { - QML_TESTS += $$PWD/data/tst_webchannel.qml -} - -qtConfig(ssl) { - include(../../shared/https.pri) - QML_TESTS += $$PWD/data/tst_certificateError.qml -} else { - include(../../shared/http.pri) -} - -qtHaveModule(quickcontrols) { - QML_TESTS += \ - $$PWD/data/tst_filePicker.qml -} - -OTHER_FILES += \ - $$PWD/data/TestWebEngineView.qml \ - $$PWD/data/accepttypes.html \ - $$PWD/data/alert.html \ - $$PWD/data/confirm.html \ - $$PWD/data/confirmclose.html \ - $$PWD/data/append-document-title.js \ - $$PWD/data/big-user-script.js \ - $$PWD/data/change-document-title.js \ - $$PWD/data/download.zip \ - $$PWD/data/directoryupload.html \ - $$PWD/data/favicon.html \ - $$PWD/data/favicon2.html \ - $$PWD/data/favicon-candidates-gray.html \ - $$PWD/data/favicon-misc.html \ - $$PWD/data/favicon-multi.html \ - $$PWD/data/favicon-multi-gray.html \ - $$PWD/data/favicon-single.html \ - $$PWD/data/favicon-shortcut.html \ - $$PWD/data/favicon-touch.html \ - $$PWD/data/favicon-unavailable.html \ - $$PWD/data/forms.html \ - $$PWD/data/geolocation.html \ - $$PWD/data/javascript.html \ - $$PWD/data/link.html \ - $$PWD/data/localStorage.html \ - $$PWD/data/multifileupload.html \ - $$PWD/data/redirect.html \ - $$PWD/data/script-with-metadata.js \ - $$PWD/data/singlefileupload.html \ - $$PWD/data/test1.html \ - $$PWD/data/test2.html \ - $$PWD/data/test3.html \ - $$PWD/data/test4.html \ - $$PWD/data/test-iframe.html \ - $$PWD/data/keyboardModifierMapping.html \ - $$PWD/data/keyboardEvents.html \ - $$PWD/data/titleupdate.js \ - $$PWD/data/icons/favicon.png \ - $$PWD/data/icons/gray128.png \ - $$PWD/data/icons/gray16.png \ - $$PWD/data/icons/gray255.png \ - $$PWD/data/icons/gray32.png \ - $$PWD/data/icons/gray64.png \ - $$PWD/data/icons/grayicons.ico \ - $$PWD/data/icons/qt144.png \ - $$PWD/data/icons/qt32.ico \ - $$PWD/data/icons/qtmulti.ico \ - $$PWD/data/icons/small-favicon.png \ - $$PWD/mock-delegates/TestParams/FilePickerParams.qml \ - $$PWD/mock-delegates/TestParams/JSDialogParams.qml \ - $$PWD/mock-delegates/TestParams/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 - -!build_pass:!isEmpty(QML_TESTS) { - for (file, QML_TESTS): QML_TESTS_CONTENT += "$${file}" - TEST_FILE = $$OUT_PWD/webengine.qmltests - write_file($$TEST_FILE, QML_TESTS_CONTENT) -} - -load(qt_build_paths) - diff --git a/tests/auto/quick/qquickwebenginedefaultsurfaceformat/qquickwebenginedefaultsurfaceformat.pro b/tests/auto/quick/qquickwebenginedefaultsurfaceformat/qquickwebenginedefaultsurfaceformat.pro deleted file mode 100644 index 092973032..000000000 --- a/tests/auto/quick/qquickwebenginedefaultsurfaceformat/qquickwebenginedefaultsurfaceformat.pro +++ /dev/null @@ -1,6 +0,0 @@ -include(../tests.pri) - -exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc -QT_PRIVATE += core-private webenginequick-private webenginecore-private - -HEADERS += ../shared/util.h diff --git a/tests/auto/quick/qquickwebengineview/qquickwebengineview.pro b/tests/auto/quick/qquickwebengineview/qquickwebengineview.pro deleted file mode 100644 index ba3737108..000000000 --- a/tests/auto/quick/qquickwebengineview/qquickwebengineview.pro +++ /dev/null @@ -1,6 +0,0 @@ -include(../tests.pri) - -exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc -QT_PRIVATE += core_private gui-private webenginequick-private webenginecore-private - -HEADERS += ../shared/util.h diff --git a/tests/auto/quick/qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro b/tests/auto/quick/qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro deleted file mode 100644 index be6296f5e..000000000 --- a/tests/auto/quick/qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro +++ /dev/null @@ -1,4 +0,0 @@ -include(../tests.pri) -CONFIG -= testcase # remove, once this passes in the CI -exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc -QT_PRIVATE += webenginequick-private gui-private webenginecore-private diff --git a/tests/auto/quick/qtbug-70248/qtbug-70248.pro b/tests/auto/quick/qtbug-70248/qtbug-70248.pro deleted file mode 100644 index 7223dcfa0..000000000 --- a/tests/auto/quick/qtbug-70248/qtbug-70248.pro +++ /dev/null @@ -1,5 +0,0 @@ -include(../tests.pri) -QT += webenginequick webenginequick-private - -RESOURCES += \ - test.qrc diff --git a/tests/auto/quick/qtbug-70248/test.qrc b/tests/auto/quick/qtbug-70248/test.qrc deleted file mode 100644 index 83fea5eb0..000000000 --- a/tests/auto/quick/qtbug-70248/test.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - test.qml - - diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro deleted file mode 100644 index 13e4d78cc..000000000 --- a/tests/auto/quick/quick.pro +++ /dev/null @@ -1,16 +0,0 @@ -include($$QTWEBENGINE_OUT_ROOT/src/webenginequick/qtwebenginequick-config.pri) # workaround for QTBUG-68093 -QT_FOR_CONFIG += webenginequick-private - -TEMPLATE = subdirs - -SUBDIRS += \ - dialogs \ - inspectorserver \ - qmltests \ - publicapi \ - qquickwebenginedefaultsurfaceformat \ - qquickwebengineviewgraphics \ - qquickwebengineview \ - qtbug-70248 - -boot2qt: SUBDIRS -= inspectorserver qquickwebengineview qmltests diff --git a/tests/auto/quick/tests.pri b/tests/auto/quick/tests.pri deleted file mode 100644 index 8cf4c0af5..000000000 --- a/tests/auto/quick/tests.pri +++ /dev/null @@ -1,20 +0,0 @@ -include($$QTWEBENGINE_OUT_ROOT/src/webenginequick/qtwebenginequick-config.pri) # workaround for QTBUG-68093 -QT_FOR_CONFIG += webenginequick-private - -TEMPLATE = app - -CONFIG += testcase - -VPATH += $$_PRO_FILE_PWD_ -TARGET = tst_$$TARGET - -SOURCES += $${TARGET}.cpp -INCLUDEPATH += \ - $$PWD \ - ../shared - -QT += testlib network quick webenginequick - -# 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) diff --git a/tests/auto/shared/http.pri b/tests/auto/shared/http.pri deleted file mode 100644 index 7182bcbb0..000000000 --- a/tests/auto/shared/http.pri +++ /dev/null @@ -1,4 +0,0 @@ -HEADERS += $$PWD/httpserver.h $$PWD/httpreqrep.h -SOURCES += $$PWD/httpserver.cpp $$PWD/httpreqrep.cpp -INCLUDEPATH += $$PWD -DEFINES += TESTS_SHARED_DATA_DIR=\\\"$$re_escape($$PWD$${QMAKE_DIR_SEP}data)\\\" diff --git a/tests/auto/shared/https.pri b/tests/auto/shared/https.pri deleted file mode 100644 index ce4c147f7..000000000 --- a/tests/auto/shared/https.pri +++ /dev/null @@ -1,4 +0,0 @@ -include($$PWD/http.pri) - -HEADERS += $$PWD/httpsserver.h -RESOURCES += $$PWD/httpsserver.qrc diff --git a/tests/auto/shared/httpsserver.qrc b/tests/auto/shared/httpsserver.qrc deleted file mode 100644 index ec57a1983..000000000 --- a/tests/auto/shared/httpsserver.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - resources/cert.pem - resources/key.pem - - diff --git a/tests/auto/widgets/accessibility/accessibility.pro b/tests/auto/widgets/accessibility/accessibility.pro deleted file mode 100644 index e99c7f493..000000000 --- a/tests/auto/widgets/accessibility/accessibility.pro +++ /dev/null @@ -1 +0,0 @@ -include(../tests.pri) diff --git a/tests/auto/widgets/defaultsurfaceformat/defaultsurfaceformat.pro b/tests/auto/widgets/defaultsurfaceformat/defaultsurfaceformat.pro deleted file mode 100644 index e99c7f493..000000000 --- a/tests/auto/widgets/defaultsurfaceformat/defaultsurfaceformat.pro +++ /dev/null @@ -1 +0,0 @@ -include(../tests.pri) diff --git a/tests/auto/widgets/defaultsurfaceformat/tst_defaultsurfaceformat.qrc b/tests/auto/widgets/defaultsurfaceformat/tst_defaultsurfaceformat.qrc deleted file mode 100644 index 3d5f1b3b2..000000000 --- a/tests/auto/widgets/defaultsurfaceformat/tst_defaultsurfaceformat.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - resources/index.html - - diff --git a/tests/auto/widgets/favicon/favicon.pro b/tests/auto/widgets/favicon/favicon.pro deleted file mode 100644 index e99c7f493..000000000 --- a/tests/auto/widgets/favicon/favicon.pro +++ /dev/null @@ -1 +0,0 @@ -include(../tests.pri) diff --git a/tests/auto/widgets/favicon/tst_favicon.qrc b/tests/auto/widgets/favicon/tst_favicon.qrc deleted file mode 100644 index a352f8a83..000000000 --- a/tests/auto/widgets/favicon/tst_favicon.qrc +++ /dev/null @@ -1,14 +0,0 @@ - - - resources/favicon-misc.html - resources/favicon-multi.html - resources/favicon-shortcut.html - resources/favicon-single.html - resources/favicon-touch.html - resources/favicon-unavailable.html - resources/icons/qt144.png - resources/icons/qt32.ico - resources/icons/qtmulti.ico - resources/test1.html - - diff --git a/tests/auto/widgets/loadsignals/loadsignals.pro b/tests/auto/widgets/loadsignals/loadsignals.pro deleted file mode 100644 index 9c239f1a7..000000000 --- a/tests/auto/widgets/loadsignals/loadsignals.pro +++ /dev/null @@ -1,2 +0,0 @@ -include(../tests.pri) -include(../../shared/http.pri) diff --git a/tests/auto/widgets/loadsignals/tst_loadsignals.qrc b/tests/auto/widgets/loadsignals/tst_loadsignals.qrc deleted file mode 100644 index b4ee36676..000000000 --- a/tests/auto/widgets/loadsignals/tst_loadsignals.qrc +++ /dev/null @@ -1,13 +0,0 @@ - - - ../../shared/data/loadprogress/page1.html - ../../shared/data/loadprogress/page2.html - ../../shared/data/loadprogress/page3.html - ../../shared/data/loadprogress/page4.html - ../../shared/data/loadprogress/page5.html - ../../shared/data/loadprogress/page6.html - ../../shared/data/loadprogress/page7.html - ../../shared/data/loadprogress/page8.html - ../../shared/data/loadprogress/downloadable.tar.gz - - diff --git a/tests/auto/widgets/offscreen/offscreen.pro b/tests/auto/widgets/offscreen/offscreen.pro deleted file mode 100644 index 2469f9a53..000000000 --- a/tests/auto/widgets/offscreen/offscreen.pro +++ /dev/null @@ -1,6 +0,0 @@ -include(../tests.pri) -QT += webenginewidgets -qpa.name = QT_QPA_PLATFORM -qpa.value = offscreen -QT_TOOL_ENV += qpa - diff --git a/tests/auto/widgets/offscreen/tst_offscreen.qrc b/tests/auto/widgets/offscreen/tst_offscreen.qrc deleted file mode 100644 index 8a998fe85..000000000 --- a/tests/auto/widgets/offscreen/tst_offscreen.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - test.html - - - diff --git a/tests/auto/widgets/printing/printing.pro b/tests/auto/widgets/printing/printing.pro deleted file mode 100644 index 92f5d611c..000000000 --- a/tests/auto/widgets/printing/printing.pro +++ /dev/null @@ -1,10 +0,0 @@ -include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri) # workaround for QTBUG-68093 -QT_FOR_CONFIG += webenginecore-private - -include(../tests.pri) -QT *= core-private webenginecore-private - -qtConfig(webengine-poppler-cpp) { - CONFIG += link_pkgconfig - PKGCONFIG += poppler-cpp -} diff --git a/tests/auto/widgets/printing/tst_printing.qrc b/tests/auto/widgets/printing/tst_printing.qrc deleted file mode 100644 index b1795ef8a..000000000 --- a/tests/auto/widgets/printing/tst_printing.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - resources/basic_printing_page.html - - diff --git a/tests/auto/widgets/proxy/proxy.pro b/tests/auto/widgets/proxy/proxy.pro deleted file mode 100644 index ce4ccbfcb..000000000 --- a/tests/auto/widgets/proxy/proxy.pro +++ /dev/null @@ -1,9 +0,0 @@ -include(../tests.pri) -QT += core-private webenginewidgets webenginewidgets-private - -HEADERS += \ - proxy_server.h - -SOURCES += \ - proxy_server.cpp - diff --git a/tests/auto/widgets/proxypac/proxypac.pri b/tests/auto/widgets/proxypac/proxypac.pri deleted file mode 100644 index f9f23da6f..000000000 --- a/tests/auto/widgets/proxypac/proxypac.pri +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = app -CONFIG += testcase -QT += testlib network webenginewidgets webenginecore -HEADERS += $$PWD/proxyserver.h -SOURCES += $$PWD/proxyserver.cpp $$PWD/tst_proxypac.cpp diff --git a/tests/auto/widgets/proxypac/proxypac.pro b/tests/auto/widgets/proxypac/proxypac.pro deleted file mode 100644 index f2a43d41f..000000000 --- a/tests/auto/widgets/proxypac/proxypac.pro +++ /dev/null @@ -1,4 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = proxypac_file proxypac_qrc -CONFIG += ordered - diff --git a/tests/auto/widgets/proxypac/proxypac.qrc b/tests/auto/widgets/proxypac/proxypac.qrc deleted file mode 100644 index 9047585a0..000000000 --- a/tests/auto/widgets/proxypac/proxypac.qrc +++ /dev/null @@ -1,7 +0,0 @@ - - - - proxy.pac - - - diff --git a/tests/auto/widgets/proxypac/proxypac_file/proxypac_file.pro b/tests/auto/widgets/proxypac/proxypac_file/proxypac_file.pro deleted file mode 100644 index 037123054..000000000 --- a/tests/auto/widgets/proxypac/proxypac_file/proxypac_file.pro +++ /dev/null @@ -1,9 +0,0 @@ -include(../proxypac.pri) - -proxy_pac.name = QTWEBENGINE_CHROMIUM_FLAGS -win32:proxy_pac.value = --proxy-pac-url="file:///$$PWD/../proxy.pac" -else:proxy_pac.value = --proxy-pac-url="file://$$PWD/../proxy.pac" -boot2qt:proxy_pac.value = "--single-process --no-sandbox --proxy-pac-url=file://$$PWD/../proxy.pac" - -QT_TOOL_ENV += proxy_pac - diff --git a/tests/auto/widgets/proxypac/proxypac_qrc/proxypac_qrc.pro b/tests/auto/widgets/proxypac/proxypac_qrc/proxypac_qrc.pro deleted file mode 100644 index a5ab64605..000000000 --- a/tests/auto/widgets/proxypac/proxypac_qrc/proxypac_qrc.pro +++ /dev/null @@ -1,7 +0,0 @@ -include(../proxypac.pri) - -proxy_pac.name = QTWEBENGINE_CHROMIUM_FLAGS -proxy_pac.value = --proxy-pac-url="qrc:///proxy.pac" -boot2qt:proxy_pac.value = "--single-process --no-sandbox --proxy-pac-url=qrc:///proxy.pac" -QT_TOOL_ENV += proxy_pac -RESOURCES+= $$PWD/../proxypac.qrc diff --git a/tests/auto/widgets/qwebenginedownloadrequest/qwebenginedownloadrequest.pro b/tests/auto/widgets/qwebenginedownloadrequest/qwebenginedownloadrequest.pro deleted file mode 100644 index 18a66c466..000000000 --- a/tests/auto/widgets/qwebenginedownloadrequest/qwebenginedownloadrequest.pro +++ /dev/null @@ -1,3 +0,0 @@ -include(../tests.pri) -include(../../shared/http.pri) -QT *= core-private diff --git a/tests/auto/widgets/qwebenginehistory/qwebenginehistory.pro b/tests/auto/widgets/qwebenginehistory/qwebenginehistory.pro deleted file mode 100644 index e99c7f493..000000000 --- a/tests/auto/widgets/qwebenginehistory/qwebenginehistory.pro +++ /dev/null @@ -1 +0,0 @@ -include(../tests.pri) diff --git a/tests/auto/widgets/qwebenginehistory/tst_qwebenginehistory.qrc b/tests/auto/widgets/qwebenginehistory/tst_qwebenginehistory.qrc deleted file mode 100644 index cdfe575a0..000000000 --- a/tests/auto/widgets/qwebenginehistory/tst_qwebenginehistory.qrc +++ /dev/null @@ -1,10 +0,0 @@ - - - resources/page1.html - resources/page2.html - resources/page3.html - resources/page4.html - resources/page5.html - resources/page6.html - - diff --git a/tests/auto/widgets/qwebenginepage/qwebenginepage.pro b/tests/auto/widgets/qwebenginepage/qwebenginepage.pro deleted file mode 100644 index 18a66c466..000000000 --- a/tests/auto/widgets/qwebenginepage/qwebenginepage.pro +++ /dev/null @@ -1,3 +0,0 @@ -include(../tests.pri) -include(../../shared/http.pri) -QT *= core-private diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc deleted file mode 100644 index 3480341e8..000000000 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc +++ /dev/null @@ -1,32 +0,0 @@ - - - resources/content.html - resources/dynamicFrame.html - resources/index.html - resources/frame_a.html - resources/frame_c.html - resources/iframe.html - resources/iframe2.html - resources/iframe3.html - resources/framedindex.html - resources/fullscreen.html - resources/script.html - resources/user.css - resources/image.png - resources/pasteimage.html - resources/redirect.html - resources/reload.html - resources/style.css - resources/test1.html - resources/test2.html - resources/testiframe.html - resources/testiframe2.html - resources/foo.txt - resources/bar.txt - resources/path with spaces.txt - resources/lifecycle.html - - - ../../shared/data/notification.html - - diff --git a/tests/auto/widgets/qwebengineprofile/qwebengineprofile.pro b/tests/auto/widgets/qwebengineprofile/qwebengineprofile.pro deleted file mode 100644 index ca16cee39..000000000 --- a/tests/auto/widgets/qwebengineprofile/qwebengineprofile.pro +++ /dev/null @@ -1,4 +0,0 @@ -include(../tests.pri) -include(../../shared/http.pri) -exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc -QT *= core-private gui-private diff --git a/tests/auto/widgets/qwebenginescript/qwebenginescript.pro b/tests/auto/widgets/qwebenginescript/qwebenginescript.pro deleted file mode 100644 index e99c7f493..000000000 --- a/tests/auto/widgets/qwebenginescript/qwebenginescript.pro +++ /dev/null @@ -1 +0,0 @@ -include(../tests.pri) diff --git a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.qrc b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.qrc deleted file mode 100644 index 3290cb588..000000000 --- a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.qrc +++ /dev/null @@ -1,11 +0,0 @@ - - - resources/test_iframe_main.html - resources/test_iframe_outer.html - resources/test_iframe_inner.html - resources/test_window_open.html - resources/title_a.html - resources/title_b.html - resources/webChannelWithBadString.html - - diff --git a/tests/auto/widgets/qwebengineview/qwebengineview.pro b/tests/auto/widgets/qwebengineview/qwebengineview.pro deleted file mode 100644 index d91c0074b..000000000 --- a/tests/auto/widgets/qwebengineview/qwebengineview.pro +++ /dev/null @@ -1,2 +0,0 @@ -include(../tests.pri) -QT *= gui-private diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.qrc b/tests/auto/widgets/qwebengineview/tst_qwebengineview.qrc deleted file mode 100644 index a0e81e242..000000000 --- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.qrc +++ /dev/null @@ -1,11 +0,0 @@ - - - resources/index.html - resources/frame_a.html - resources/input_types.html - resources/scrolltest_page.html - resources/keyboardEvents.html - resources/image2.png - resources/dummy.html - - diff --git a/tests/auto/widgets/schemes/schemes.pro b/tests/auto/widgets/schemes/schemes.pro deleted file mode 100644 index e56bbe8f7..000000000 --- a/tests/auto/widgets/schemes/schemes.pro +++ /dev/null @@ -1,3 +0,0 @@ -include(../tests.pri) -exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc -QT *= core-private gui-private diff --git a/tests/auto/widgets/shutdown/shutdown.pro b/tests/auto/widgets/shutdown/shutdown.pro deleted file mode 100644 index e99c7f493..000000000 --- a/tests/auto/widgets/shutdown/shutdown.pro +++ /dev/null @@ -1 +0,0 @@ -include(../tests.pri) diff --git a/tests/auto/widgets/spellchecking/spellchecking.pro b/tests/auto/widgets/spellchecking/spellchecking.pro deleted file mode 100644 index a36c82e20..000000000 --- a/tests/auto/widgets/spellchecking/spellchecking.pro +++ /dev/null @@ -1,24 +0,0 @@ -include(../tests.pri) - -DISTFILES += \ - dict/en-US.dic \ - dict/en-US.aff \ - dict/de-DE.dic \ - dict/de-DE.aff \ - -qtPrepareTool(CONVERT_TOOL, qwebengine_convert_dict) - -debug_and_release { - CONFIG(debug, debug|release): DICTIONARIES_DIR = debug/qtwebengine_dictionaries - else: DICTIONARIES_DIR = release/qtwebengine_dictionaries -} else { - DICTIONARIES_DIR = qtwebengine_dictionaries -} - -dict.files = $$PWD/dict/en-US.dic $$PWD/dict/de-DE.dic -dictoolbuild.input = dict.files -dictoolbuild.output = $${DICTIONARIES_DIR}/${QMAKE_FILE_BASE}.bdic -dictoolbuild.commands = $${CONVERT_TOOL} ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} -dictoolbuild.name = Build ${QMAKE_FILE_IN_BASE} -dictoolbuild.CONFIG = no_link target_predeps -QMAKE_EXTRA_COMPILERS += dictoolbuild diff --git a/tests/auto/widgets/spellchecking/tst_spellchecking.qrc b/tests/auto/widgets/spellchecking/tst_spellchecking.qrc deleted file mode 100644 index 505b932c7..000000000 --- a/tests/auto/widgets/spellchecking/tst_spellchecking.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - resources/index.html - - diff --git a/tests/auto/widgets/tests.pri b/tests/auto/widgets/tests.pri deleted file mode 100644 index e69820ffe..000000000 --- a/tests/auto/widgets/tests.pri +++ /dev/null @@ -1,21 +0,0 @@ -include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri) # workaround for QTBUG-68093 -QT_FOR_CONFIG += webenginecore-private - -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 webenginewidgets widgets quick quickwidgets - -# 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) diff --git a/tests/auto/widgets/touchinput/touchinput.pro b/tests/auto/widgets/touchinput/touchinput.pro deleted file mode 100644 index d91c0074b..000000000 --- a/tests/auto/widgets/touchinput/touchinput.pro +++ /dev/null @@ -1,2 +0,0 @@ -include(../tests.pri) -QT *= gui-private diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro deleted file mode 100644 index b793ce69e..000000000 --- a/tests/auto/widgets/widgets.pro +++ /dev/null @@ -1,47 +0,0 @@ -include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri) # workaround for QTBUG-68093 -QT_FOR_CONFIG += webenginecore webenginecore-private - -TEMPLATE = subdirs - -SUBDIRS += \ - defaultsurfaceformat \ - faviconmanager \ - loadsignals \ - offscreen \ - proxy \ - proxypac \ - schemes \ - shutdown \ - qwebenginedownloadrequest \ - qwebenginepage \ - qwebenginehistory \ - qwebengineprofile \ - qwebenginescript \ - qwebengineview - -# Synthetic touch events are not supported on macOS -!macos: SUBDIRS += touchinput - -qtConfig(accessibility) { - SUBDIRS += accessibility -} - -qtConfig(webengine-printing-and-pdf) { - SUBDIRS += printing -} - -qtConfig(webengine-spellchecker):!cross_compile { - !qtConfig(webengine-native-spellchecker) { - SUBDIRS += spellchecking - } else { - message("Spellcheck test will not be built because it depends on usage of Hunspell dictionaries.") - } -} - -# QTBUG-60268 -boot2qt: SUBDIRS -= accessibility defaultsurfaceformat devtools \ - qwebenginepage \ - qwebengineprofile \ - qwebengineview - -darwin|win32: SUBDIRS -= offscreen diff --git a/tests/tests.pro b/tests/tests.pro deleted file mode 100644 index cb7d78798..000000000 --- a/tests/tests.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += auto - -qtHaveModule(webengine-quick) { - SUBDIRS += quicktestbrowser -} -- cgit v1.2.3