diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-01 12:34:00 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-01 10:56:59 +0000 |
| commit | ea590d74eae21dd70b189e0b8ba4bfb6a9bddb94 (patch) | |
| tree | ac0f5bbb0077d9a993ed9a5f7d4188dab0111741 | |
| parent | 540119ba890eb25836980c433d041b687428fdb2 (diff) | |
Blacklist vlc plugin5.4
The VLC plugin may load a plugins of its own that uses Qt4.
Change-Id: I5229a360f7d08d024fb93df1a2993fd7c0176848
Task-number: QTBUG-45431
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| -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 a674ad39d..b8b9f553f 100644 --- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp +++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp @@ -147,7 +147,8 @@ bool PluginPackage::isPluginBlacklisted() // TODO: enumerate all plugins that are incompatible with Qt5. const QLatin1String pluginBlacklist[] = { QLatin1String("skypebuttons"), - QLatin1String("libkpartsplugin") + QLatin1String("libkpartsplugin"), + QLatin1String("libvlcplugin") }; QString baseName = QFileInfo(static_cast<QString>(m_path)).baseName(); |