Enable most qmltests without testsupport

Move the qmltests that require testsupport to qmltests2, this enables
us to run most of the tests on CI configurations that isn't developer-
builds.

Change-Id: Ie0ba060632b36cbd738d6ede512a6a5f35880ae3
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

57 files changed, 313 insertions, 67 deletions

diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro
index 071795d96..0b3ff7c7e 100644
--- a/tests/auto/quick/qmltests/qmltests.pro
+++ b/tests/auto/quick/qmltests/qmltests.pro
@@ -6,31 +6,17 @@ IMPORTPATH += $$PWD/data
 
 OTHER_FILES += \
     $$PWD/data/TestWebEngineView.qml \
-    $$PWD/data/accepttypes.html \
-    $$PWD/data/alert.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/confirm.html \
-    $$PWD/data/confirmclose.html \
     $$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/prompt.html \
     $$PWD/data/multifileupload.html \
     $$PWD/data/redirect.html \
     $$PWD/data/script-with-metadata.js \
@@ -48,22 +34,15 @@ OTHER_FILES += \
     $$PWD/data/tst_contextMenu.qml \
     $$PWD/data/tst_desktopBehaviorLoadHtml.qml \
     $$PWD/data/tst_download.qml \
-    $$PWD/data/tst_favicon.qml \
-    $$PWD/data/tst_faviconDownload.qml \
     $$PWD/data/tst_filePicker.qml \
     $$PWD/data/tst_findText.qml \
     $$PWD/data/tst_focusOnNavigation.qml \
     $$PWD/data/tst_geopermission.qml \
     $$PWD/data/tst_getUserMedia.qml \
-    $$PWD/data/tst_inputMethod.qml \
-    $$PWD/data/tst_javaScriptDialogs.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 \
@@ -83,45 +62,6 @@ OTHER_FILES += \
     $$PWD/data/tst_keyboardEvents.qml \
     $$PWD/data/webchannel-test.html \
     $$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/small-favicon.png \
-    $$PWD/data/icons/qt144.png \
-    $$PWD/data/icons/qt32.ico \
-    $$PWD/data/icons/qtmulti.ico \
-    $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/AlertDialog.qml \
-    $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/ConfirmDialog.qml \
-    $$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/PromptDialog.qml \
-    $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/qmldir \
-    $$PWD/mock-delegates/TestParams/FilePickerParams.qml \
-    $$PWD/mock-delegates/TestParams/JSDialogParams.qml \
-    $$PWD/mock-delegates/TestParams/qmldir \
 
 load(qt_build_paths)
 DEFINES += QUICK_TEST_SOURCE_DIR=\\\"$$re_escape($$PWD$${QMAKE_DIR_SEP}data)\\\"
-
-!qtConfig(webengine-testsupport) {
-    PLUGIN_EXTENSION = .so
-    PLUGIN_PREFIX = lib
-    osx: PLUGIN_PREFIX = .dylib
-    win32 {
-        PLUGIN_EXTENSION = .dll
-        PLUGIN_PREFIX =
-    }
-
-    TESTSUPPORT_MODULE = $$shell_path($$[QT_INSTALL_QML]/QtWebEngine/testsupport/$${PLUGIN_PREFIX}qtwebenginetestsupportplugin$${PLUGIN_EXTENSION})
-    BUILD_DIR = $$shell_path($$clean_path($$OUT_PWD/../../../..))
-    SRC_DIR = $$shell_path($$clean_path($$PWD/../../../..))
-
-    warning("QML Test Support API is disabled. This means some QML tests that use Test Support API will fail.")
-    warning("Use the following command to build Test Support module and rebuild WebEngineView API:")
-    warning("cd $$BUILD_DIR && qmake -r $$shell_path($$SRC_DIR/qtwebengine.pro -- --feature-testsupport=yes) && make -C $$shell_path($$BUILD_DIR/src/webengine) clean && make")
-    warning("After performing the command above make sure QML module \"QtWebEngine.testsupport\" is deployed at $$TESTSUPPORT_MODULE")
-}
diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp
index d70a43895..9e8d25222 100644
--- a/tests/auto/quick/qmltests/tst_qmltests.cpp
+++ b/tests/auto/quick/qmltests/tst_qmltests.cpp
@@ -122,8 +122,6 @@ int main(int argc, char **argv)
     sigaction(SIGSEGV, &sigAction, 0);
 #endif
 
