diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
| commit | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch) | |
| tree | 988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Source/WebKit/qt/declarative/plugin.cpp | |
| parent | dd91e772430dc294e3bf478c119ef8d43c0a3358 (diff) | |
| download | qtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz | |
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Source/WebKit/qt/declarative/plugin.cpp')
| -rw-r--r-- | Source/WebKit/qt/declarative/plugin.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/WebKit/qt/declarative/plugin.cpp b/Source/WebKit/qt/declarative/plugin.cpp index 968b1fe18..08532bf01 100644 --- a/Source/WebKit/qt/declarative/plugin.cpp +++ b/Source/WebKit/qt/declarative/plugin.cpp @@ -17,12 +17,19 @@ Boston, MA 02110-1301, USA. */ +#include "qglobal.h" + #if defined(HAVE_QQUICK1) #include "qdeclarativewebview_p.h" #endif +#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) +#include <QtQml/qqml.h> +#include <QtQml/qqmlextensionplugin.h> +#else #include <QtDeclarative/qdeclarative.h> #include <QtDeclarative/qdeclarativeextensionplugin.h> +#endif #if defined(HAVE_WEBKIT2) #include "private/qquickwebpage_p.h" @@ -31,8 +38,8 @@ #include "private/qwebloadrequest_p.h" #include "private/qwebnavigationrequest_p.h" -#include <QtDeclarative/qdeclarativeengine.h> #include <QtNetwork/qnetworkreply.h> +#include <QtQml/qqmlengine.h> #endif QT_BEGIN_NAMESPACE @@ -41,7 +48,7 @@ class WebKitQmlPlugin : public QDeclarativeExtensionPlugin { Q_OBJECT public: #if defined(HAVE_WEBKIT2) - virtual void initializeEngine(QDeclarativeEngine* engine, const char* uri) + virtual void initializeEngine(QQmlEngine* engine, const char* uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebKit")); engine->addImageProvider(QLatin1String("webicon"), new QWebIconImageProvider); |