From a89b2ebb8e192c5e8cea21079bda2ee2c0c7dddd Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 25 May 2012 15:09:11 +0200 Subject: Imported WebKit commit eb5c1b8fe4d4b1b90b5137433fc58a91da0e6878 (http://svn.webkit.org/repository/webkit/trunk@118516) --- Source/WebKit/qt/declarative/plugin.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Source/WebKit/qt/declarative/plugin.cpp') diff --git a/Source/WebKit/qt/declarative/plugin.cpp b/Source/WebKit/qt/declarative/plugin.cpp index 08532bf01..f8c532a06 100644 --- a/Source/WebKit/qt/declarative/plugin.cpp +++ b/Source/WebKit/qt/declarative/plugin.cpp @@ -44,7 +44,11 @@ QT_BEGIN_NAMESPACE +#if QT_VERSION >= 0x050000 +class WebKitQmlPlugin : public QQmlExtensionPlugin { +#else class WebKitQmlPlugin : public QDeclarativeExtensionPlugin { +#endif Q_OBJECT public: #if defined(HAVE_WEBKIT2) -- cgit v1.2.1