diff options
| author | Sune Vuorela <sune@vuorela.dk> | 2014-10-13 20:39:26 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-10-16 12:06:28 +0200 |
| commit | a018bd8f103707b5762b262ceaeec66d50f56cc0 (patch) | |
| tree | a17b119ce64098e5953bd577e44bc38a41f4bce4 | |
| parent | dd1920f7331f1bc5719efdd4819ada0ffada501d (diff) | |
| download | qtwebkit-a018bd8f103707b5762b262ceaeec66d50f56cc0.tar.gz | |
Blacklist libkpartsplugin
KPartsPlugin is built using qt4, and loading that into a Qt5 QtWebkit
makes stuff crash.
Change-Id: I47d01dfe3b215192b012911013b352ea5b5b1530
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.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 679480bd5..a674ad39d 100644 --- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp +++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp @@ -146,7 +146,8 @@ bool PluginPackage::isPluginBlacklisted() { // TODO: enumerate all plugins that are incompatible with Qt5. const QLatin1String pluginBlacklist[] = { - QLatin1String("skypebuttons") + QLatin1String("skypebuttons"), + QLatin1String("libkpartsplugin") }; QString baseName = QFileInfo(static_cast<QString>(m_path)).baseName(); |