Merge branch 'HomePageEmbedded2'

Seems fixed now. WE HAVE HOME PAGE!!

Conflicts:
	src/mainview.cpp

1 files changed, 52 insertions, 0 deletions

diff --git a/src/webpluginfactory.h b/src/webpluginfactory.h
new file mode 100644
index 00000000..c63b0ce3
--- /dev/null
+++ b/src/webpluginfactory.h
@@ -0,0 +1,52 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy 
+* defined in Section 14 of version 3 of the license.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+#ifndef WEB_PLUGIN_FACTORY_H
+#define WEB_PLUGIN_FACTORY_H
+
+
+#include <QtWebKit/QWebPluginFactory>
+#include <QtCore/QList>
+#include <QtGui/QWidget>
+
+
+class WebPluginFactory : public QWebPluginFactory
+{
+Q_OBJECT
+
+public:
+    WebPluginFactory(QObject *parent);
+    ~WebPluginFactory();
+
+    virtual QObject *create(const QString &mimeType,
+                            const QUrl &url,
+                            const QStringList &argumentNames,
+                            const QStringList &argumentValues) const;
+
+    virtual QList<Plugin> plugins() const;
+};
+
+#endif // WEB_PLUGIN_FACTORY_H