diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-11-18 11:27:03 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-11-18 11:27:03 +0100 |
| commit | a8eb882b2bdeb39f810b2d9e5dff3be5a3c330c7 (patch) | |
| tree | 0a0b35dc4661e4dc2c35e629b4f15f76e4e8b6bc /src/webpluginfactory.h | |
| parent | Merge commit 'refs/merge-requests/2106' of git://gitorious.org/rekonq/mainlin... (diff) | |
| parent | KIO download system (diff) | |
| download | rekonq-a8eb882b2bdeb39f810b2d9e5dff3be5a3c330c7.tar.xz | |
FIxing conflicts
Merge branch 'rekonq04' into dev04try
Conflicts:
src/CMakeLists.txt
Diffstat (limited to 'src/webpluginfactory.h')
| -rw-r--r-- | src/webpluginfactory.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/webpluginfactory.h b/src/webpluginfactory.h index 738605db..30a366d4 100644 --- a/src/webpluginfactory.h +++ b/src/webpluginfactory.h @@ -28,13 +28,15 @@ #define WEB_PLUGIN_FACTORY_H +// KDE Includes +#include <KWebPluginFactory> + // Qt Includes -#include <QtWebKit/QWebPluginFactory> #include <QtCore/QList> #include <QtGui/QWidget> -class WebPluginFactory : public QWebPluginFactory +class WebPluginFactory : public KWebPluginFactory { Q_OBJECT |