summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config.tests/xml2/xml2.cpp3
m---------src/3rdparty0
-rw-r--r--src/webengine/api/qquickwebenginescript.cpp3
-rw-r--r--src/webengine/doc/src/webengineview_lgpl.qdoc2
-rw-r--r--src/webenginewidgets/api/qwebenginescript.cpp2
-rw-r--r--src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc6
-rw-r--r--tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp42
7 files changed, 29 insertions, 29 deletions
diff --git a/config.tests/xml2/xml2.cpp b/config.tests/xml2/xml2.cpp
index 93bc80c97..497653d9c 100644
--- a/config.tests/xml2/xml2.cpp
+++ b/config.tests/xml2/xml2.cpp
@@ -27,9 +27,6 @@
****************************************************************************/
#include <libxml/xmlversion.h>
-#if defined(LIBXML_CATALOG_ENABLED)
-#error "libxml catalog enabled"
-#endif
#if !defined(LIBXML_ICU_ENABLED)
#error "libxml icu not enabled"
#endif
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 82740520c942c91f596ee53ff3ca09ac4e49489
+Subproject 7085115f51ce9d02cfff216a3f74b1fb6715f38
diff --git a/src/webengine/api/qquickwebenginescript.cpp b/src/webengine/api/qquickwebenginescript.cpp
index acc5cedb7..ab7aee4cb 100644
--- a/src/webengine/api/qquickwebenginescript.cpp
+++ b/src/webengine/api/qquickwebenginescript.cpp
@@ -86,7 +86,8 @@ QT_BEGIN_NAMESPACE
/*!
\enum QQuickWebEngineScript::ScriptWorldId
- The world ID defining which isolated world the script is executed in.
+ The world ID defining which isolated world the script is executed in. Besides these predefined
+ IDs custom IDs can be used, but must be integers between \c 0 and \c 256.
\value MainWorld
The world used by the page's web contents. It can be useful in order to expose custom
diff --git a/src/webengine/doc/src/webengineview_lgpl.qdoc b/src/webengine/doc/src/webengineview_lgpl.qdoc
index a6a7c088b..c089538b1 100644
--- a/src/webengine/doc/src/webengineview_lgpl.qdoc
+++ b/src/webengine/doc/src/webengineview_lgpl.qdoc
@@ -365,7 +365,7 @@
\since QtWebEngine 1.3
JavaScript world that the web channel instance used by this view is
- installed in.
+ installed in. The world must be a number between \c 0 and \c 256.
*/
/*!
diff --git a/src/webenginewidgets/api/qwebenginescript.cpp b/src/webenginewidgets/api/qwebenginescript.cpp
index d5247cde1..d1e996b3a 100644
--- a/src/webenginewidgets/api/qwebenginescript.cpp
+++ b/src/webenginewidgets/api/qwebenginescript.cpp
@@ -224,6 +224,8 @@ quint32 QWebEngineScript::worldId() const
/*!
Sets the world ID of the isolated world to \a id when running this script.
+
+ Must be between \c 0 and \c 256.
*/
void QWebEngineScript::setWorldId(quint32 id)
{
diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
index 3013903c8..f91b71ea1 100644
--- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
@@ -718,9 +718,9 @@
\since 5.7
Runs the JavaScript code contained in \a scriptSource in the world specified by \a worldId.
- The world ID values are the same as provided by QWebEngineScript::ScriptWorldId. Using the
- \e runJavaScript() versions without the world ID is the same as running the script in the
- \c MainWorld.
+ The world ID values are the same as provided by QWebEngineScript::ScriptWorldId, and between \c 0
+ and \c 256. Using the \e runJavaScript() versions without the world ID is the same as running the
+ script in the \c MainWorld.
When the script has been executed, \a resultCallback is called with the result of the last
executed statement. \c resultCallback can be any of a function pointer, a functor or a lambda,
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index fad71a517..b9a8b6a09 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -2338,9 +2338,9 @@ void tst_QWebEngineView::imeJSInputEvents()
// Simply committing text should not trigger any JS composition event.
QTRY_COMPARE(logLines().count(), 3);
- QCOMPARE(logLines()[0], "[object InputEvent] beforeinput commit");
- QCOMPARE(logLines()[1], "[object TextEvent] textInput commit");
- QCOMPARE(logLines()[2], "[object InputEvent] input commit");
+ QCOMPARE(logLines()[0], QStringLiteral("[object InputEvent] beforeinput commit"));
+ QCOMPARE(logLines()[1], QStringLiteral("[object TextEvent] textInput commit"));
+ QCOMPARE(logLines()[2], QStringLiteral("[object InputEvent] input commit"));
evaluateJavaScriptSync(view.page(), "clear()");
QTRY_VERIFY(evaluateJavaScriptSync(view.page(), "log.textContent + input.textContent").toString().isEmpty());
@@ -2354,10 +2354,10 @@ void tst_QWebEngineView::imeJSInputEvents()
}
QTRY_COMPARE(logLines().count(), 4);
- QCOMPARE(logLines()[0], "[object CompositionEvent] compositionstart ");
- QCOMPARE(logLines()[1], "[object InputEvent] beforeinput preedit");
- QCOMPARE(logLines()[2], "[object CompositionEvent] compositionupdate preedit");
- QCOMPARE(logLines()[3], "[object InputEvent] input preedit");
+ QCOMPARE(logLines()[0], QStringLiteral("[object CompositionEvent] compositionstart "));
+ QCOMPARE(logLines()[1], QStringLiteral("[object InputEvent] beforeinput preedit"));
+ QCOMPARE(logLines()[2], QStringLiteral("[object CompositionEvent] compositionupdate preedit"));
+ QCOMPARE(logLines()[3], QStringLiteral("[object InputEvent] input preedit"));
{
QList<QInputMethodEvent::Attribute> attributes;
@@ -2368,11 +2368,11 @@ void tst_QWebEngineView::imeJSInputEvents()
}
QTRY_COMPARE(logLines().count(), 9);
- QCOMPARE(logLines()[4], "[object InputEvent] beforeinput commit");
- QCOMPARE(logLines()[5], "[object CompositionEvent] compositionupdate commit");
- QCOMPARE(logLines()[6], "[object TextEvent] textInput commit");
- QCOMPARE(logLines()[7], "[object InputEvent] input commit");
- QCOMPARE(logLines()[8], "[object CompositionEvent] compositionend commit");
+ QCOMPARE(logLines()[4], QStringLiteral("[object InputEvent] beforeinput commit"));
+ QCOMPARE(logLines()[5], QStringLiteral("[object CompositionEvent] compositionupdate commit"));
+ QCOMPARE(logLines()[6], QStringLiteral("[object TextEvent] textInput commit"));
+ QCOMPARE(logLines()[7], QStringLiteral("[object InputEvent] input commit"));
+ QCOMPARE(logLines()[8], QStringLiteral("[object CompositionEvent] compositionend commit"));
evaluateJavaScriptSync(view.page(), "clear()");
QTRY_VERIFY(evaluateJavaScriptSync(view.page(), "log.textContent + input.textContent").toString().isEmpty());
@@ -2386,10 +2386,10 @@ void tst_QWebEngineView::imeJSInputEvents()
}
QTRY_COMPARE(logLines().count(), 4);
- QCOMPARE(logLines()[0], "[object CompositionEvent] compositionstart ");
- QCOMPARE(logLines()[1], "[object InputEvent] beforeinput preedit");
- QCOMPARE(logLines()[2], "[object CompositionEvent] compositionupdate preedit");
- QCOMPARE(logLines()[3], "[object InputEvent] input preedit");
+ QCOMPARE(logLines()[0], QStringLiteral("[object CompositionEvent] compositionstart "));
+ QCOMPARE(logLines()[1], QStringLiteral("[object InputEvent] beforeinput preedit"));
+ QCOMPARE(logLines()[2], QStringLiteral("[object CompositionEvent] compositionupdate preedit"));
+ QCOMPARE(logLines()[3], QStringLiteral("[object InputEvent] input preedit"));
{
QList<QInputMethodEvent::Attribute> attributes;
@@ -2399,11 +2399,11 @@ void tst_QWebEngineView::imeJSInputEvents()
}
QTRY_COMPARE(logLines().count(), 9);
- QCOMPARE(logLines()[4], "[object InputEvent] beforeinput ");
- QCOMPARE(logLines()[5], "[object CompositionEvent] compositionupdate ");
- QCOMPARE(logLines()[6], "[object TextEvent] textInput ");
- QCOMPARE(logLines()[7], "[object InputEvent] input null");
- QCOMPARE(logLines()[8], "[object CompositionEvent] compositionend ");
+ QCOMPARE(logLines()[4], QStringLiteral("[object InputEvent] beforeinput "));
+ QCOMPARE(logLines()[5], QStringLiteral("[object CompositionEvent] compositionupdate "));
+ QCOMPARE(logLines()[6], QStringLiteral("[object TextEvent] textInput "));
+ QCOMPARE(logLines()[7], QStringLiteral("[object InputEvent] input null"));
+ QCOMPARE(logLines()[8], QStringLiteral("[object CompositionEvent] compositionend "));
evaluateJavaScriptSync(view.page(), "clear()");
QTRY_VERIFY(evaluateJavaScriptSync(view.page(), "log.textContent + input.textContent").toString().isEmpty());
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 01:11:45 +0000