projects
/
qtwebkit-opensource-src.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
065ae9d
)
Blacklist libkpartsplugin
author
Sune Vuorela
<sune@vuorela.dk>
Mon, 13 Oct 2014 18:39:26 +0000
(20:39 +0200)
committer
Felix Geyer
<fgeyer@debian.org>
Wed, 1 Apr 2015 17:44:29 +0000
(17:44 +0000)
KPartsPlugin is built using qt4, and loading that into a Qt5 QtWebkit
makes stuff crash.
Change-Id: I47d01dfe3b215192b012911013b352ea5b5b1530
Gbp-Pq: Name blacklist_libkpartsplugin.patch
Source/WebCore/plugins/qt/PluginPackageQt.cpp
patch
|
blob
|
history
diff --git
a/Source/WebCore/plugins/qt/PluginPackageQt.cpp
b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
index 679480bd575f87ba511d4ce1fa4d0a22fee57cfe..a674ad39d67808e242f046fe8ca8084a53ed754f 100644
(file)
--- 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();