Move WebView to an extension plugin.

Using WebView now requires:

import org.webkit 1.0

Task-number: QT-2995

demos/declarative/flickr/common/ImageDetails.qml

@@ -1,4 +1,5 @@
 import Qt 4.6
+import org.webkit 1.0
 
 Flipable {
     id: container

demos/declarative/webbrowser/content/FlickableWebView.qml

@@ -1,4 +1,5 @@
 import Qt 4.6
+import org.webkit 1.0
 
 Flickable {
     property alias title: webView.title

demos/declarative/webbrowser/webbrowser.qml

@@ -1,4 +1,5 @@
 import Qt 4.6
+import org.webkit 1.0
 
 import "content"
 

examples/declarative/webview/autosize.qml

@@ -1,4 +1,5 @@
 import Qt 4.6
+import org.webkit 1.0
 
 // The WebView size is determined by the width, height,
 // preferredWidth, and preferredHeight properties.

examples/declarative/webview/content/FieldText.qml

@@ -85,7 +85,7 @@ Item {
         font.bold: true
         text: label
         opacity: textEdit.text == '' ? 1 : 0
-        opacity: Behavior {
+        Behavior on opacity {
             NumberAnimation {
                 property: "opacity"
                 duration: 250

examples/declarative/webview/content/Mapping/Map.qml

@@ -1,4 +1,5 @@
 import Qt 4.6
+import org.webkit 1.0
 
 Item {
     id: page

examples/declarative/webview/evalandattach.qml

@@ -1,4 +1,5 @@
 import Qt 4.6
+import org.webkit 1.0
 
 Item {
     height: 640

examples/declarative/webview/googleMaps.qml

@@ -6,6 +6,7 @@
 // order to create a Map.
 
 import Qt 4.6
+import org.webkit 1.0
 import "content/Mapping"
 
 Map {

examples/declarative/webview/inline-html.qml

@@ -1,4 +1,5 @@
 import Qt 4.6
+import org.webkit 1.0
 
 // Inline HTML with loose formatting can be
 // set on the html property.

examples/declarative/webview/newwindows.qml

@@ -4,6 +4,7 @@
 // allow it on WebView with settings.javascriptCanOpenWindows: true
 
 import Qt 4.6
+import org.webkit 1.0
 
 Grid {
     columns: 3

examples/declarative/webview/qdeclarative-in-html.qml

@@ -1,4 +1,5 @@
 import Qt 4.6
+import org.webkit 1.0
 
 // The WebView supports QML data through the HTML OBJECT tag
 Rectangle {

examples/declarative/webview/transparent.qml

@@ -1,4 +1,5 @@
 import Qt 4.6
+import org.webkit 1.0
 
 // The WebView background is transparent
 // if the HTML does not specify a background

imports/org/webkit/qmldir

@@ -0,0 +1 @@
+plugin webkitqmlplugin

src/declarative/graphicsitems/graphicsitems.pri

@@ -84,10 +84,3 @@ SOURCES += \
     $$PWD/qdeclarativegraphicsobjectcontainer.cpp \
     $$PWD/qdeclarativeparticles.cpp \
     $$PWD/qdeclarativelayoutitem.cpp \
-
-contains(QT_CONFIG, webkit) {
-    QT+=webkit
-    SOURCES += $$PWD/qdeclarativewebview.cpp
-    HEADERS += $$PWD/qdeclarativewebview_p.h
-    HEADERS += $$PWD/qdeclarativewebview_p_p.h
-}

src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp

@@ -139,9 +139,6 @@ void QDeclarativeItemModule::defineModule()
     QML_REGISTER_TYPE(Qt,4,6,VisibleArea,QDeclarativeFlickableVisibleArea);
     QML_REGISTER_TYPE(Qt,4,6,VisualDataModel,QDeclarativeVisualDataModel);
     QML_REGISTER_TYPE(Qt,4,6,VisualItemModel,QDeclarativeVisualItemModel);
-#ifdef QT_WEBKIT_LIB
-    QML_REGISTER_TYPE(Qt,4,6,WebView,QDeclarativeWebView);
-#endif
 
     QML_REGISTER_NOCREATE_TYPE(QDeclarativeAnchors);
     QML_REGISTER_NOCREATE_TYPE(QGraphicsEffect);

src/plugins/qdeclarativemodules/qdeclarativemodules.pro

@@ -3,4 +3,5 @@ TEMPLATE = subdirs
 SUBDIRS += widgets
 
 contains(QT_CONFIG, multimedia): SUBDIRS += multimedia
+contains(QT_CONFIG, webkit): SUBDIRS += webkitqmlplugin
 

tests/auto/declarative/qdeclarativewebview/testtypes.h → src/plugins/qdeclarativemodules/webkitqmlplugin/plugin.cpp

@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
 **
-** This file is part of the test suite of the Qt Toolkit.
+** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -38,29 +38,29 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#ifndef TESTTYPES_H
-#define TESTTYPES_H
 
-#include <private/qdeclarativewebview_p.h>
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
 
-class MyWebView : public QDeclarativeWebView
+#include "qdeclarativewebview_p.h"
+#include "qdeclarativewebview_p_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class WebKitQmlPlugin : public QDeclarativeExtensionPlugin
 {
     Q_OBJECT
-    Q_PROPERTY(int pixelsPainted READ pixelsPainted);
-
 public:
-    MyWebView() : pp(0) {}
-
-    int pixelsPainted() const { return pp; }
-
-    void drawContents(QPainter *p, const QRect &r);
-
-private:
-    int pp;
+    virtual void registerTypes(const char *uri)
+    {
+        Q_ASSERT(QLatin1String(uri) == QLatin1String("org.webkit"));
+        qmlRegisterType<QDeclarativeWebView>(uri,1,0,"WebView");
+    }
 };
 
-QML_DECLARE_TYPE(MyWebView);
+QT_END_NAMESPACE
+
+#include "plugin.moc"
 
-void registerTypes();
+Q_EXPORT_PLUGIN2(webkitqmlplugin, QT_PREPEND_NAMESPACE(WebKitQmlPlugin));
 
-#endif // TESTTYPES_H

src/declarative/graphicsitems/qdeclarativewebview.cpp → src/plugins/qdeclarativemodules/webkitqmlplugin/qdeclarativewebview.cpp

@@ -42,11 +42,11 @@
 #include "qdeclarativewebview_p.h"
 #include "qdeclarativewebview_p_p.h"
 
-#include "qdeclarativepainteditem_p_p.h"
+#include <private/qdeclarativepainteditem_p_p.h>
 
 #include <qdeclarative.h>
 #include <qdeclarativeengine.h>
-#include <qdeclarativestate_p.h>
+#include <private/qdeclarativestate_p.h>
 
 #include <QDebug>
 #include <QPen>
@@ -61,7 +61,7 @@
 #include <QtWebKit/QWebFrame>
 #include <QtWebKit/QWebElement>
 #include <QtWebKit/QWebSettings>
-#include <qlistmodelinterface_p.h>
+#include <private/qlistmodelinterface_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -128,6 +128,8 @@ class QDeclarativeWebViewPrivate : public QDeclarativePaintedItemPrivate
     usually laying out the web content to fit the preferredWidth.
 
     \qml
+    import org.webkit 1.0
+
     WebView {
         url: "http://www.nokia.com"
         width: 490
@@ -929,7 +931,7 @@ QWebPage *QDeclarativeWebView::page() const
         }
     \endqml
 */
-QDeclarativeWebSettings *QDeclarativeWebView::settingsObject() const
+QObject *QDeclarativeWebView::settingsObject() const
 {
     Q_D(const QDeclarativeWebView);
     d->settings.s = page()->settings();

src/declarative/graphicsitems/qdeclarativewebview_p.h → src/plugins/qdeclarativemodules/webkitqmlplugin/qdeclarativewebview_p.h

@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVEWEBVIEW_H
 #define QDECLARATIVEWEBVIEW_H
 
-#include "qdeclarativepainteditem_p.h"
+#include <private/qdeclarativepainteditem_p.h>
 
 #include <QtGui/QAction>
 #include <QtCore/QUrl>
@@ -82,7 +82,6 @@ class Q_DECLARATIVE_EXPORT QDeclarativeWebPage : public QWebPage
 
 
 class QDeclarativeWebViewAttached;
-class QDeclarativeWebSettings;
 
 //### TODO: browser plugins
 
@@ -112,7 +111,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeWebView : public QDeclarativePaintedItem
     Q_PROPERTY(QAction* forward READ forwardAction CONSTANT)
     Q_PROPERTY(QAction* stop READ stopAction CONSTANT)
 
-    Q_PROPERTY(QDeclarativeWebSettings* settings READ settingsObject CONSTANT)
+    Q_PROPERTY(QObject* settings READ settingsObject CONSTANT)
 
     Q_PROPERTY(QDeclarativeListProperty<QObject> javaScriptWindowObjects READ javaScriptWindowObjects CONSTANT)
 
@@ -169,7 +168,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeWebView : public QDeclarativePaintedItem
 
     QWebHistory *history() const;
     QWebSettings *settings() const;
-    QDeclarativeWebSettings *settingsObject() const;
+    QObject *settingsObject() const;
 
     bool renderingEnabled() const;
     void setRenderingEnabled(bool);

src/plugins/qdeclarativemodules/webkitqmlplugin/webkitqmlplugin.pro

@@ -0,0 +1,18 @@
+TARGET  = webkitqmlplugin
+include(../../qpluginbase.pri)
+
+contains(QT_CONFIG, webkit) {
+    QT += webkit declarative
+
+    SOURCES += qdeclarativewebview.cpp plugin.cpp
+    HEADERS += qdeclarativewebview_p.h
+    HEADERS += qdeclarativewebview_p_p.h
+
+    QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/org/webkit
+    target.path = $$[QT_INSTALL_IMPORTS]/org/webkit
+
+    qmldir.files += $$QT_BUILD_TREE/imports/org/webkit/qmldir
+    qmldir.path +=  $$[QT_INSTALL_IMPORTS]/org/webkit
+
+    INSTALLS += target qmldir
+}

tests/auto/declarative/qdeclarativewebview/data/basic.qml

@@ -1,4 +1,5 @@
 import Qt 4.6
+import org.webkit 1.0
 
 WebView {
     url: "basic.html"

tests/auto/declarative/qdeclarativewebview/data/elements.qml

@@ -1,4 +1,5 @@
 import Qt 4.6
+import org.webkit 1.0
 
 WebView {
     url: "elements.html"

tests/auto/declarative/qdeclarativewebview/data/javaScript.qml

@@ -1,4 +1,5 @@
 import Qt 4.6
+import org.webkit 1.0
 
 WebView {
     url: "javaScript.html"

tests/auto/declarative/qdeclarativewebview/data/loadError.qml

@@ -1,4 +1,5 @@
 import Qt 4.6
+import org.webkit 1.0
 
 WebView {
     url: "does-not-exist.html"

tests/auto/declarative/qdeclarativewebview/data/newwindows.qml

@@ -1,6 +1,7 @@
 // Demonstrates opening new WebViews from HTML
 
 import Qt 4.6
+import org.webkit 1.0
 
 Grid {
     columns: 3

tests/auto/declarative/qdeclarativewebview/data/propertychanges.qml

@@ -1,4 +1,5 @@
 import Qt 4.6
+import org.webkit 1.0
 
 Item {
     width: 240
@@ -30,4 +31,4 @@ Item {
                 pressGrabTime: 200
             }
     }
-}
+}

tests/auto/declarative/qdeclarativewebview/data/sethtml.qml

@@ -1,4 +1,5 @@
 import Qt 4.6
+import org.webkit 1.0
 
 WebView {
     html: "<p>This is a <b>string</b> set on the WebView"

tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro

@@ -3,8 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative
 contains(QT_CONFIG,webkit): QT += webkit
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qdeclarativewebview.cpp testtypes.cpp
-HEADERS += testtypes.h
+SOURCES += tst_qdeclarativewebview.cpp
 
 # Define SRCDIR equal to test's source directory
 DEFINES += SRCDIR=\\\"$$PWD\\\"