diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-15 09:45:33 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-15 15:41:16 +0100 |
commit | 5d3adf10341e1882b9c18f71591f9eb037a5f91d (patch) | |
tree | eaff30c95ed32c103d22dbb803bbddfa29bd6be2 /src/core/renderer/web_channel_ipc_transport.cpp | |
parent | cf6768d81ed7b9444e28ede6e26e125d5919b143 (diff) | |
parent | 61eb7b4ff6e4f2de5b5df6d7a76191cbf8dd9312 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/3rdparty
tests/auto/quick/qmltests/qmltests.pro
tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
Change-Id: I2a1e3a83e29a1d6709f3e98fda3f7b4ab7ab297e
Diffstat (limited to 'src/core/renderer/web_channel_ipc_transport.cpp')
-rw-r--r-- | src/core/renderer/web_channel_ipc_transport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/renderer/web_channel_ipc_transport.cpp b/src/core/renderer/web_channel_ipc_transport.cpp index 554bda2a8..94a7baa1d 100644 --- a/src/core/renderer/web_channel_ipc_transport.cpp +++ b/src/core/renderer/web_channel_ipc_transport.cpp @@ -186,7 +186,7 @@ void WebChannelIPCTransport::installWebChannel(uint worldId) void WebChannelIPCTransport::uninstallWebChannel(uint worldId) { - Q_ASSERT(worldId = m_installedWorldId); + Q_ASSERT(worldId == m_installedWorldId); blink::WebView *webView = render_view()->GetWebView(); if (!webView) return; |