summaryrefslogtreecommitdiff
path: root/src/webpluginfactory.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-11-18 11:27:03 +0100
committerAndrea Diamantini <adjam7@gmail.com>2009-11-18 11:27:03 +0100
commita8eb882b2bdeb39f810b2d9e5dff3be5a3c330c7 (patch)
tree0a0b35dc4661e4dc2c35e629b4f15f76e4e8b6bc /src/webpluginfactory.cpp
parentMerge commit 'refs/merge-requests/2106' of git://gitorious.org/rekonq/mainlin... (diff)
parentKIO download system (diff)
downloadrekonq-a8eb882b2bdeb39f810b2d9e5dff3be5a3c330c7.tar.xz
FIxing conflicts
Merge branch 'rekonq04' into dev04try Conflicts: src/CMakeLists.txt
Diffstat (limited to 'src/webpluginfactory.cpp')
-rw-r--r--src/webpluginfactory.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/webpluginfactory.cpp b/src/webpluginfactory.cpp
index 3daffbb6..af799905 100644
--- a/src/webpluginfactory.cpp
+++ b/src/webpluginfactory.cpp
@@ -38,7 +38,7 @@
WebPluginFactory::WebPluginFactory(QObject *parent)
- : QWebPluginFactory(parent)
+ : KWebPluginFactory(parent)
{
}
@@ -75,16 +75,13 @@ QObject *WebPluginFactory::create(const QString &mimeType,
return new PreviewImage(url, title, number, isFavorite);
}
- // this let QtWebKit using builtin plugins
- // to load in example flash contents and so on..
- kDebug() << "No plugins found for" << mimeType << ". Falling back to QtWebKit ones...";
- return 0;
+ return KWebPluginFactory::create(mimeType, url, argumentNames, argumentValues);
}
QList<QWebPluginFactory::Plugin> WebPluginFactory::plugins() const
{
- QList<QWebPluginFactory::Plugin> plugins;
+ QList<KWebPluginFactory::Plugin> plugins = KWebPluginFactory::plugins();
QWebPluginFactory::Plugin p;
p.name = "application/image-preview";