Merge branch '5.12' into 5.13

Conflicts:
	src/3rdparty
	src/core/renderer/user_resource_controller.cpp
	src/core/web_contents_adapter.cpp
	src/webengine/doc/src/qtwebengine-overview.qdoc

Change-Id: I46be9d33b3b65d61dfa099ee72a3509afb9bd6a4

3 files changed, 51 insertions, 1 deletions

diff --git a/tests/auto/quick/dialogs/WebView.qml b/tests/auto/quick/dialogs/WebView.qml
index 6509071b8..4f8b7a0ce 100644
--- a/tests/auto/quick/dialogs/WebView.qml
+++ b/tests/auto/quick/dialogs/WebView.qml
@@ -59,6 +59,8 @@ Window {
         onLoadingChanged: function(reqeust) {
             if (reqeust.status === WebEngineView.LoadSucceededStatus) {
                 handler.ready = true
+            } else {
+                console.log("Wooohooo loading page from qrc failed !")
             }
         }
 
diff --git a/tests/auto/quick/dialogs/tst_dialogs.cpp b/tests/auto/quick/dialogs/tst_dialogs.cpp
index 26a0fe034..eee6b2bb6 100644
--- a/tests/auto/quick/dialogs/tst_dialogs.cpp
+++ b/tests/auto/quick/dialogs/tst_dialogs.cpp
@@ -116,7 +116,7 @@ void tst_Dialogs::colorDialogRequested()
 void tst_Dialogs::contextMenuRequested()
 {
     m_listner->load(QUrl("qrc:/index.html"));
-    QTRY_VERIFY(m_listner->ready());
+    QTRY_COMPARE_WITH_TIMEOUT(m_listner->ready(), true, 20000);
     QSignalSpy dialogSpy(m_listner, &TestHandler::requestChanged);
     QTest::mouseClick(m_widnow, Qt::RightButton);
     QTRY_COMPARE(dialogSpy.count(), 1);
@@ -226,6 +226,7 @@ void tst_Dialogs::javaScriptDialogRequested()
     QCOMPARE(dialog->type(), type);
     QCOMPARE(dialog->message(), message);
     QCOMPARE(dialog->defaultText(), defaultText);
+    QTRY_VERIFY(m_listner->ready()); // make sure javascript executes no longer
 }
 
 #include "tst_dialogs.moc"
diff --git a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
index 0fe0ec6cf..be9e59b8c 100644
--- a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
+++ b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
@@ -23,6 +23,7 @@
 #include <qwebengineprofile.h>
 #include <qwebenginescript.h>
 #include <qwebenginescriptcollection.h>
+#include <qwebenginesettings.h>
 #include <qwebengineview.h>
 #include "../util.h"
 #if QT_CONFIG(webengine_webchannel)
@@ -37,6 +38,8 @@ private Q_SLOTS:
     void loadEvents();
     void scriptWorld_data();
     void scriptWorld();
+    void scriptDisabled();
+    void viewSource();
     void scriptModifications();
 #if QT_CONFIG(webengine_webchannel)
     void webChannel_data();
@@ -218,6 +221,50 @@ void tst_QWebEngineScript::scriptWorld()
     QCOMPARE(evaluateJavaScriptSyncInWorld(&page, "typeof(userScriptTest) != \"undefined\" && userScriptTest == 1;", worldId), QVariant::fromValue(true));
 }
 
+// Based on QTBUG-74304
+void tst_QWebEngineScript::scriptDisabled()
+{
+    QWebEnginePage page;
+    page.settings()->setAttribute(QWebEngineSettings::JavascriptEnabled, false);
+    QWebEngineScript script;
+    script.setInjectionPoint(QWebEngineScript::DocumentCreation);
+    script.setWorldId(QWebEngineScript::MainWorld);
+    script.setSourceCode("var foo = 42");
+    page.scripts().insert(script);
+    page.load(QUrl("about:blank"));
+    QSignalSpy spy(&page, &QWebEnginePage::loadFinished);
+    QTRY_COMPARE(spy.count(), 1);
+    QCOMPARE(spy.takeFirst().value(0).toBool(), true);
+    // MainWorld scripts are disabled by the setting...
+    QCOMPARE(evaluateJavaScriptSyncInWorld(&page, "foo", QWebEngineScript::MainWorld), QVariant());
+    QCOMPARE(evaluateJavaScriptSyncInWorld(&page, "foo", QWebEngineScript::ApplicationWorld), QVariant());
+    script.setWorldId(QWebEngineScript::ApplicationWorld);
+    page.scripts().clear();
+    page.scripts().insert(script);
+    page.load(QUrl("about:blank"));
+    QTRY_COMPARE(spy.count(), 1);
+    QCOMPARE(spy.takeFirst().value(0).toBool(), true);
+    // ...but ApplicationWorld scripts should still work
+    QCOMPARE(evaluateJavaScriptSyncInWorld(&page, "foo", QWebEngineScript::MainWorld), QVariant());
+    QCOMPARE(evaluateJavaScriptSyncInWorld(&page, "foo", QWebEngineScript::ApplicationWorld), QVariant(42));
+}
+
+// Based on QTBUG-66011
+void tst_QWebEngineScript::viewSource()
+{
+    QWebEnginePage page;
+    QWebEngineScript script;
+    script.setInjectionPoint(QWebEngineScript::DocumentCreation);
+    script.setWorldId(QWebEngineScript::MainWorld);
+    script.setSourceCode("var foo = 42");
+    page.scripts().insert(script);
+    page.load(QUrl("view-source:about:blank"));
+    QSignalSpy spy(&page, &QWebEnginePage::loadFinished);
+    QTRY_COMPARE(spy.count(), 1);
+    QCOMPARE(spy.takeFirst().value(0).toBool(), true);
+    QCOMPARE(evaluateJavaScriptSync(&page, "foo"), QVariant(42));
+}
+
 void tst_QWebEngineScript::scriptModifications()
 {
     QWebEnginePage page;