diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-08-09 16:35:18 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-08-10 21:43:45 +0200 |
| commit | b10ac195de4dac7157575e2899cc19ec45fe1648 (patch) | |
| tree | e4cdbc0b40beccf1e05d49aa4b77239052c609b4 /tests | |
| parent | 73a25202670d7383e3b18319c29fd60f373eb3ca (diff) | |
Rename disableReadingFromCanvas to follow naming style
We prefer to name settings with Enabled at the end.
From API review.
Pick-to: 6.6
Change-Id: I7aacc6dbb92d852fd21b067475d2fd9e7df56163
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Anu Aliyas <anu.aliyas@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/core/qwebenginesettings/tst_qwebenginesettings.cpp | 8 | ||||
| -rw-r--r-- | tests/auto/quick/publicapi/tst_publicapi.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/quick/qmltests/data/tst_settings.qml | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/core/qwebenginesettings/tst_qwebenginesettings.cpp b/tests/auto/core/qwebenginesettings/tst_qwebenginesettings.cpp index f63a333c2..14492c728 100644 --- a/tests/auto/core/qwebenginesettings/tst_qwebenginesettings.cpp +++ b/tests/auto/core/qwebenginesettings/tst_qwebenginesettings.cpp @@ -211,15 +211,15 @@ void tst_QWebEngineSettings::disableReadingFromCanvas() QWebEnginePage page; QSignalSpy loadFinishedSpy(&page, SIGNAL(loadFinished(bool))); page.settings()->setAttribute(QWebEngineSettings::JavascriptEnabled, true); - page.settings()->setAttribute(QWebEngineSettings::DisableReadingFromCanvas, - disableReadingFromCanvas); + page.settings()->setAttribute(QWebEngineSettings::ReadingFromCanvasEnabled, + !disableReadingFromCanvas); page.setHtml("<html><body>" "<canvas id='myCanvas' width='200' height='40' style='border:1px solid " "#000000;'></canvas>" "</body></html>"); QVERIFY(loadFinishedSpy.wait()); - QCOMPARE(page.settings()->testAttribute(QWebEngineSettings::DisableReadingFromCanvas), - disableReadingFromCanvas); + QCOMPARE(page.settings()->testAttribute(QWebEngineSettings::ReadingFromCanvasEnabled), + !disableReadingFromCanvas); const QString jsCode("(function(){" " var canvas = document.getElementById(\"myCanvas\");" diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp index 5f9d262a7..bcb503a4d 100644 --- a/tests/auto/quick/publicapi/tst_publicapi.cpp +++ b/tests/auto/quick/publicapi/tst_publicapi.cpp @@ -446,8 +446,8 @@ static const QStringList expectedAPI = QStringList() << "QQuickWebEngineSettings.webGLEnabledChanged() --> void" << "QQuickWebEngineSettings.webRTCPublicInterfacesOnly --> bool" << "QQuickWebEngineSettings.webRTCPublicInterfacesOnlyChanged() --> void" - << "QQuickWebEngineSettings.disableReadingFromCanvas --> bool" - << "QQuickWebEngineSettings.disableReadingFromCanvasChanged() --> void" + << "QQuickWebEngineSettings.readingFromCanvasEnabled --> bool" + << "QQuickWebEngineSettings.readingFromCanvasEnabledChanged() --> void" << "QQuickWebEngineSingleton.defaultProfile --> QQuickWebEngineProfile*" << "QQuickWebEngineSingleton.settings --> QQuickWebEngineSettings*" << "QQuickWebEngineSingleton.script() --> QWebEngineScript" diff --git a/tests/auto/quick/qmltests/data/tst_settings.qml b/tests/auto/quick/qmltests/data/tst_settings.qml index 2f71407cf..6b351a293 100644 --- a/tests/auto/quick/qmltests/data/tst_settings.qml +++ b/tests/auto/quick/qmltests/data/tst_settings.qml @@ -87,12 +87,12 @@ TestWebEngineView { } function test_disableReadingFromCanvas(data) { - webEngineView.settings.disableReadingFromCanvas = data.disableReadingFromCanvas; + webEngineView.settings.readingFromCanvasEnabled = !data.disableReadingFromCanvas; webEngineView.loadHtml("<html><body>" + "<canvas id='myCanvas' width='200' height='40' style='border:1px solid #000000;'></canvas>" + "</body></html>"); verify(webEngineView.waitForLoadSucceeded()); - verify(webEngineView.settings.disableReadingFromCanvas === data.disableReadingFromCanvas ) + verify(webEngineView.settings.readingFromCanvasEnabled === !data.disableReadingFromCanvas ) var jsCode = "(function(){" + " var canvas = document.getElementById(\"myCanvas\");" + |