-    // Inject the mock ui delegates module
-    qputenv("QML2_IMPORT_PATH", QByteArray(TESTS_SOURCE_DIR "qmltests/mock-delegates"));
     QScopedPointer<Application> app;
 
     // Force to use English language for testing due to error message checks
diff --git a/tests/auto/quick/qmltests/data/accepttypes.html b/tests/auto/quick/qmltests2/data/accepttypes.html
index aff39f96e..aff39f96e 100644
--- a/tests/auto/quick/qmltests/data/accepttypes.html
+++ b/tests/auto/quick/qmltests2/data/accepttypes.html
diff --git a/tests/auto/quick/qmltests/data/alert.html b/tests/auto/quick/qmltests2/data/alert.html
index 89715a727..89715a727 100644
--- a/tests/auto/quick/qmltests/data/alert.html
+++ b/tests/auto/quick/qmltests2/data/alert.html
diff --git a/tests/auto/quick/qmltests/data/confirm.html b/tests/auto/quick/qmltests2/data/confirm.html
index a4fc5b532..a4fc5b532 100644
--- a/tests/auto/quick/qmltests/data/confirm.html
+++ b/tests/auto/quick/qmltests2/data/confirm.html
diff --git a/tests/auto/quick/qmltests/data/confirmclose.html b/tests/auto/quick/qmltests2/data/confirmclose.html
index c2acbb67f..c2acbb67f 100644
--- a/tests/auto/quick/qmltests/data/confirmclose.html
+++ b/tests/auto/quick/qmltests2/data/confirmclose.html
diff --git a/tests/auto/quick/qmltests/data/directoryupload.html b/tests/auto/quick/qmltests2/data/directoryupload.html
index adc408ebb..adc408ebb 100644
--- a/tests/auto/quick/qmltests/data/directoryupload.html
+++ b/tests/auto/quick/qmltests2/data/directoryupload.html
diff --git a/tests/auto/quick/qmltests/data/favicon-candidates-gray.html b/tests/auto/quick/qmltests2/data/favicon-candidates-gray.html
index ebea35b02..ebea35b02 100644
--- a/tests/auto/quick/qmltests/data/favicon-candidates-gray.html
+++ b/tests/auto/quick/qmltests2/data/favicon-candidates-gray.html
diff --git a/tests/auto/quick/qmltests/data/favicon-misc.html b/tests/auto/quick/qmltests2/data/favicon-misc.html
index 9e788bdf4..9e788bdf4 100644
--- a/tests/auto/quick/qmltests/data/favicon-misc.html
+++ b/tests/auto/quick/qmltests2/data/favicon-misc.html
diff --git a/tests/auto/quick/qmltests/data/favicon-multi-gray.html b/tests/auto/quick/qmltests2/data/favicon-multi-gray.html
index 24b71640f..24b71640f 100644
--- a/tests/auto/quick/qmltests/data/favicon-multi-gray.html
+++ b/tests/auto/quick/qmltests2/data/favicon-multi-gray.html
diff --git a/tests/auto/quick/qmltests/data/favicon-multi.html b/tests/auto/quick/qmltests2/data/favicon-multi.html
index cc5f3fd66..cc5f3fd66 100644
--- a/tests/auto/quick/qmltests/data/favicon-multi.html
+++ b/tests/auto/quick/qmltests2/data/favicon-multi.html
diff --git a/tests/auto/quick/qmltests/data/favicon-shortcut.html b/tests/auto/quick/qmltests2/data/favicon-shortcut.html
index 786cdb816..786cdb816 100644
--- a/tests/auto/quick/qmltests/data/favicon-shortcut.html
+++ b/tests/auto/quick/qmltests2/data/favicon-shortcut.html
diff --git a/tests/auto/quick/qmltests/data/favicon-single.html b/tests/auto/quick/qmltests2/data/favicon-single.html
index eb4675c75..eb4675c75 100644
--- a/tests/auto/quick/qmltests/data/favicon-single.html
+++ b/tests/auto/quick/qmltests2/data/favicon-single.html
diff --git a/tests/auto/quick/qmltests/data/favicon-touch.html b/tests/auto/quick/qmltests2/data/favicon-touch.html
index 271783434..271783434 100644
--- a/tests/auto/quick/qmltests/data/favicon-touch.html
+++ b/tests/auto/quick/qmltests2/data/favicon-touch.html
diff --git a/tests/auto/quick/qmltests/data/favicon-unavailable.html b/tests/auto/quick/qmltests2/data/favicon-unavailable.html
index c45664294..c45664294 100644
--- a/tests/auto/quick/qmltests/data/favicon-unavailable.html
+++ b/tests/auto/quick/qmltests2/data/favicon-unavailable.html
diff --git a/tests/auto/quick/qmltests2/data/favicon.html b/tests/auto/quick/qmltests2/data/favicon.html
new file mode 100644
index 000000000..e1b84a9cc
--- /dev/null
+++ b/tests/auto/quick/qmltests2/data/favicon.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+<link type="image/png" href="icons/favicon.png" sizes="48x48" rel="icon" />
+</head>
+<body>
+<p>It's expected that you see a favicon displayed for this page when you open it as a local file.</p>
+<p>The favicon looks like this:</p>
+<img id='image' src="icons/favicon.png"/>
+</body>
+</html>
diff --git a/tests/auto/quick/qmltests/data/favicon2.html b/tests/auto/quick/qmltests2/data/favicon2.html
index 81c2690fe..81c2690fe 100644
--- a/tests/auto/quick/qmltests/data/favicon2.html
+++ b/tests/auto/quick/qmltests2/data/favicon2.html
diff --git a/tests/auto/quick/qmltests2/data/icons/favicon.png b/tests/auto/quick/qmltests2/data/icons/favicon.png
new file mode 100644
index 000000000..35717cca5
--- /dev/null
+++ b/tests/auto/quick/qmltests2/data/icons/favicon.png
diff --git a/tests/auto/quick/qmltests/data/icons/gray128.png b/tests/auto/quick/qmltests2/data/icons/gray128.png
index bf1cfaba0..bf1cfaba0 100644
--- a/tests/auto/quick/qmltests/data/icons/gray128.png
+++ b/tests/auto/quick/qmltests2/data/icons/gray128.png
diff --git a/tests/auto/quick/qmltests/data/icons/gray16.png b/tests/auto/quick/qmltests2/data/icons/gray16.png
index 2a1a91a76..2a1a91a76 100644
--- a/tests/auto/quick/qmltests/data/icons/gray16.png
+++ b/tests/auto/quick/qmltests2/data/icons/gray16.png
diff --git a/tests/auto/quick/qmltests/data/icons/gray255.png b/tests/auto/quick/qmltests2/data/icons/gray255.png
index 549169551..549169551 100644
--- a/tests/auto/quick/qmltests/data/icons/gray255.png
+++ b/tests/auto/quick/qmltests2/data/icons/gray255.png
diff --git a/tests/auto/quick/qmltests/data/icons/gray32.png b/tests/auto/quick/qmltests2/data/icons/gray32.png
index b269a528f..b269a528f 100644
--- a/tests/auto/quick/qmltests/data/icons/gray32.png
+++ b/tests/auto/quick/qmltests2/data/icons/gray32.png
diff --git a/tests/auto/quick/qmltests/data/icons/gray64.png b/tests/auto/quick/qmltests2/data/icons/gray64.png
index e02559e5b..e02559e5b 100644
--- a/tests/auto/quick/qmltests/data/icons/gray64.png
+++ b/tests/auto/quick/qmltests2/data/icons/gray64.png
diff --git a/tests/auto/quick/qmltests/data/icons/grayicons.ico b/tests/auto/quick/qmltests2/data/icons/grayicons.ico
index 8d8fee839..8d8fee839 100644
--- a/tests/auto/quick/qmltests/data/icons/grayicons.ico
+++ b/tests/auto/quick/qmltests2/data/icons/grayicons.ico
diff --git a/tests/auto/quick/qmltests/data/icons/qt144.png b/tests/auto/quick/qmltests2/data/icons/qt144.png
index 050b1e066..050b1e066 100644
--- a/tests/auto/quick/qmltests/data/icons/qt144.png
+++ b/tests/auto/quick/qmltests2/data/icons/qt144.png
diff --git a/tests/auto/quick/qmltests/data/icons/qt32.ico b/tests/auto/quick/qmltests2/data/icons/qt32.ico
index 2f6fcb5bc..2f6fcb5bc 100644
--- a/tests/auto/quick/qmltests/data/icons/qt32.ico
+++ b/tests/auto/quick/qmltests2/data/icons/qt32.ico
diff --git a/tests/auto/quick/qmltests/data/icons/qtmulti.ico b/tests/auto/quick/qmltests2/data/icons/qtmulti.ico
index 81e5a22e8..81e5a22e8 100644
--- a/tests/auto/quick/qmltests/data/icons/qtmulti.ico
+++ b/tests/auto/quick/qmltests2/data/icons/qtmulti.ico
diff --git a/tests/auto/quick/qmltests/data/icons/small-favicon.png b/tests/auto/quick/qmltests2/data/icons/small-favicon.png
index 8cf9a50a4..8cf9a50a4 100644
--- a/tests/auto/quick/qmltests/data/icons/small-favicon.png
+++ b/tests/auto/quick/qmltests2/data/icons/small-favicon.png
diff --git a/tests/auto/quick/qmltests/data/multifileupload.html b/tests/auto/quick/qmltests2/data/multifileupload.html
index d41ea15c0..d41ea15c0 100644
--- a/tests/auto/quick/qmltests/data/multifileupload.html
+++ b/tests/auto/quick/qmltests2/data/multifileupload.html
diff --git a/tests/auto/quick/qmltests/data/prompt.html b/tests/auto/quick/qmltests2/data/prompt.html
index 3293c0dcf..3293c0dcf 100644
--- a/tests/auto/quick/qmltests/data/prompt.html
+++ b/tests/auto/quick/qmltests2/data/prompt.html
diff --git a/tests/auto/quick/qmltests/data/singlefileupload.html b/tests/auto/quick/qmltests2/data/singlefileupload.html
index ac91c2c0d..ac91c2c0d 100644
--- a/tests/auto/quick/qmltests/data/singlefileupload.html
+++ b/tests/auto/quick/qmltests2/data/singlefileupload.html
diff --git a/tests/auto/quick/qmltests2/data/test1.html b/tests/auto/quick/qmltests2/data/test1.html
new file mode 100644
index 000000000..5c09f06ed
--- /dev/null
+++ b/tests/auto/quick/qmltests2/data/test1.html
@@ -0,0 +1,6 @@
+<html>
+<head><title>Test page 1</title></head>
+<body>
+Hello.
+</body>
+</html>
diff --git a/tests/auto/quick/qmltests2/data/test2.html b/tests/auto/quick/qmltests2/data/test2.html
new file mode 100644
index 000000000..629c2a063
--- /dev/null
+++ b/tests/auto/quick/qmltests2/data/test2.html
@@ -0,0 +1,6 @@
+<html>
+<head><title>Test page with huge link area</title></head>
+<body>
+<a title="A title" href="test1.html"><img width=200 height=200></a>
+</body>
+</html>
diff --git a/tests/auto/quick/qmltests/data/titleupdate.js b/tests/auto/quick/qmltests2/data/titleupdate.js
index c86139c13..c86139c13 100644
--- a/tests/auto/quick/qmltests/data/titleupdate.js
+++ b/tests/auto/quick/qmltests2/data/titleupdate.js
diff --git a/tests/auto/quick/qmltests/data/tst_favicon.qml b/tests/auto/quick/qmltests2/data/tst_favicon.qml
index 50a412384..3f522d91a 100644
--- a/tests/auto/quick/qmltests/data/tst_favicon.qml
+++ b/tests/auto/quick/qmltests2/data/tst_favicon.qml
@@ -31,6 +31,7 @@ import QtTest 1.0
 import QtWebEngine 1.3
 import QtWebEngine.testsupport 1.0
 import QtQuick.Window 2.0
