summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
m---------src/3rdparty0
-rw-r--r--src/core/content_main_delegate_qt.cpp6
-rw-r--r--src/core/web_contents_adapter.cpp7
-rw-r--r--src/core/web_contents_adapter.h1
-rw-r--r--src/webengine/api/qquickwebenginecertificateerror.cpp31
-rw-r--r--src/webengine/api/qquickwebenginescript.cpp21
-rw-r--r--src/webengine/api/qquickwebengineview.cpp9
-rw-r--r--src/webengine/api/qquickwebengineview_p.h1
-rw-r--r--src/webengine/doc/src/qquickwebengineview_lgpl.qdoc32
-rw-r--r--src/webenginewidgets/api/qwebenginepage.cpp3
-rw-r--r--src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc11
-rw-r--r--tests/auto/quick/publicapi/tst_publicapi.cpp6
-rw-r--r--tests/auto/quick/qmltests/data/keyboardModifierMapping.html2
-rw-r--r--tests/auto/quick/qmltests/data/tst_keyboardModifierMapping.qml9
-rw-r--r--tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp15
-rw-r--r--tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp48
-rw-r--r--tests/auto/widgets/widgets.pro1
17 files changed, 160 insertions, 43 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject c148371e72d900b48cc4790b9e78c6dc1703051
+Subproject 6b1784803e5333987c5e86087ec782a3eaacfa7
diff --git a/src/core/content_main_delegate_qt.cpp b/src/core/content_main_delegate_qt.cpp
index 7c2dde8c4..b8e40a448 100644
--- a/src/core/content_main_delegate_qt.cpp
+++ b/src/core/content_main_delegate_qt.cpp
@@ -40,8 +40,6 @@
#include "base/logging.h"
#include "base/path_service.h"
#include "base/strings/string_number_conversions.h"
-#include "content/public/browser/browser_ipc_logging.h"
-#include "content/public/browser/browser_thread.h"
#include "content/public/common/content_paths.h"
#include "content/public/common/content_switches.h"
#include "ui/base/l10n/l10n_util.h"
@@ -83,10 +81,6 @@ void ContentMainDelegateQt::PreSandboxStartup()
}
logging::SetMinLogLevel(logLevel);
-
-#if defined(IPC_MESSAGE_LOG_ENABLED)
- content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE, base::Bind(&content::EnableIPCLogging, true));
-#endif
}
content::ContentBrowserClient *ContentMainDelegateQt::CreateContentBrowserClient()
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index 9f1000910..718003c45 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -440,6 +440,13 @@ void WebContentsAdapter::reload()
d->webContents->Focus();
}
+void WebContentsAdapter::reloadAndBypassCache()
+{
+ Q_D(WebContentsAdapter);
+ d->webContents->GetController().ReloadIgnoringCache(/*checkRepost = */false);
+ d->webContents->Focus();
+}
+
void WebContentsAdapter::load(const QUrl &url)
{
// The situation can occur when relying on the editingFinished signal in QML to set the url
diff --git a/src/core/web_contents_adapter.h b/src/core/web_contents_adapter.h
index 2973f9948..7f644cdd2 100644
--- a/src/core/web_contents_adapter.h
+++ b/src/core/web_contents_adapter.h
@@ -74,6 +74,7 @@ public:
bool canGoForward() const;
void stop();
void reload();
+ void reloadAndBypassCache();
void load(const QUrl&);
void setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl);
QUrl activeUrl() const;
diff --git a/src/webengine/api/qquickwebenginecertificateerror.cpp b/src/webengine/api/qquickwebenginecertificateerror.cpp
index a39bbfb84..010c66be5 100644
--- a/src/webengine/api/qquickwebenginecertificateerror.cpp
+++ b/src/webengine/api/qquickwebenginecertificateerror.cpp
@@ -58,8 +58,6 @@ public:
bool answered;
};
-
-
/*!
\qmltype WebEngineCertificateError
\instantiates QQuickWebEngineCertificateError
@@ -71,7 +69,7 @@ public:
This class contains information about a certificate error that happened and provides a way to accept or
deny a certificate exception.
- \sa WebEngineView::certificateError
+ \sa WebEngineCertificateError::certificateError
*/
QQuickWebEngineCertificateError::QQuickWebEngineCertificateError(const QSharedPointer<CertificateErrorController> &controller, QObject *parent)
: QObject(parent)
@@ -131,7 +129,9 @@ void QQuickWebEngineCertificateError::rejectCertificate()
/*!
\qmlproperty url WebEngineCertificateError::url
- \brief The URL of the certificate error.
+ \readonly
+
+ The URL that triggered the error.
*/
QUrl QQuickWebEngineCertificateError::url() const
{
@@ -144,6 +144,23 @@ QUrl QQuickWebEngineCertificateError::url() const
/*!
\qmlproperty enumeration WebEngineCertificateError::error
+ \readonly
+
+ The type of the error.
+
+ \value SslPinnedKeyNotInCertificateChain The certificate did not match the built-in public key pins for the host name.
+ \value CertificateCommonNameInvalid The certificate's common name did not match the host name.
+ \value CertificateDateInvalid The certificate is not valid at the current date and time.
+ \value CertificateAuthorityInvalid The certificate is not signed by a trusted authority.
+ \value CertificateContainsErrors The certificate contains errors.
+ \value CertificateNoRevocationMechanism The certificate has no mechanism for determining if it has been revoked.
+ \value CertificateUnableToCheckRevocation Revocation information for the certificate is not available.
+ \value CertificateRevoked The certificate has been revoked.
+ \value CertificateInvalid The certificate is invalid.
+ \value CertificateWeakSignatureAlgorithm The certificate is signed using a weak signature algorithm.
+ \value CertificateNonUniqueName The host name specified in the certificate is not unique.
+ \value CertificateWeakKey The certificate contains a weak key.
+ \value CertificateNameConstraintViolation The certificate claimed DNS names that are in violation of name constraints.
*/
QQuickWebEngineCertificateError::Error QQuickWebEngineCertificateError::error() const
{
@@ -153,6 +170,9 @@ QQuickWebEngineCertificateError::Error QQuickWebEngineCertificateError::error()
/*!
\qmlproperty string WebEngineCertificateError::description
+ \readonly
+
+ A short localized human-readable description of the error.
*/
QString QQuickWebEngineCertificateError::description() const
{
@@ -162,6 +182,9 @@ QString QQuickWebEngineCertificateError::description() const
/*!
\qmlproperty bool WebEngineCertificateError::overridable
+ \readonly
+
+ A boolean that indicates if the certificate error can be overridden and accepted.
*/
bool QQuickWebEngineCertificateError::overridable() const
{
diff --git a/src/webengine/api/qquickwebenginescript.cpp b/src/webengine/api/qquickwebenginescript.cpp
index eb3a41dd5..affffbf46 100644
--- a/src/webengine/api/qquickwebenginescript.cpp
+++ b/src/webengine/api/qquickwebenginescript.cpp
@@ -84,12 +84,33 @@ QString QQuickWebEngineScript::name() const
return d->coreScript.name();
}
+/*!
+ \qmlproperty url WebEngineScript::sourceUrl
+
+ This property holds the remote source location of the user script (if any).
+
+ Unlike \l sourceCode, this property allows referring to user scripts that
+ are not already loaded in memory, for instance, when stored on disk.
+
+ Setting this property will change the \l sourceCode of the script.
+
+ \note At present, only file-based sources are supported.
+
+ \sa sourceCode
+*/
QUrl QQuickWebEngineScript::sourceUrl() const
{
Q_D(const QQuickWebEngineScript);
return d->m_sourceUrl;
}
+/*!
+ \qmlproperty string WebEngineScript::sourceCode
+
+ This property holds the JavaScript source code of the user script.
+
+ \sa sourceUrl
+*/
QString QQuickWebEngineScript::sourceCode() const
{
Q_D(const QQuickWebEngineScript);
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 5c3ca2634..7bca4e3cd 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -442,7 +442,6 @@ bool QQuickWebEngineViewPrivate::isFullScreen() const
void QQuickWebEngineViewPrivate::javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message, int lineNumber, const QString& sourceID)
{
Q_Q(QQuickWebEngineView);
- Q_UNUSED(level);
Q_EMIT q->javaScriptConsoleMessage(static_cast<QQuickWebEngineView::JavaScriptConsoleMessageLevel>(level), message, lineNumber, sourceID);
}
@@ -667,6 +666,14 @@ void QQuickWebEngineView::reload()
d->adapter->reload();
}
+void QQuickWebEngineView::reloadAndBypassCache()
+{
+ Q_D(QQuickWebEngineView);
+ if (!d->adapter)
+ return;
+ d->adapter->reloadAndBypassCache();
+}
+
void QQuickWebEngineView::stop()
{
Q_D(QQuickWebEngineView);
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index c84a65805..4539ad34b 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -207,6 +207,7 @@ public Q_SLOTS:
void goForward();
void goBackOrForward(int index);
void reload();
+ void reloadAndBypassCache();
void stop();
Q_REVISION(1) void findText(const QString &subString, FindFlags options = 0, const QJSValue &callback = QJSValue());
Q_REVISION(1) void fullScreenCancelled();
diff --git a/src/webengine/doc/src/qquickwebengineview_lgpl.qdoc b/src/webengine/doc/src/qquickwebengineview_lgpl.qdoc
index 035d4a382..6d04473d3 100644
--- a/src/webengine/doc/src/qquickwebengineview_lgpl.qdoc
+++ b/src/webengine/doc/src/qquickwebengineview_lgpl.qdoc
@@ -301,6 +301,26 @@
*/
/*!
+ \qmlsignal WebEngineView::certificateError(error)
+
+ This signal is emitted when an invalid certificate error is raised while loading a given request.
+
+ The certificate error can be rejected by calling WebEngineCertificateError::rejectCertificate,
+ which will stop loading the request.
+
+ The certificate error can be ignored by calling WebEngineCertificateError::ignoreCertificateError
+ which will resume loading the request.
+
+ It is possible to defer the decision of rejecting the given certificate by calling
+ WebEngineCertificateError::defer, which is useful when waiting for user input.
+ By default the invalid certificate will be automatically rejected.
+
+ The corresponding handler is onCertificateError.
+
+ \sa WebEngineCertificateError
+*/
+
+/*!
\qmlsignal WebEngineView::linkHovered(hoveredUrl)
Within a mouse-driven interface, this signal is emitted when a mouse
@@ -313,6 +333,18 @@
*/
/*!
+ \qmlsignal WebEngineView::javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, message, lineNumber, sourceID)
+ This signal is emitted when a JavaScript program tries to print a \a message to the web browser's console.
+
+ For example in case of evaluation errors the source URL may be provided in \a sourceID as well as the \a lineNumber.
+
+ \a level indicates the severity of the event that triggered the message, i.e. if it
+ was triggered by an error or a less severe event.
+
+ The corresponding handler is onJavaScriptConsoleMessage.
+*/
+
+/*!
\qmlsignal WebEngineView::newViewRequested(request)
This signal is emitted when a page load is requested to happen in a separate
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 0f79bbf47..7eb29a185 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -647,6 +647,9 @@ void QWebEnginePage::triggerAction(WebAction action, bool)
case Reload:
d->adapter->reload();
break;
+ case ReloadAndBypassCache:
+ d->adapter->reloadAndBypassCache();
+ break;
case Cut:
d->adapter->cut();
break;
diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
index f5aa64eed..3088a66b6 100644
--- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
@@ -346,6 +346,17 @@
*/
/*!
+ \fn bool QWebEnginePage::certificateError(const QWebEngineCertificateError & certificateError)
+ This function is called when an invalid certificate error is raised while loading a given request.
+
+ The \a certificateError parameter contains information about the certificate and details of the error.
+
+ Return true to ignore the error and complete the request, otherwise return false to stop loading the request.
+
+ \sa QWebEngineCertificateError
+*/
+
+/*!
\fn QString QWebEnginePage::chooseFiles(FileSelectionMode mode, const QStringList& oldFiles, const QStringList& acceptedMimeTypes)
This function is called when the web content requests a file name, for example
as a result of the user clicking on a "file upload" button in a HTML form.
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index eda098e9c..af24f42ed 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -55,6 +55,7 @@
#include <private/qquickwebenginenewviewrequest_p.h>
#include <private/qquickwebengineprofile_p.h>
#include <private/qquickwebenginescript_p.h>
+#include <private/qquickwebenginesettings_p.h>
class tst_publicapi : public QObject {
Q_OBJECT
@@ -73,6 +74,7 @@ static QList<const QMetaObject *> typesToCheck = QList<const QMetaObject *>()
<< &QQuickWebEngineNewViewRequest::staticMetaObject
<< &QQuickWebEngineProfile::staticMetaObject
<< &QQuickWebEngineScript::staticMetaObject
+ << &QQuickWebEngineSettings::staticMetaObject
<< &QQuickWebEngineFullScreenRequest::staticMetaObject
;
@@ -81,6 +83,10 @@ static QList<const char *> knownEnumNames = QList<const char *>();
static QStringList hardcodedTypes = QStringList()
<< "QJSValue"
<< "QQmlListProperty<QQuickWebEngineScript>"
+ << "QQmlWebChannel*"
+ // Ignore the testSupport types without making a fuss.
+ << "QQuickWebEngineTestSupport*"
+ << "QQuickWebEngineErrorPage*"
;
static QStringList expectedAPI = QStringList()
diff --git a/tests/auto/quick/qmltests/data/keyboardModifierMapping.html b/tests/auto/quick/qmltests/data/keyboardModifierMapping.html
index b6d291207..4652bf5da 100644
--- a/tests/auto/quick/qmltests/data/keyboardModifierMapping.html
+++ b/tests/auto/quick/qmltests/data/keyboardModifierMapping.html
@@ -15,6 +15,7 @@ document.body.onkeydown = function(e) {
if (e.metaKey)
meta_state.textContent = 'pressed'
last_keycode.textContent = e.keyCode
+ document.title = "Key pressed";
};
document.body.onkeyup = function(e) {
if (e.altKey)
@@ -24,6 +25,7 @@ document.body.onkeyup = function(e) {
if (e.metaKey)
meta_state.textContent = 'released'
last_keycode.textContent = e.keyCode
+ document.title = "Key released";
};
function getPressedModifiers() {
diff --git a/tests/auto/quick/qmltests/data/tst_keyboardModifierMapping.qml b/tests/auto/quick/qmltests/data/tst_keyboardModifierMapping.qml
index 1d8fb0ed5..230ee9635 100644
--- a/tests/auto/quick/qmltests/data/tst_keyboardModifierMapping.qml
+++ b/tests/auto/quick/qmltests/data/tst_keyboardModifierMapping.qml
@@ -49,7 +49,7 @@ TestWebEngineView {
height: 300
SignalSpy {
- id: spy
+ id: titleSpy
target: webEngineView
signalName: "titleChanged"
}
@@ -68,10 +68,12 @@ TestWebEngineView {
function test_keyboardModifierMapping() {
webEngineView.url = Qt.resolvedUrl("keyboardModifierMapping.html")
waitForLoadSucceeded();
+ titleSpy.wait()
var callbackCalled = false;
// Alt
keyPress(Qt.Key_Alt);
+ titleSpy.wait()
runJavaScript("getPressedModifiers()", function(result) {
compare(result, "alt:pressed ctrl:no meta:no");
callbackCalled = true;
@@ -79,6 +81,7 @@ TestWebEngineView {
wait(100);
verify(callbackCalled);
keyRelease(Qt.Key_Alt)
+ titleSpy.wait()
callbackCalled = false;
// Ctrl
@@ -87,6 +90,7 @@ TestWebEngineView {
// so we have to do this here manually.
// For testing we assume that the flag Qt::AA_MacDontSwapCtrlAndMeta is NOT set.
keyPress(Qt.platform.os == "osx" ? Qt.Key_Meta : Qt.Key_Control);
+ titleSpy.wait()
runJavaScript("getPressedModifiers()", function(result) {
compare(result, "alt:released ctrl:pressed meta:no");
callbackCalled = true;
@@ -94,10 +98,12 @@ TestWebEngineView {
wait(100);
verify(callbackCalled);
keyRelease(Qt.platform.os == "osx" ? Qt.Key_Meta : Qt.Key_Control);
+ titleSpy.wait()
callbackCalled = false;
// Meta (Command on Mac)
keyPress(Qt.platform.os == "osx" ? Qt.Key_Control : Qt.Key_Meta);
+ titleSpy.wait()
runJavaScript("getPressedModifiers()", function(result) {
compare(result, "alt:released ctrl:released meta:pressed");
callbackCalled = true;
@@ -105,6 +111,7 @@ TestWebEngineView {
wait(100);
verify(callbackCalled);
keyRelease(Qt.platform.os == "osx" ? Qt.Key_Control : Qt.Key_Meta);
+ titleSpy.wait()
callbackCalled = false;
runJavaScript("getPressedModifiers()", function(result) {
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index 85939a686..970ebf20a 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -3588,22 +3588,23 @@ void tst_QWebEnginePage::openWindowDefaultSize()
page.settings()->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, true);
// Open a default window.
page.runJavaScript("window.open()");
+ QTest::qWait(200);
// Open a too small window.
- evaluateJavaScriptSync(&page, "window.open('', '', 'width=10,height=10')");
+ evaluateJavaScriptSync(&page, "window.open('','about:blank','width=10,height=10')");
- QTest::qWait(500);
+ QTest::qWait(200);
// The number of popups created should be two.
- QVERIFY(page.createdWindows.size() == 2);
+ QCOMPARE(page.createdWindows.size(), 2);
QRect requestedGeometry = page.createdWindows[0]->requestedGeometry;
// Check default size has been requested.
- QVERIFY(requestedGeometry.width() == 0);
- QVERIFY(requestedGeometry.height() == 0);
+ QCOMPARE(requestedGeometry.width(), 0);
+ QCOMPARE(requestedGeometry.height(), 0);
requestedGeometry = page.createdWindows[1]->requestedGeometry;
// Check minimum size has been requested.
- QVERIFY(requestedGeometry.width() == 100);
- QVERIFY(requestedGeometry.height() == 100);
+ QCOMPARE(requestedGeometry.width(), 100);
+ QCOMPARE(requestedGeometry.height(), 100);
}
void tst_QWebEnginePage::cssMediaTypeGlobalSetting()
diff --git a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
index 53d7494d2..b29d8fae6 100644
--- a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
+++ b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
@@ -58,17 +58,17 @@ void tst_QWebEngineScript::domEditing()
QWebEngineScript s;
s.setInjectionPoint(QWebEngineScript::DocumentReady);
s.setWorldId(QWebEngineScript::ApplicationWorld + 1);
- s.setSourceCode("el = document.createElement(\"div\");"\
- "el.id = \"banner\";"\
- "el.style.position = \"absolute\";"\
- "el.style.width = \"100%\";"\
- "el.style.padding = \"1em\";"\
- "el.style.textAlign = \"center\";"\
- "el.style.top = \"0\";"\
- "el.style.left = \"0\";"\
- "el.style.backgroundColor = \"#80C342\";"\
- "el.innerText = \"Injected banner\";"
- "document.body.appendChild(el);");
+ s.setSourceCode("el = document.createElement(\"div\");\
+ el.id = \"banner\";\
+ el.style.position = \"absolute\";\
+ el.style.width = \"100%\";\
+ el.style.padding = \"1em\";\
+ el.style.textAlign = \"center\";\
+ el.style.top = \"0\";\
+ el.style.left = \"0\";\
+ el.style.backgroundColor = \"#80C342\";\
+ el.innerText = \"Injected banner\";\
+ document.body.appendChild(el);");
page.scripts().insert(s);
page.load(QUrl("about:blank"));
view.show();
@@ -91,10 +91,10 @@ void tst_QWebEngineScript::injectionPoint()
WebEnginePage page;
page.scripts().insert(s);
page.setHtml(QStringLiteral("<html><head><script> var contents;") + testScript
- + QStringLiteral("document.addEventListener(\"load\", setTimeout(function(event) {"\
- "document.body.innerText = contents;"\
- "}, 550));"\
- "</script></head><body></body></html>"));
+ + QStringLiteral("document.addEventListener(\"load\", setTimeout(function(event) {\
+ document.body.innerText = contents;\
+ }, 550));\
+ </script></head><body></body></html>"));
waitForSignal(&page, SIGNAL(loadFinished(bool)));
QTest::qWait(550);
QCOMPARE(evaluateJavaScriptSync(&page, "document.body.innerText"), QVariant::fromValue(QStringLiteral("SUCCESS")));
@@ -108,13 +108,13 @@ void tst_QWebEngineScript::injectionPoint_data()
<< QStringLiteral("var contents = (typeof(foo) == \"undefined\")? \"FAILURE\" : \"SUCCESS\";");
QTest::newRow("DocumentReady") << static_cast<int>(QWebEngineScript::DocumentReady)
// use a zero timeout to make sure the user script got a chance to run as the order is undefined.
- << QStringLiteral("document.addEventListener(\"DOMContentLoaded\", setTimeout(function(event) {"\
- "contents = (typeof(foo) == \"undefined\")? \"FAILURE\" : \"SUCCESS\";"\
- "}, 0));");
+ << QStringLiteral("document.addEventListener(\"DOMContentLoaded\", setTimeout(function(event) {\
+ contents = (typeof(foo) == \"undefined\")? \"FAILURE\" : \"SUCCESS\";\
+ }, 0));");
QTest::newRow("Deferred") << static_cast<int>(QWebEngineScript::Deferred)
- << QStringLiteral("document.addEventListener(\"load\", setTimeout(function(event) {"\
- "contents = (typeof(foo) == \"undefined\")? \"FAILURE\" : \"SUCCESS\";"\
- "}, 500));");
+ << QStringLiteral("document.addEventListener(\"load\", setTimeout(function(event) {\
+ contents = (typeof(foo) == \"undefined\")? \"FAILURE\" : \"SUCCESS\";\
+ }, 500));");
}
void tst_QWebEngineScript::scriptWorld()
@@ -145,9 +145,9 @@ void tst_QWebEngineScript::scriptModifications()
script.setWorldId(QWebEngineScript::MainWorld);
script.setSourceCode("var foo = \"SUCCESS\";");
page.scripts().insert(script);
- page.setHtml(QStringLiteral("<html><head><script>document.addEventListener(\"DOMContentLoaded\", function() {"\
- "document.body.innerText = foo;});"\
- "</script></head><body></body></html>"));
+ page.setHtml(QStringLiteral("<html><head><script>document.addEventListener(\"DOMContentLoaded\", function() {\
+ document.body.innerText = foo;});\
+ </script></head><body></body></html>"));
QVERIFY(page.scripts().count() == 1);
waitForSignal(&page, SIGNAL(loadFinished(bool)));
QCOMPARE(evaluateJavaScriptSync(&page, "document.body.innerText"), QVariant::fromValue(QStringLiteral("SUCCESS")));
diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro
index 40d3b40bb..2dbb498d1 100644
--- a/tests/auto/widgets/widgets.pro
+++ b/tests/auto/widgets/widgets.pro
@@ -10,3 +10,4 @@ SUBDIRS += \
qwebengineview \
qwebenginehistory \
qwebengineinspector \
+ qwebenginescript \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 08:47:13 +0000