Merge dev into 5.9

Change-Id: Id919bfd67d9d435fd5a05a892151a12ae5bcd3c0

3 files changed, 45 insertions, 1 deletions

diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index f9fd854cc..5cc0d18df 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -34,6 +34,7 @@
 #include <QQmlListProperty>
 #include <QtTest/QtTest>
 #include <QtWebEngine/QQuickWebEngineProfile>
+#include <QtWebEngine/QQuickWebEngineScript>
 #include <private/qquickwebengineview_p.h>
 #include <private/qquickwebenginecertificateerror_p.h>
 #include <private/qquickwebenginedialogrequests_p.h>
@@ -42,7 +43,6 @@
 #include <private/qquickwebengineloadrequest_p.h>
 #include <private/qquickwebenginenavigationrequest_p.h>
 #include <private/qquickwebenginenewviewrequest_p.h>
-#include <private/qquickwebenginescript_p.h>
 #include <private/qquickwebenginesettings_p.h>
 #include <private/qquickwebenginesingleton_p.h>
 #include <private/qquickwebenginecontextmenurequest_p.h>
diff --git a/tests/auto/quick/qmltests/data/tst_userScripts.qml b/tests/auto/quick/qmltests/data/tst_userScripts.qml
index 88fa6f6e3..e9a4eba99 100644
--- a/tests/auto/quick/qmltests/data/tst_userScripts.qml
+++ b/tests/auto/quick/qmltests/data/tst_userScripts.qml
@@ -61,6 +61,12 @@ Item {
     }
 
     TestWebEngineView {
+        id: webEngineView2
+        width: 400
+        height: 300
+    }
+
+    TestWebEngineView {
         id: webEngineViewWithConditionalUserScripts
         width: 400
         height: 300
@@ -82,6 +88,7 @@ Item {
         function init() {
             webEngineView.url = "";
             webEngineView.userScripts = [];
+            webEngineView.profile.userScripts = [];
         }
 
         function test_oneScript() {
@@ -173,5 +180,17 @@ Item {
             webEngineView.waitForLoadSucceeded();
             tryCompare(webEngineView, "title", "Test page with huge link area");
         }
+
+        function test_profileWideScript() {
+            webEngineView.profile.userScripts = [ changeDocumentTitleScript ];
+
+            webEngineView.url = Qt.resolvedUrl("test1.html");
+            webEngineView.waitForLoadSucceeded();
+            compare(webEngineView.title, "New title");
+
+            webEngineView2.url = Qt.resolvedUrl("test1.html");
+            webEngineView2.waitForLoadSucceeded();
+            compare(webEngineView2.title, "New title");
+        }
     }
 }
diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
index 2ae699310..8df84e048 100644
--- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
+++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
@@ -34,6 +34,7 @@
 #include <QtGui/qpa/qwindowsysteminterface.h>
 #include <QtQml/QQmlEngine>
 #include <QtTest/QtTest>
+#include <QtWebEngine/QQuickWebEngineProfile>
 #include <private/qquickwebengineview_p.h>
 
 #include <functional>
@@ -77,6 +78,7 @@ private Q_SLOTS:
     void inputEventForwardingDisabledWhenActiveFocusOnPressDisabled();
 
     void changeLocale();
+    void userScripts();
 
 private:
     inline QQuickWebEngineView *newWebEngineView();
@@ -720,5 +722,28 @@ void tst_QQuickWebEngineView::changeLocale()
     delete viewEN;
 }
 
+void tst_QQuickWebEngineView::userScripts()
+{
+    QScopedPointer<QQuickWebEngineView> webEngineView1(newWebEngineView());
+    webEngineView1->setParentItem(m_window->contentItem());
+    QScopedPointer<QQuickWebEngineView> webEngineView2(newWebEngineView());
+    webEngineView2->setParentItem(m_window->contentItem());
+
+    QQmlListReference list(webEngineView1->profile(), "userScripts");
+    QQuickWebEngineScript script;
+    script.setSourceCode("document.title = 'New title';");
+    list.append(&script);
+
+    webEngineView1->setUrl(urlFromTestPath("html/basic_page.html"));
+    QVERIFY(waitForLoadSucceeded(webEngineView1.data()));
+    QTRY_COMPARE(webEngineView1->title(), QStringLiteral("New title"));
+
+    webEngineView2->setUrl(urlFromTestPath("html/basic_page.html"));
+    QVERIFY(waitForLoadSucceeded(webEngineView2.data()));
+    QTRY_COMPARE(webEngineView2->title(), QStringLiteral("New title"));
+
+    list.clear();
+}
+
 QTEST_MAIN(tst_QQuickWebEngineView)
 #include "tst_qquickwebengineview.moc"