Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)

New snapshot with Windows build fixes

4 files changed, 6 insertions, 2 deletions

diff --git a/Source/WebKit/qt/declarative/experimental/plugin.cpp b/Source/WebKit/qt/declarative/experimental/plugin.cpp
index 567476700..e6ffeda6e 100644
--- a/Source/WebKit/qt/declarative/experimental/plugin.cpp
+++ b/Source/WebKit/qt/declarative/experimental/plugin.cpp
@@ -45,6 +45,7 @@ public:
 
 class WebKitQmlExperimentalExtensionPlugin: public QQmlExtensionPlugin {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json")
 public:
     virtual void registerTypes(const char* uri)
     {
@@ -76,5 +77,3 @@ public:
 QT_END_NAMESPACE
 
 #include "plugin.moc"
-
-Q_EXPORT_PLUGIN2(qmlwebkitpluginexperimental, QT_PREPEND_NAMESPACE(WebKitQmlExperimentalExtensionPlugin));
diff --git a/Source/WebKit/qt/declarative/experimental/plugin.json b/Source/WebKit/qt/declarative/experimental/plugin.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/Source/WebKit/qt/declarative/experimental/plugin.json
@@ -0,0 +1 @@
+{}
diff --git a/Source/WebKit/qt/declarative/plugin.cpp b/Source/WebKit/qt/declarative/plugin.cpp
index 988b36e0e..1d44be23f 100644
--- a/Source/WebKit/qt/declarative/plugin.cpp
+++ b/Source/WebKit/qt/declarative/plugin.cpp
@@ -48,6 +48,7 @@ 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
@@ -88,4 +89,6 @@ QT_END_NAMESPACE
 
 #include "plugin.moc"
 
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN2(qmlwebkitplugin, QT_PREPEND_NAMESPACE(WebKitQmlPlugin));
+#endif
diff --git a/Source/WebKit/qt/declarative/plugin.json b/Source/WebKit/qt/declarative/plugin.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/Source/WebKit/qt/declarative/plugin.json
@@ -0,0 +1 @@
+{}