Changeset 95545 in webkit

Timestamp:

Sep 20, 2011 9:08:20 AM (13 years ago)

Author:

alexis.menard@openbossa.org

Message:

[Qt][WK2] Export QNetworkReply in the QtWebKit QML module.
​https://bugs.webkit.org/show_bug.cgi?id=68401

Reviewed by Simon Hausmann.

Add QNetworkReply in the QtWebKit module. We use the enum QNetworkReply::NetworkError
as the error code when the load fails. It is not used in the QtQuick module therefore
the QML team thinks it should belong here. Also added some auto-tests to cover the
loading errors.

• UIProcess/API/qt/qmlplugin/plugin.cpp:

(WebKit2QmlPlugin::registerTypes):

• UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_loadFail.qml: Added.
• UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadFail.qml: Added.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/qmlplugin/plugin.cpp (modified) (2 diffs)
• UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_loadFail.qml (added)
• UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadFail.qml (added)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-09-20  Alexis Menard  <alexis.menard@openbossa.org>
+
+        [Qt][WK2] Export QNetworkReply in the QtWebKit QML module.
+        https://bugs.webkit.org/show_bug.cgi?id=68401
+
+        Reviewed by Simon Hausmann.
+
+        Add QNetworkReply in the QtWebKit module. We use the enum QNetworkReply::NetworkError
+        as the error code when the load fails. It is not used in the QtQuick module therefore
+        the QML team thinks it should belong here. Also added some auto-tests to cover the
+        loading errors.
+
+        * UIProcess/API/qt/qmlplugin/plugin.cpp:
+        (WebKit2QmlPlugin::registerTypes):
+        * UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_loadFail.qml: Added.
+        * UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadFail.qml: Added.
+
 2011-09-20  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebKit2/UIProcess/API/qt/qmlplugin/plugin.cpp

@@ -25 +25 @@
 #include <QtDeclarative/qdeclarative.h>
 #include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtNetwork/qnetworkreply.h>
 
 QT_BEGIN_NAMESPACE
@@ -38 +39 @@
         qmlRegisterUncreatableType<QWebNavigationController>(uri, 5, 0, "NavigationController", QObject::tr("Cannot create separate instance of NavigationController"));
         qmlRegisterUncreatableType<QTouchWebPage>(uri, 5, 0, "TouchWebPage", QObject::tr("Cannot create separate instance of TouchWebPage, use TouchWebView"));
+        qmlRegisterUncreatableType<QNetworkReply>(uri, 5, 0, "NetworkReply", QObject::tr("Cannot create separate instance of NetworkReply"));
     }
 };