Title: [101171] trunk/Source/WebKit/qt
- Revision
- 101171
- Author
- [email protected]
- Date
- 2011-11-25 06:35:08 -0800 (Fri, 25 Nov 2011)
Log Message
[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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (101170 => 101171)
--- trunk/Source/WebKit/qt/ChangeLog 2011-11-25 14:32:21 UTC (rev 101170)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-11-25 14:35:08 UTC (rev 101171)
@@ -1,3 +1,16 @@
+2011-11-25 Alexis Menard <[email protected]>
+
+ [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 <[email protected]>
Web Inspector: remove Inspector::bringToFront from the protocol.
Modified: trunk/Source/WebKit/qt/declarative/experimental/plugin.cpp (101170 => 101171)
--- trunk/Source/WebKit/qt/declarative/experimental/plugin.cpp 2011-11-25 14:32:21 UTC (rev 101170)
+++ trunk/Source/WebKit/qt/declarative/experimental/plugin.cpp 2011-11-25 14:35:08 UTC (rev 101171)
@@ -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 @@
{
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"));
Modified: trunk/Source/WebKit/qt/declarative/plugin.cpp (101170 => 101171)
--- trunk/Source/WebKit/qt/declarative/plugin.cpp 2011-11-25 14:32:21 UTC (rev 101170)
+++ trunk/Source/WebKit/qt/declarative/plugin.cpp 2011-11-25 14:35:08 UTC (rev 101171)
@@ -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 @@
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
}
};
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