+import "../../qmltests/data" 1.0
 
 TestWebEngineView {
     id: webEngineView
diff --git a/tests/auto/quick/qmltests/data/tst_faviconDownload.qml b/tests/auto/quick/qmltests2/data/tst_faviconDownload.qml
index 406dfa3ea..9aa32279c 100644
--- a/tests/auto/quick/qmltests/data/tst_faviconDownload.qml
+++ b/tests/auto/quick/qmltests2/data/tst_faviconDownload.qml
@@ -29,6 +29,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtWebEngine 1.3
+import "../../qmltests/data" 1.0
 
 TestWebEngineView {
     id: webEngineView
diff --git a/tests/auto/quick/qmltests/data/tst_filePicker.qml b/tests/auto/quick/qmltests2/data/tst_filePicker.qml
index 15eadb2a1..ffd7ef87b 100644
--- a/tests/auto/quick/qmltests/data/tst_filePicker.qml
+++ b/tests/auto/quick/qmltests2/data/tst_filePicker.qml
@@ -29,6 +29,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtWebEngine 1.2
+import "../../qmltests/data" 1.0
 import "../mock-delegates/TestParams" 1.0
 
 TestWebEngineView {
@@ -68,7 +69,7 @@ TestWebEngineView {
 
         function cleanup() {
             // Test that the render process doesn't crash, and make sure if it does it does so now.
-            wait(1000)
+            wait(100)
             verify(terminationSpy.count == 0, "Render process didn't self terminate")
 
             // FIXME: Almost every second url loading progress does get stuck at about 90 percent, so the loadFinished signal won't arrive.
diff --git a/tests/auto/quick/qmltests/data/tst_inputMethod.qml b/tests/auto/quick/qmltests2/data/tst_inputMethod.qml
index c09a8bdd9..0bf9f7eb0 100644
--- a/tests/auto/quick/qmltests/data/tst_inputMethod.qml
+++ b/tests/auto/quick/qmltests2/data/tst_inputMethod.qml
@@ -30,6 +30,7 @@ import QtQuick 2.0
 import QtTest 1.0
 import QtWebEngine 1.4
 import QtWebEngine.testsupport 1.0
+import "../../qmltests/data" 1.0
 
 TestWebEngineView {
     id: webEngineView
diff --git a/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml b/tests/auto/quick/qmltests2/data/tst_javaScriptDialogs.qml
index 07236c3be..658071005 100644
--- a/tests/auto/quick/qmltests/data/tst_javaScriptDialogs.qml
+++ b/tests/auto/quick/qmltests2/data/tst_javaScriptDialogs.qml
@@ -30,6 +30,7 @@ import QtQuick 2.0
 import QtTest 1.0
 import QtWebEngine 1.2
 import QtWebEngine.testsupport 1.0
+import "../../qmltests/data" 1.0
 import "../mock-delegates/TestParams" 1.0
 
 TestWebEngineView {
diff --git a/tests/auto/quick/qmltests/data/tst_linkHovered.qml b/tests/auto/quick/qmltests2/data/tst_linkHovered.qml
index d632452fe..faf943c55 100644
--- a/tests/auto/quick/qmltests/data/tst_linkHovered.qml
+++ b/tests/auto/quick/qmltests2/data/tst_linkHovered.qml
@@ -30,6 +30,7 @@ import QtQuick 2.0
 import QtTest 1.0
 import QtWebEngine 1.2
 import QtWebEngine.testsupport 1.0
+import "../../qmltests/data" 1.0
 
 TestWebEngineView {
     id: webEngineView
diff --git a/tests/auto/quick/qmltests/data/tst_loadFail.qml b/tests/auto/quick/qmltests2/data/tst_loadFail.qml
index 7b51009a1..db412f252 100644
--- a/tests/auto/quick/qmltests/data/tst_loadFail.qml
+++ b/tests/auto/quick/qmltests2/data/tst_loadFail.qml
@@ -30,6 +30,7 @@ import QtQuick 2.0
 import QtTest 1.0
 import QtWebEngine 1.2
 import QtWebEngine.testsupport 1.0
+import "../../qmltests/data" 1.0
 
 TestWebEngineView {
     id: webEngineView
diff --git a/tests/auto/quick/qmltests/data/tst_mouseClick.qml b/tests/auto/quick/qmltests2/data/tst_mouseClick.qml
index d81e690fd..eaa012f86 100644
--- a/tests/auto/quick/qmltests/data/tst_mouseClick.qml
+++ b/tests/auto/quick/qmltests2/data/tst_mouseClick.qml
@@ -29,8 +29,8 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtWebEngine 1.4
-
 import QtWebEngine.testsupport 1.0
+import "../../qmltests/data" 1.0
 
 TestWebEngineView {
     id: webEngineView
diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/AlertDialog.qml b/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/AlertDialog.qml
index 4ba3be4b9..4ba3be4b9 100644
--- a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/AlertDialog.qml
+++ b/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/AlertDialog.qml
diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/ConfirmDialog.qml b/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/ConfirmDialog.qml
index 9933fc2f7..9933fc2f7 100644
--- a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/ConfirmDialog.qml
+++ b/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/ConfirmDialog.qml
diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/FilePicker.qml b/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/FilePicker.qml
index 745f533f5..745f533f5 100644
--- a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/FilePicker.qml
+++ b/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/FilePicker.qml
diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/Menu.qml b/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/Menu.qml
index 36efa7680..36efa7680 100644
--- a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/Menu.qml
+++ b/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/Menu.qml
diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/MenuItem.qml b/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/MenuItem.qml
index e61f4c230..e61f4c230 100644
--- a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/MenuItem.qml
+++ b/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/MenuItem.qml
diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/PromptDialog.qml b/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/PromptDialog.qml
index 7c5b16eab..7c5b16eab 100644
--- a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/PromptDialog.qml
+++ b/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/PromptDialog.qml
diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/qmldir b/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/qmldir
index cf8ac0512..cf8ac0512 100644
--- a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/Controls1Delegates/qmldir
+++ b/tests/auto/quick/qmltests2/mock-delegates/QtWebEngine/Controls1Delegates/qmldir
diff --git a/tests/auto/quick/qmltests/mock-delegates/TestParams/FilePickerParams.qml b/tests/auto/quick/qmltests2/mock-delegates/TestParams/FilePickerParams.qml
index 02b0da1d4..02b0da1d4 100644
--- a/tests/auto/quick/qmltests/mock-delegates/TestParams/FilePickerParams.qml
+++ b/tests/auto/quick/qmltests2/mock-delegates/TestParams/FilePickerParams.qml
diff --git a/tests/auto/quick/qmltests/mock-delegates/TestParams/JSDialogParams.qml b/tests/auto/quick/qmltests2/mock-delegates/TestParams/JSDialogParams.qml
index 70696803c..70696803c 100644
--- a/tests/auto/quick/qmltests/mock-delegates/TestParams/JSDialogParams.qml
+++ b/tests/auto/quick/qmltests2/mock-delegates/TestParams/JSDialogParams.qml
diff --git a/tests/auto/quick/qmltests/mock-delegates/TestParams/qmldir b/tests/auto/quick/qmltests2/mock-delegates/TestParams/qmldir
index a21dd8236..5807f1e6e 100644
--- a/tests/auto/quick/qmltests/mock-delegates/TestParams/qmldir
+++ b/tests/auto/quick/qmltests2/mock-delegates/TestParams/qmldir
@@ -2,4 +2,3 @@
 module TestParams
 singleton FilePickerParams 1.0 FilePickerParams.qml
 singleton JSDialogParams 1.0 JSDialogParams.qml
-
diff --git a/tests/auto/quick/qmltests2/qmltests2.pro b/tests/auto/quick/qmltests2/qmltests2.pro
new file mode 100644
index 000000000..4c7a8dc72
--- /dev/null
+++ b/tests/auto/quick/qmltests2/qmltests2.pro
@@ -0,0 +1,78 @@
+include(../tests.pri)
+
+QT += qmltest
+
+IMPORTPATH += $$PWD/data
+
+OTHER_FILES += \
+    $$PWD/data/accepttypes.html \
+    $$PWD/data/alert.html \
+    $$PWD/data/confirm.html \
+    $$PWD/data/confirmclose.html \
+    $$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/multifileupload.html \
+    $$PWD/data/prompt.html \
+    $$PWD/data/singlefileupload.html \
+    $$PWD/data/test1.html \
+    $$PWD/data/test2.html \
+    $$PWD/data/titleupdate.js \
+    $$PWD/data/tst_favicon.qml \
+    $$PWD/data/tst_faviconDownload.qml \
+    $$PWD/data/tst_inputMethod.qml \
+    $$PWD/data/tst_javaScriptDialogs.qml \
+    $$PWD/data/tst_linkHovered.qml \
+    $$PWD/data/tst_loadFail.qml \
+    $$PWD/data/tst_mouseClick.qml \
+    $$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/QtWebEngine/Controls1Delegates/AlertDialog.qml \
+    $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/ConfirmDialog.qml \
+    $$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/PromptDialog.qml \
+    $$PWD/mock-delegates/QtWebEngine/Controls1Delegates/qmldir \
+    $$PWD/mock-delegates/TestParams/FilePickerParams.qml \
+    $$PWD/mock-delegates/TestParams/JSDialogParams.qml \
+    $$PWD/mock-delegates/TestParams/qmldir \
+
+load(qt_build_paths)
+DEFINES += QUICK_TEST_SOURCE_DIR=\\\"$$re_escape($$PWD$${QMAKE_DIR_SEP}data)\\\"
+
+!qtConfig(webengine-testsupport) {
+    PLUGIN_EXTENSION = .so
+    PLUGIN_PREFIX = lib
+    osx: PLUGIN_PREFIX = .dylib
+    win32 {
+        PLUGIN_EXTENSION = .dll
+        PLUGIN_PREFIX =
+    }
+
+    TESTSUPPORT_MODULE = $$shell_path($$[QT_INSTALL_QML]/QtWebEngine/testsupport/$${PLUGIN_PREFIX}qtwebenginetestsupportplugin$${PLUGIN_EXTENSION})
+    BUILD_DIR = $$shell_path($$clean_path($$OUT_PWD/../../../..))
+    SRC_DIR = $$shell_path($$clean_path($$PWD/../../../..))
+
+    warning("QML Test Support API is disabled. This means some QML tests that use Test Support API will fail.")
+    warning("Use the following command to build Test Support module and rebuild WebEngineView API:")
+    warning("cd $$BUILD_DIR && qmake -r $$shell_path($$SRC_DIR/qtwebengine.pro -- --feature-testsupport=yes) && make -C $$shell_path($$BUILD_DIR/src/webengine) clean && make")
+    warning("After performing the command above make sure QML module \"QtWebEngine.testsupport\" is deployed at $$TESTSUPPORT_MODULE")
+}
diff --git a/tests/auto/quick/qmltests2/tst_qmltests2.cpp b/tests/auto/quick/qmltests2/tst_qmltests2.cpp
new file mode 100644
index 000000000..8c81ed7f5
--- /dev/null
+++ b/tests/auto/quick/qmltests2/tst_qmltests2.cpp
@@ -0,0 +1,127 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/QScopedPointer>
+#include <QtQuickTest/quicktest.h>
+#include <QtWebEngine/QQuickWebEngineProfile>
+#include "qt_webengine_quicktest.h"
+
+#if defined(Q_OS_LINUX) && defined(QT_DEBUG)
+#include <fcntl.h>
+#include <signal.h>
+#include <unistd.h>
+#endif
+
+#if defined(Q_OS_LINUX) && defined(QT_DEBUG)
+static bool debuggerPresent()
+{
+    int fd = open("/proc/self/status", O_RDONLY);
+    if (fd == -1)
+      return false;
+    char buffer[2048];
+    ssize_t size = read(fd, buffer, sizeof(buffer) - 1);
+    if (size == -1) {
+      close(fd);
+      return false;
+    }
+    buffer[size] = 0;
+    const char tracerPidToken[] = "\nTracerPid:";
+    char *tracerPid = strstr(buffer, tracerPidToken);
+    if (!tracerPid) {
+      close(fd);
+      return false;
+    }
+    tracerPid += sizeof(tracerPidToken);
+    long int pid = strtol(tracerPid, &tracerPid, 10);
+    close(fd);
+    return pid != 0;
+}
+
+static void stackTrace()
+{
+    bool ok = false;
+    const int disableStackDump = qEnvironmentVariableIntValue("QTEST_DISABLE_STACK_DUMP", &ok);
+    if (ok && disableStackDump == 1)
+        return;
+
+    if (debuggerPresent())
+        return;
+
+    fprintf(stderr, "\n========= Received signal, dumping stack ==============\n");
+    char cmd[512];
+    qsnprintf(cmd, 512, "gdb --pid %d 2>/dev/null <<EOF\n"
+                        "set prompt\n"
+                        "set height 0\n"
+                        "thread apply all where full\n"
+                        "detach\n"
+                        "quit\n"
+                        "EOF\n",
+                        (int)getpid());
+
+    if (system(cmd) == -1)
+        fprintf(stderr, "calling gdb failed\n");
+    fprintf(stderr, "========= End of stack trace ==============\n");
+}
+
+static void sigSegvHandler(int signum)
+{
+    stackTrace();
+    qFatal("Received signal %d", signum);
+}
+#endif
+
+int main(int argc, char **argv)
+{
+#if defined(Q_OS_LINUX) && defined(QT_DEBUG)
+    struct sigaction sigAction;
+
+    sigemptyset(&sigAction.sa_mask);
+    sigAction.sa_handler = &sigSegvHandler;
+    sigAction.sa_flags = 0;
+
+    sigaction(SIGSEGV, &sigAction, 0);
+#endif
+
+    // Inject the mock ui delegates module
+    qputenv("QML2_IMPORT_PATH", QByteArray(TESTS_SOURCE_DIR "qmltests2/mock-delegates"));
+    QScopedPointer<Application> app;
+
+    // Force to use English language for testing due to error message checks
+    QLocale::setDefault(QLocale("en"));
+
+    if (!QCoreApplication::instance()) {
+        app.reset(new Application(argc, argv));
+    }
+    QtWebEngine::initialize();
+    QQuickWebEngineProfile::defaultProfile()->setOffTheRecord(true);
+
+    QTEST_SET_MAIN_SOURCE_PATH
+
+    int i = quick_test_main(argc, argv, "qmltests2", QUICK_TEST_SOURCE_DIR);
+    return i;
+}
diff --git a/tests/auto/quick/qquickwebengineprofile/qquickwebengineprofile.pro b/tests/auto/quick/qquickwebengineprofile/qquickwebengineprofile.pro
new file mode 100644
index 000000000..e99c7f493
--- /dev/null
+++ b/tests/auto/quick/qquickwebengineprofile/qquickwebengineprofile.pro
@@ -0,0 +1 @@
+include(../tests.pri)
diff --git a/tests/auto/quick/qquickwebengineprofile/tst_qquickwebengineprofile.cpp b/tests/auto/quick/qquickwebengineprofile/tst_qquickwebengineprofile.cpp
new file mode 100644
index 000000000..db7c2ad6e
--- /dev/null
+++ b/tests/auto/quick/qquickwebengineprofile/tst_qquickwebengineprofile.cpp
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtQml/QQmlEngine>
+#include <QtTest/QtTest>
+#include <QtWebEngine/QQuickWebEngineProfile>
+
+class tst_QQuickWebEngineProfile : public QObject {
+    Q_OBJECT
+public:
+    tst_QQuickWebEngineProfile();
+
+    // TODO: Many tests missings
+    void usedForGlobalCertificateVerification();
+
+private Q_SLOTS:
+    void init();
+    void cleanup();
+};
+
+tst_QQuickWebEngineProfile::tst_QQuickWebEngineProfile()
+{
+    QtWebEngine::initialize();
+    QQuickWebEngineProfile::defaultProfile()->setOffTheRecord(true);
+}
+
+
+void tst_QQuickWebEngineProfile::init()
+{
+}
+
+void tst_QQuickWebEngineProfile::cleanup()
+{
+}
+
+void tst_QQuickWebEngineProfile::usedForGlobalCertificateVerification()
+{
+    QQuickWebEngineProfile *profile1 = new QQuickWebEngineProfile();
+    QQuickWebEngineProfile *profile2 = new QQuickWebEngineProfile();
+    QVERIFY(!profile1->isUsedForGlobalVerification());
+    QVERIFY(!profile2->isUsedForGlobalVerification());
+
+
+}
+
+
+QTEST_MAIN(tst_QQuickWebEngineProfile)
+#include "tst_qquickwebengineprofile.moc"
diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index 81b62b4e7..865ec718e 100644
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -6,6 +6,7 @@ TEMPLATE = subdirs
 SUBDIRS += \
     dialogs \
     inspectorserver \
+    qmltests \
     publicapi \
     qquickwebenginedefaultsurfaceformat \
     qquickwebengineview \
@@ -13,9 +14,9 @@ SUBDIRS += \
 
 qtConfig(webengine-testsupport) {
     SUBDIRS += \
-        qmltests \
+        qmltests2 \
         qquickwebengineviewgraphics
 }
 
 # QTBUG-66055
-boot2qt: SUBDIRS -= inspectorserver qquickwebengineview qmltests
+boot2qt: SUBDIRS -= inspectorserver qquickwebengineview qmltests qmltests2