summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-02 03:01:17 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-02 03:01:17 +0100
commitcd0cb72a2cd219af5faade928c06b61df715b14b (patch)
tree282401b7b81d8ad746838168ae5a53cdd6ddc38e
parent2282e856361df94c198c847dd40d2fc4717f81cb (diff)
parentfc039435b57bb5860ee3c59542d29b106071ffb5 (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1
-rw-r--r--src/webview/qtwebviewfunctions.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/webview/qtwebviewfunctions.cpp b/src/webview/qtwebviewfunctions.cpp
index 975bb17..01efbf6 100644
--- a/src/webview/qtwebviewfunctions.cpp
+++ b/src/webview/qtwebviewfunctions.cpp
@@ -61,9 +61,12 @@ QT_BEGIN_NAMESPACE
void QtWebView::initialize()
{
if (QWebViewFactory::requiresExtraInitializationSteps()) {
+ // There might be plugins available, but their dependencies might not be met,
+ // so make sure we have a valid plugin before using it.
+ // Note: A warning will be printed later if we're unable to load the plugin.
QWebViewPlugin *plugin = QWebViewFactory::getPlugin();
- Q_ASSERT(plugin);
- plugin->prepare();
+ if (plugin)
+ plugin->prepare();
}
}