Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (109100 => 109101)
--- trunk/Source/WebKit/qt/ChangeLog 2012-02-28 13:15:16 UTC (rev 109100)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-02-28 13:30:26 UTC (rev 109101)
@@ -1,3 +1,14 @@
+2012-02-27 Caio Marcelo de Oliveira Filho <[email protected]>
+
+ [Qt] Move registration of experimental types to the proper plugin
+ https://bugs.webkit.org/show_bug.cgi?id=79706
+
+ Reviewed by Tor Arne Vestbø.
+
+ * declarative/experimental/plugin.cpp:
+ * declarative/plugin.cpp:
+ (WebKitQmlPlugin::registerTypes):
+
2012-02-28 Antti Koivisto <[email protected]>
Try to fix build.
Modified: trunk/Source/WebKit/qt/declarative/experimental/plugin.cpp (109100 => 109101)
--- trunk/Source/WebKit/qt/declarative/experimental/plugin.cpp 2012-02-28 13:15:16 UTC (rev 109100)
+++ trunk/Source/WebKit/qt/declarative/experimental/plugin.cpp 2012-02-28 13:30:26 UTC (rev 109101)
@@ -23,11 +23,13 @@
#include "qquicknetworkrequest_p.h"
#include "qquickwebpage_p.h"
#include "qquickwebview_p.h"
+#include "qtwebsecurityorigin_p.h"
#include "qwebdownloaditem_p.h"
+#include "qwebnavigationhistory_p.h"
+#include "qwebpermissionrequest_p.h"
+#include "qwebpreferences_p.h"
#include "qwebviewportinfo_p.h"
-#include "qwebnavigationhistory_p.h"
-
#include <QtDeclarative/qdeclarative.h>
#include <QtDeclarative/qdeclarativeextensionplugin.h>
@@ -54,6 +56,10 @@
qmlRegisterUncreatableType<QWebDownloadItem>(uri, 1, 0, "DownloadItem", QObject::tr("Cannot create separate instance of DownloadItem"));
qmlRegisterUncreatableType<QWebNavigationListModel>(uri, 1, 0, "NavigationListModel", QObject::tr("Cannot create separate instance of NavigationListModel"));
qmlRegisterUncreatableType<QWebNavigationHistory>(uri, 1, 0, "NavigationHistory", QObject::tr("Cannot create separate instance of NavigationHistory"));
+ qmlRegisterUncreatableType<QWebPreferences>(uri, 1, 0, "WebPreferences", QObject::tr("Cannot create separate instance of WebPreferences"));
+ qmlRegisterUncreatableType<QWebPermissionRequest>(uri, 1, 0, "PermissionRequest", QObject::tr("Cannot create separate instance of PermissionRequest"));
+ qmlRegisterUncreatableType<QtWebSecurityOrigin>(uri, 1, 0, "SecurityOrigin", QObject::tr("Cannot create separate instance of SecurityOrigin"));
+
qmlRegisterExtendedType<QQuickWebView, QQuickWebViewExperimentalExtension>(uri, 1, 0, "WebView");
qmlRegisterUncreatableType<QQuickWebViewExperimental>(uri, 1, 0, "WebViewExperimental",
QObject::tr("Cannot create separate instance of WebViewExperimental"));
Modified: trunk/Source/WebKit/qt/declarative/plugin.cpp (109100 => 109101)
--- trunk/Source/WebKit/qt/declarative/plugin.cpp 2012-02-28 13:15:16 UTC (rev 109100)
+++ trunk/Source/WebKit/qt/declarative/plugin.cpp 2012-02-28 13:30:26 UTC (rev 109101)
@@ -25,12 +25,9 @@
#if defined(HAVE_WEBKIT2)
#include "qquickwebpage_p.h"
#include "qquickwebview_p.h"
-#include "qtwebsecurityorigin_p.h"
#include "qwebiconimageprovider_p.h"
#include "qwebloadrequest_p.h"
#include "qwebnavigationrequest_p.h"
-#include "qwebpermissionrequest_p.h"
-#include "qwebpreferences_p.h"
#include <QtDeclarative/qdeclarativeengine.h>
#include <QtNetwork/qnetworkreply.h>
@@ -62,14 +59,10 @@
#if defined(HAVE_WEBKIT2)
qmlRegisterType<QQuickWebView>(uri, 3, 0, "WebView");
- 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<QWebPermissionRequest>(uri, 3, 0, "PermissionRequest", QObject::tr("Cannot create separate instance of PermissionRequest"));
qmlRegisterUncreatableType<QWebNavigationRequest>(uri, 3, 0, "NavigationRequest", QObject::tr("Cannot create separate instance of NavigationRequest"));
qmlRegisterUncreatableType<QWebLoadRequest>(uri, 3, 0, "WebLoadRequest", QObject::tr("Cannot create separate instance of WebLoadRequest"));
- qmlRegisterUncreatableType<QtWebSecurityOrigin>(uri, 3, 0, "SecurityOrigin", QObject::tr("Cannot create separate instance of SecurityOrigin"));
-
#endif
}
};
