[Qt][WK2] QWebDownloadItem should be registered in the experimental plugin.
authoralexis.menard@openbossa.org <alexis.menard@openbossa.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Nov 2011 14:35:08 +0000 (14:35 +0000)
committeralexis.menard@openbossa.org <alexis.menard@openbossa.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Nov 2011 14:35:08 +0000 (14:35 +0000)
https://bugs.webkit.org/show_bug.cgi?id=73132

Reviewed by Simon Hausmann.

Make sure QWebDownloadItem is registered in the right plugin.

* declarative/experimental/plugin.cpp:
* declarative/plugin.cpp:
(WebKitQmlPlugin::registerTypes):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@101171 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/qt/ChangeLog
Source/WebKit/qt/declarative/experimental/plugin.cpp
Source/WebKit/qt/declarative/plugin.cpp

index 585dcd6..88fe66e 100644 (file)
@@ -1,3 +1,16 @@
+2011-11-25  Alexis Menard  <alexis.menard@openbossa.org>
+
+        [Qt][WK2] QWebDownloadItem should be registered in the experimental plugin.
+        https://bugs.webkit.org/show_bug.cgi?id=73132
+
+        Reviewed by Simon Hausmann.
+
+        Make sure QWebDownloadItem is registered in the right plugin.
+
+        * declarative/experimental/plugin.cpp:
+        * declarative/plugin.cpp:
+        (WebKitQmlPlugin::registerTypes):
+
 2011-11-22  Pavel Feldman  <pfeldman@google.com>
 
         Web Inspector: remove Inspector::bringToFront from the protocol.
index 3e682fd..86312e1 100644 (file)
@@ -19,6 +19,7 @@
 
 #include "qquickwebpage_p.h"
 #include "qquickwebview_p.h"
+#include "qwebdownloaditem_p.h"
 
 #include <QtDeclarative/qdeclarative.h>
 #include <QtDeclarative/qdeclarativeextensionplugin.h>
@@ -40,6 +41,7 @@ public:
     {
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebKit.experimental"));
 
+        qmlRegisterUncreatableType<QWebDownloadItem>(uri, 3, 0, "DownloadItem", QObject::tr("Cannot create separate instance of DownloadItem"));
         qmlRegisterExtendedType<QQuickWebView, QQuickWebViewExperimentalExtension>(uri, 3, 0, "WebView");
         qmlRegisterUncreatableType<QQuickWebViewExperimental>(uri, 3, 0, "QQuickWebViewExperimental",
             QObject::tr("Cannot create separate instance of QQuickWebViewExperimental"));
index 91634ee..dc9cb7e 100644 (file)
@@ -25,7 +25,6 @@
 #if defined(HAVE_WEBKIT2)
 #include "qquickwebpage_p.h"
 #include "qquickwebview_p.h"
-#include "qwebdownloaditem_p.h"
 #include "qwebpreferences_p.h"
 
 #include <QtNetwork/qnetworkreply.h>
@@ -52,7 +51,6 @@ public:
         qmlRegisterUncreatableType<QWebPreferences>(uri, 3, 0, "WebPreferences", QObject::tr("Cannot create separate instance of WebPreferences"));
         qmlRegisterUncreatableType<QQuickWebPage>(uri, 3, 0, "WebPage", QObject::tr("Cannot create separate instance of WebPage, use WebView"));
         qmlRegisterUncreatableType<QNetworkReply>(uri, 3, 0, "NetworkReply", QObject::tr("Cannot create separate instance of NetworkReply"));
-        qmlRegisterUncreatableType<QWebDownloadItem>(uri, 5, 0, "DownloadItem", QObject::tr("Cannot create separate instance of DownloadItem"));
 #endif
     }
 };