diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
| commit | 3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch) | |
| tree | 73dc228333948738bbe02976cacca8cd382bc978 /Source/WebKit/qt/declarative/plugin.cpp | |
| parent | b32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff) | |
| download | qtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz | |
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/WebKit/qt/declarative/plugin.cpp')
| -rw-r--r-- | Source/WebKit/qt/declarative/plugin.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/Source/WebKit/qt/declarative/plugin.cpp b/Source/WebKit/qt/declarative/plugin.cpp index 1d44be23f..db748952a 100644 --- a/Source/WebKit/qt/declarative/plugin.cpp +++ b/Source/WebKit/qt/declarative/plugin.cpp @@ -25,13 +25,8 @@ #include "qdeclarativewebview_p.h" #endif -#if (HAVE(QT5)) #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" @@ -46,12 +41,8 @@ QT_BEGIN_NAMESPACE -#if QT_VERSION >= 0x050000 class WebKitQmlPlugin : public QQmlExtensionPlugin { Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json") -#else -class WebKitQmlPlugin : public QDeclarativeExtensionPlugin { -#endif Q_OBJECT public: #if defined(HAVE_WEBKIT2) @@ -88,7 +79,3 @@ public: QT_END_NAMESPACE #include "plugin.moc" - -#if QT_VERSION < 0x050000 -Q_EXPORT_PLUGIN2(qmlwebkitplugin, QT_PREPEND_NAMESPACE(WebKitQmlPlugin)); -#endif |