summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-02-01 11:50:12 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-02-01 11:50:12 +0100
commit838d0f526888f7be1da006fbdacdd8e12a42341c (patch)
tree9ece8e9674f1fac0a71647ec9e33459f76ab7a5a
parent435586eedf983ab9b81291cb8cdfcce28822a0c4 (diff)
parentdde9bbb40ceed6409862e4cd31091270f99ea346 (diff)
Merge remote-tracking branch 'origin/5.12.1' into 5.12
-rw-r--r--dist/changes-5.12.178
m---------src/3rdparty0
-rw-r--r--src/core/ozone/gl_surface_glx_qt.cpp2
-rw-r--r--src/core/profile_io_data_qt.cpp143
-rw-r--r--src/core/profile_io_data_qt.h5
-rw-r--r--src/webengine/render_widget_host_view_qt_delegate_quick.cpp2
-rw-r--r--src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp1
-rw-r--r--tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp16
-rw-r--r--tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp23
9 files changed, 177 insertions, 93 deletions
diff --git a/dist/changes-5.12.1 b/dist/changes-5.12.1
new file mode 100644
index 000000000..44dfdd5c7
--- /dev/null
+++ b/dist/changes-5.12.1
@@ -0,0 +1,78 @@
+Qt 5.12.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Qt 5.12.1 Changes *
+****************************************************************************
+
+Chromium
+--------
+
+ - Security fixes from Chromium up to version 71.0.3578.94, including:
+ * CVE-2018-17480
+ * CVE-2018-17481
+ * CVE-2018-18335
+ * CVE-2018-18336
+ * CVE-2018-18337
+ * CVE-2018-18338
+ * CVE-2018-18339
+ * CVE-2018-18340
+ * CVE-2018-18341
+ * CVE-2018-18342
+ * CVE-2018-18343
+ * CVE-2018-18345
+ * CVE-2018-18347
+ * CVE-2018-18349
+ * CVE-2018-18350
+ * CVE-2018-18355
+ * CVE-2018-18356
+ * CVE-2018-18357
+ * CVE-2018-18358
+ * CVE-2018-18359
+ * Security Bug 839250
+ * Security Bug 851821
+ * Security Bug 869067
+ * Security Bug 877843
+ * Security Bug 879965
+ * Security Bug 880665
+ * Security Bug 882270
+ * Security Bug 892643
+ * Security Bug 895885
+ * Security Bug 900910
+ - Fixed x86-32 builds on GCC 8.
+ - Fixed building on ARM hosts.
+
+
+General
+-------
+
+ * Enabled idle detection and sleep inhibition on Linux and macOS.
+ * [QTBUG-66262] Improved suggested file name of downloads when conflicts arise.
+ * [QTBUG-71322] Enabled bilinear filtering of textures in software rendering mode.
+ * [QTBUG-71370] Fixed autoscrolling regression.
+ * [QTBUG-71895] Fixed crash when calling clearHttpCache().
+ * [QTBUG-72260] Fixed crash on requestInterceptor changes.
+ * [QTBUG-72654] Fixed Event.timeStamp being 0.
+ * [QTBUG-72655] Fixed some JS properties of dead key event.
+
+
+QtQuickWebEngine
+----------------
+
+ * [QTBUG-72299] Fixed problem with blank view after reuse.
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 323b45aa242e0b4e75689d67418ec124ba1ca81
+Subproject fec48c17fa1853a1e42a5b6ce97680767464185
diff --git a/src/core/ozone/gl_surface_glx_qt.cpp b/src/core/ozone/gl_surface_glx_qt.cpp
index eebefa59b..4faa08091 100644
--- a/src/core/ozone/gl_surface_glx_qt.cpp
+++ b/src/core/ozone/gl_surface_glx_qt.cpp
@@ -173,7 +173,7 @@ bool GLSurfaceGLXQt::Initialize(GLSurfaceFormat format)
GLX_PBUFFER_HEIGHT, m_size.height(),
GLX_LARGEST_PBUFFER, x11::False,
GLX_PRESERVED_CONTENTS, x11::False,
- GLX_NONE
+ NULL
};
m_surfaceBuffer = glXCreatePbuffer(display, static_cast<GLXFBConfig>(g_config), pbuffer_attributes);
diff --git a/src/core/profile_io_data_qt.cpp b/src/core/profile_io_data_qt.cpp
index 7783f1ae7..5603d19b9 100644
--- a/src/core/profile_io_data_qt.cpp
+++ b/src/core/profile_io_data_qt.cpp
@@ -210,9 +210,9 @@ void ProfileIODataQt::initializeOnIOThread()
// this binds factory to io thread
m_weakPtr = m_weakPtrFactory.GetWeakPtr();
QMutexLocker lock(&m_mutex);
- m_initialized = true;
generateAllStorage();
generateJobFactory();
+ m_initialized = true;
}
void ProfileIODataQt::initializeOnUIThread()
@@ -227,6 +227,7 @@ void ProfileIODataQt::initializeOnUIThread()
protocolHandlerRegistry->CreateJobInterceptorFactory();
m_cookieDelegate = new CookieMonsterDelegateQt();
m_cookieDelegate->setClient(m_profile->profileAdapter()->cookieStore());
+ createProxyConfig();
}
void ProfileIODataQt::cancelAllUrlRequests()
@@ -262,11 +263,11 @@ void ProfileIODataQt::generateStorage()
// We must stop all requests before deleting their backends.
if (m_storage) {
- m_cookieDelegate->setCookieMonster(0);
- m_storage->set_cookie_store(0);
+ m_cookieDelegate->setCookieMonster(nullptr);
+ m_storage->set_cookie_store(nullptr);
cancelAllUrlRequests();
// we need to get rid of dangling pointer due to coming storage deletion
- m_urlRequestContext->set_http_transaction_factory(0);
+ m_urlRequestContext->set_http_transaction_factory(nullptr);
m_httpNetworkSession.reset();
m_transportSecurityPersister.reset();
}
@@ -282,25 +283,10 @@ void ProfileIODataQt::generateStorage()
// ct_verifier->AddLogs(net::ct::CreateLogVerifiersForKnownLogs());
m_storage->set_cert_transparency_verifier(std::move(ct_verifier));
m_storage->set_ct_policy_enforcer(base::WrapUnique(new net::DefaultCTPolicyEnforcer()));
-
- std::unique_ptr<net::HostResolver> host_resolver(net::HostResolver::CreateDefaultResolver(NULL));
-
- // The System Proxy Resolver has issues on Windows with unconfigured network cards,
- // which is why we want to use the v8 one
- if (!m_dhcpPacFileFetcherFactory)
- m_dhcpPacFileFetcherFactory.reset(new net::DhcpPacFileFetcherFactory);
-
- proxy_resolver::mojom::ProxyResolverFactoryPtr proxyResolver(std::move(m_proxyResolverFactoryInterface));
- m_storage->set_proxy_resolution_service(network::CreateProxyResolutionServiceUsingMojoFactory(
- std::move(proxyResolver),
- std::unique_ptr<net::ProxyConfigService>(proxyConfigService),
- net::PacFileFetcherImpl::CreateWithFileUrlSupport(m_urlRequestContext.get()),
- m_dhcpPacFileFetcherFactory->Create(m_urlRequestContext.get()),
- host_resolver.get(),
- nullptr /* NetLog */,
- m_networkDelegate.get()));
-
+ m_storage->set_host_resolver(net::HostResolver::CreateDefaultResolver(NULL));
m_storage->set_ssl_config_service(std::make_unique<net::SSLConfigServiceDefaults>());
+ m_storage->set_http_auth_handler_factory(net::HttpAuthHandlerFactory::CreateDefault(
+ m_urlRequestContext->host_resolver()));
m_storage->set_transport_security_state(std::make_unique<net::TransportSecurityState>());
if (!m_dataPath.isEmpty()) {
@@ -316,20 +302,23 @@ void ProfileIODataQt::generateStorage()
background_task_runner);
};
- if (!m_httpAuthPreferences)
- m_httpAuthPreferences.reset(new net::HttpAuthPreferences());
-
- m_storage->set_http_auth_handler_factory(net::HttpAuthHandlerFactory::CreateDefault(
- host_resolver.get(),
- m_httpAuthPreferences.get()
-#if (defined(OS_POSIX) && !defined(OS_ANDROID)) || defined(OS_FUCHSIA)
- , std::string() /* gssapi library name */
-#endif
- ));
m_storage->set_http_server_properties(std::unique_ptr<net::HttpServerProperties>(
new net::HttpServerPropertiesImpl));
- // Give |m_storage| ownership at the end in case it's |mapped_host_resolver|.
- m_storage->set_host_resolver(std::move(host_resolver));
+
+ // The System Proxy Resolver has issues on Windows with unconfigured network cards,
+ // which is why we want to use the v8 one
+ if (!m_dhcpPacFileFetcherFactory)
+ m_dhcpPacFileFetcherFactory.reset(new net::DhcpPacFileFetcherFactory);
+
+ proxy_resolver::mojom::ProxyResolverFactoryPtr proxyResolver(std::move(m_proxyResolverFactoryInterface));
+ m_storage->set_proxy_resolution_service(network::CreateProxyResolutionServiceUsingMojoFactory(
+ std::move(proxyResolver),
+ std::unique_ptr<net::ProxyConfigService>(proxyConfigService),
+ net::PacFileFetcherImpl::CreateWithFileUrlSupport(m_urlRequestContext.get()),
+ m_dhcpPacFileFetcherFactory->Create(m_urlRequestContext.get()),
+ m_urlRequestContext->host_resolver(),
+ nullptr /* NetLog */,
+ m_urlRequestContext->network_delegate()));
}
@@ -337,10 +326,8 @@ void ProfileIODataQt::generateCookieStore()
{
Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
Q_ASSERT(m_urlRequestContext);
- Q_ASSERT(m_storage);
QMutexLocker lock(&m_mutex);
- m_updateCookieStore = false;
scoped_refptr<net::SQLiteChannelIDStore> channel_id_db;
if (!m_channelIdPath.isEmpty() && m_persistentCookiesPolicy != ProfileAdapter::NoPersistentCookies) {
@@ -354,11 +341,6 @@ void ProfileIODataQt::generateCookieStore()
base::WrapUnique(new net::ChannelIDService(
new net::DefaultChannelIDStore(channel_id_db.get()))));
- // Unset it first to get a chance to destroy and flush the old cookie store before
- // opening a new on possibly the same file.
- m_cookieDelegate->setCookieMonster(0);
- m_storage->set_cookie_store(0);
-
std::unique_ptr<net::CookieStore> cookieStore;
switch (m_persistentCookiesPolicy) {
case ProfileAdapter::NoPersistentCookies:
@@ -398,11 +380,6 @@ void ProfileIODataQt::generateCookieStore()
const std::vector<std::string> cookieableSchemes(kCookieableSchemes,
kCookieableSchemes + arraysize(kCookieableSchemes));
cookieMonster->SetCookieableSchemes(cookieableSchemes);
-
- if (!m_updateAllStorage && m_updateHttpCache) {
- // HttpCache needs to be regenerated when we generate a new channel id service
- generateHttpCache();
- }
}
void ProfileIODataQt::generateUserAgent()
@@ -412,8 +389,6 @@ void ProfileIODataQt::generateUserAgent()
Q_ASSERT(m_storage);
QMutexLocker lock(&m_mutex);
- m_updateUserAgent = false;
-
m_storage->set_http_user_agent_settings(std::unique_ptr<net::HttpUserAgentSettings>(
new net::StaticHttpUserAgentSettings(m_httpAcceptLanguage.toStdString(),
m_httpUserAgent.toStdString())));
@@ -426,10 +401,6 @@ void ProfileIODataQt::generateHttpCache()
Q_ASSERT(m_storage);
QMutexLocker lock(&m_mutex);
- m_updateHttpCache = false;
-
- if (m_updateCookieStore)
- generateCookieStore();
net::HttpCache::DefaultBackend* main_backend = 0;
switch (m_httpCacheType) {
@@ -583,6 +554,34 @@ void ProfileIODataQt::setFullConfiguration()
m_dataPath = m_profileAdapter->dataPath();
}
+void ProfileIODataQt::requestStorageGeneration() {
+ Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+ QMutexLocker lock(&m_mutex);
+ if (m_initialized && !m_updateAllStorage) {
+ m_updateAllStorage = true;
+ createProxyConfig();
+ content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE,
+ base::Bind(&ProfileIODataQt::generateAllStorage, m_weakPtr));
+ }
+}
+
+// TODO(miklocek): mojofy ProxyConfigServiceQt
+void ProfileIODataQt::createProxyConfig()
+{
+ Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+ QMutexLocker lock(&m_mutex);
+ // We must create the proxy config service on the UI loop on Linux because it
+ // must synchronously run on the glib message loop. This will be passed to
+ // the URLRequestContextStorage on the IO thread in GetURLRequestContext().
+ Q_ASSERT(m_proxyConfigService == 0);
+ m_proxyConfigService =
+ new ProxyConfigServiceQt(
+ net::ProxyResolutionService::CreateSystemProxyConfigService(
+ content::BrowserThread::GetTaskRunnerForThread(content::BrowserThread::IO)));
+ //pass interface to io thread
+ m_proxyResolverFactoryInterface = ChromeMojoProxyResolverFactory::CreateWithStrongBinding().PassInterface();
+}
+
void ProfileIODataQt::updateStorageSettings()
{
Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
@@ -595,23 +594,7 @@ void ProfileIODataQt::updateStorageSettings()
file::ForgetServiceUserIdUserDirAssociation(userId);
file::AssociateServiceUserIdWithUserDir(userId, toFilePath(m_profileAdapter->dataPath()));
}
-
- if (!m_updateAllStorage) {
- m_updateAllStorage = true;
- // We must create the proxy config service on the UI loop on Linux because it
- // must synchronously run on the glib message loop. This will be passed to
- // the URLRequestContextStorage on the IO thread in GetURLRequestContext().
- Q_ASSERT(m_proxyConfigService == 0);
- m_proxyConfigService =
- new ProxyConfigServiceQt(
- net::ProxyResolutionService::CreateSystemProxyConfigService(
- content::BrowserThread::GetTaskRunnerForThread(content::BrowserThread::IO)));
- //pass interface to io thread
- m_proxyResolverFactoryInterface = ChromeMojoProxyResolverFactory::CreateWithStrongBinding().PassInterface();
- if (m_initialized)
- content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE,
- base::Bind(&ProfileIODataQt::generateAllStorage, m_weakPtr));
- }
+ requestStorageGeneration();
}
void ProfileIODataQt::updateCookieStore()
@@ -621,13 +604,7 @@ void ProfileIODataQt::updateCookieStore()
m_persistentCookiesPolicy = m_profileAdapter->persistentCookiesPolicy();
m_cookiesPath = m_profileAdapter->cookiesPath();
m_channelIdPath = m_profileAdapter->channelIdPath();
-
- if (m_initialized && !m_updateAllStorage && !m_updateCookieStore) {
- m_updateCookieStore = true;
- m_updateHttpCache = true;
- content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE,
- base::Bind(&ProfileIODataQt::generateCookieStore, m_weakPtr));
- }
+ requestStorageGeneration();
}
void ProfileIODataQt::updateUserAgent()
@@ -636,12 +613,7 @@ void ProfileIODataQt::updateUserAgent()
QMutexLocker lock(&m_mutex);
m_httpAcceptLanguage = m_profileAdapter->httpAcceptLanguage();
m_httpUserAgent = m_profileAdapter->httpUserAgent();
-
- if (m_initialized && !m_updateAllStorage && !m_updateUserAgent) {
- m_updateUserAgent = true;
- content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE,
- base::Bind(&ProfileIODataQt::generateUserAgent, m_weakPtr));
- }
+ requestStorageGeneration();
}
void ProfileIODataQt::updateHttpCache()
@@ -660,12 +632,7 @@ void ProfileIODataQt::updateHttpCache()
content::BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB |
content::BrowsingDataRemover::ORIGIN_TYPE_PROTECTED_WEB);
}
-
- if (m_initialized && !m_updateAllStorage && !m_updateHttpCache) {
- m_updateHttpCache = true;
- content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE,
- base::Bind(&ProfileIODataQt::generateHttpCache, m_weakPtr));
- }
+ requestStorageGeneration();
}
void ProfileIODataQt::updateJobFactory()
diff --git a/src/core/profile_io_data_qt.h b/src/core/profile_io_data_qt.h
index 5b416861c..2d4706bf4 100644
--- a/src/core/profile_io_data_qt.h
+++ b/src/core/profile_io_data_qt.h
@@ -105,6 +105,8 @@ public:
void updateHttpCache(); // runs on ui thread
void updateJobFactory(); // runs on ui thread
void updateRequestInterceptor(); // runs on ui thread
+ void requestStorageGeneration(); //runs on ui thread
+ void createProxyConfig(); //runs on ui thread
private:
ProfileQt *m_profile;
@@ -140,10 +142,7 @@ private:
int m_httpCacheMaxSize = 0;
bool m_initialized = false;
bool m_updateAllStorage = false;
- bool m_updateCookieStore = false;
- bool m_updateHttpCache = false;
bool m_updateJobFactory = false;
- bool m_updateUserAgent = false;
bool m_ignoreCertificateErrors = false;
base::WeakPtrFactory<ProfileIODataQt> m_weakPtrFactory; // this should be always the last member
QString m_dataPath;
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
index 2f65db97a..8aaf4c714 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -63,7 +63,7 @@ RenderWidgetHostViewQtDelegateQuick::RenderWidgetHostViewQtDelegateQuick(RenderW
setFocus(true);
setActiveFocusOnTab(true);
-#ifdef Q_OS_OSX
+#if defined(Q_OS_MACOS) && !defined(QT_NO_OPENGL)
// Check that the default QSurfaceFormat OpenGL profile is compatible with the global OpenGL
// shared context profile, otherwise this could lead to a nasty crash.
QOpenGLContext *globalSharedContext = QOpenGLContext::globalShareContext();
diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
index 900ed3324..55bdb3a62 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -277,6 +277,7 @@ void RenderWidgetHostViewQtDelegateWidget::show()
void RenderWidgetHostViewQtDelegateWidget::hide()
{
m_rootItem->setVisible(false);
+ QQuickWidget::hide();
}
bool RenderWidgetHostViewQtDelegateWidget::isVisible() const
diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
index 1fe0f0304..98b4fa6a8 100644
--- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
+++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
@@ -30,6 +30,7 @@
#include <QtCore/qbuffer.h>
#include <QtTest/QtTest>
#include <QtWebEngineCore/qwebengineurlrequestjob.h>
+#include <QtWebEngineCore/qwebenginecookiestore.h>
#include <QtWebEngineCore/qwebengineurlschemehandler.h>
#include <QtWebEngineWidgets/qwebengineprofile.h>
#include <QtWebEngineWidgets/qwebenginepage.h>
@@ -57,6 +58,7 @@ private Q_SLOTS:
void downloadItem();
void changePersistentPath();
void initiator();
+ void qtbug_72299(); // this should be the last test
};
void tst_QWebEngineProfile::init()
@@ -568,5 +570,19 @@ void tst_QWebEngineProfile::initiator()
QCOMPARE(handler.initiator, QUrl());
}
+void tst_QWebEngineProfile::qtbug_72299()
+{
+ QWebEngineView view;
+ view.setUrl(QUrl("https://www.qt.io"));
+ view.show();
+ QSignalSpy loadSpy(view.page(), SIGNAL(loadFinished(bool)));
+ view.page()->profile()->clearHttpCache();
+ view.page()->profile()->setHttpCacheType(QWebEngineProfile::NoCache);
+ view.page()->profile()->cookieStore()->deleteAllCookies();
+ view.page()->profile()->setPersistentCookiesPolicy(QWebEngineProfile::NoPersistentCookies);
+ QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 20000);
+}
+
+
QTEST_MAIN(tst_QWebEngineProfile)
#include "tst_qwebengineprofile.moc"
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index 3287ca309..5f05f70ab 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -46,6 +46,7 @@
#include <QTcpSocket>
#include <QStyle>
#include <QtWidgets/qaction.h>
+#include <QWebEngineProfile>
#define VERIFY_INPUTMETHOD_HINTS(actual, expect) \
QVERIFY(actual == (expect | Qt::ImhNoPredictiveText | Qt::ImhNoTextHandles | Qt::ImhNoEditMenu));
@@ -193,6 +194,7 @@ private Q_SLOTS:
void jsKeyboardEvent();
void deletePage();
void closeOpenerTab();
+ void switchPage();
};
// This will be called before the first test function is executed.
@@ -3173,5 +3175,26 @@ void tst_QWebEngineView::closeOpenerTab()
QVERIFY(newView->focusProxy()->isVisible());
}
+void tst_QWebEngineView::switchPage()
+{
+ QWebEngineProfile profile;
+ QWebEnginePage page1(&profile);
+ QWebEnginePage page2(&profile);
+ QSignalSpy loadFinishedSpy1(&page1, SIGNAL(loadFinished(bool)));
+ QSignalSpy loadFinishedSpy2(&page2, SIGNAL(loadFinished(bool)));
+ page1.setHtml("<html><body bgcolor=\"#000000\"></body></html>");
+ page2.setHtml("<html><body bgcolor=\"#ffffff\"></body></html>");
+ QTRY_VERIFY(loadFinishedSpy1.count() && loadFinishedSpy2.count());
+ QWebEngineView webView;
+ webView.resize(300,300);
+ webView.show();
+ webView.setPage(&page1);
+ QTRY_COMPARE(webView.grab().toImage().pixelColor(QPoint(150,150)), Qt::black);
+ webView.setPage(&page2);
+ QTRY_COMPARE(webView.grab().toImage().pixelColor(QPoint(150,150)), Qt::white);
+ webView.setPage(&page1);
+ QTRY_COMPARE(webView.grab().toImage().pixelColor(QPoint(150,150)), Qt::black);
+}
+
QTEST_MAIN(tst_QWebEngineView)
#include "tst_qwebengineview.moc"