diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-01 16:21:11 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-01 16:22:28 +0200 |
| commit | 6801ec34b32444aa6a19c84488a43a150f6818c7 (patch) | |
| tree | d7c1a8b8e9222d6050201d0042b087f26be597e7 | |
| parent | dbbef9bee537a88a9d3e1656f4b7935023aacacf (diff) | |
| parent | ea590d74eae21dd70b189e0b8ba4bfb6a9bddb94 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: Icc1f3caf891dd114064f0fd37931d9bf6c7ccfc1
| -rw-r--r-- | Source/WebCore/plugins/qt/PluginPackageQt.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp index b86ab9f66..a923d49aa 100644 --- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp +++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp @@ -152,7 +152,8 @@ bool PluginPackage::isPluginBlacklisted() // subplugins linked against Qt 4 but without using DEEPBIND. const QLatin1String pluginBlacklist[] = { QLatin1String("skypebuttons"), - QLatin1String("libkpartsplugin") + QLatin1String("libkpartsplugin"), + QLatin1String("libvlcplugin") }; QString baseName = QFileInfo(static_cast<QString>(m_path)).baseName(); |