diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-06-19 16:04:54 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-06-23 06:29:31 +0000 |
| commit | 0a6707ac82b9a8bd3a810035ecd8db2269352b59 (patch) | |
| tree | d0dc60e643d83e53adfef35acb41f38cd15ab1a1 /src/core/web_contents_adapter.cpp | |
| parent | d5de0e97e6318bf17a3dac027c299b7f202f2e58 (diff) | |
Fix crash when accessibility is disabled
With the no-accessibility feature moved to qtgui-config, we don't
always include it where web_content_apapter_client.h is included, which
gives it an inconsistent binary layout.
Solve it by making the optional method always defined as it doesn't
rely on anything from accessibility.
Task-number: QTBUG-61200
Change-Id: I65f34ab2b6763f3166b945e700994bd8d019a835
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/core/web_contents_adapter.cpp')
| -rw-r--r-- | src/core/web_contents_adapter.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index 8430ff710..93e8674bd 100644 --- a/src/core/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp @@ -403,6 +403,7 @@ void WebContentsAdapter::initialize(WebContentsAdapterClient *adapterClient) // We keep a reference to browserContextAdapter to keep it alive as long as we use it. // This is needed in case the QML WebEngineProfile is garbage collected before the WebEnginePage. d->browserContextAdapter = adapterClient->browserContextAdapter(); + Q_ASSERT(d->browserContextAdapter); // Create our own if a WebContents wasn't provided at construction. if (!d->webContents) |