Diff
Modified: trunk/ChangeLog (97765 => 97766)
--- trunk/ChangeLog 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/ChangeLog 2011-10-18 16:59:44 UTC (rev 97766)
@@ -1,3 +1,16 @@
+2011-10-18 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Merge QML plugin for WebKit2 with the original WebKit1 plugin
+
+ We don't need a sepearate plugin, as we no longer expose the WK2
+ APIs under QtWebKit.experimental, but now use QtWebKit. The version
+ was also changed to 3.0 instead of 5.0, as the original plugin was
+ versioned 1.0, and bumping to 3.0 fits the scheme used by QtWebKit releases.
+
+ Reviewed by Andreas Kling.
+
+ * Source/WebKit.pro:
+
2011-10-18 Zan Dobersek <[email protected]>
[Gtk] Support for client-based geolocation
Modified: trunk/Source/WebKit/qt/ChangeLog (97765 => 97766)
--- trunk/Source/WebKit/qt/ChangeLog 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-10-18 16:59:44 UTC (rev 97766)
@@ -1,3 +1,18 @@
+2011-10-18 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Merge QML plugin for WebKit2 with the original WebKit1 plugin
+
+ We don't need a separate plugin, as we no longer expose the WK2
+ APIs under QtWebKit.experimental, but now use QtWebKit. The version
+ was also changed to 3.0 instead of 5.0, as the original plugin was
+ versioned 1.0, and bumping to 3.0 fits the scheme used by QtWebKit releases.
+
+ Reviewed by Andreas Kling.
+
+ * declarative/declarative.pro:
+ * declarative/plugin.cpp:
+ (WebKitQmlPlugin::registerTypes):
+
2011-10-15 Adam Barth <[email protected]>
Rename ENABLE(TILED_BACKING_STORE) to USE(TILED_BACKING_STORE)
Modified: trunk/Source/WebKit/qt/declarative/declarative.pro (97765 => 97766)
--- trunk/Source/WebKit/qt/declarative/declarative.pro 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/Source/WebKit/qt/declarative/declarative.pro 2011-10-18 16:59:44 UTC (rev 97766)
@@ -47,6 +47,8 @@
SOURCES += qdeclarativewebview.cpp plugin.cpp
HEADERS += qdeclarativewebview_p.h
+webkit2: DEFINES += HAVE_WEBKIT2
+
DESTDIR = $$OUTPUT_DIR/imports/$$TARGETPATH
target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
Modified: trunk/Source/WebKit/qt/declarative/plugin.cpp (97765 => 97766)
--- trunk/Source/WebKit/qt/declarative/plugin.cpp 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/Source/WebKit/qt/declarative/plugin.cpp 2011-10-18 16:59:44 UTC (rev 97766)
@@ -22,6 +22,16 @@
#include <QtDeclarative/qdeclarative.h>
#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#if defined(HAVE_WEBKIT2)
+#include "qdesktopwebview.h"
+#include "qtouchwebpage.h"
+#include "qtouchwebview.h"
+#include "qwebnavigationcontroller.h"
+#include "qwebpreferences.h"
+
+#include <QtNetwork/qnetworkreply.h>
+#endif
+
QT_BEGIN_NAMESPACE
class WebKitQmlPlugin : public QDeclarativeExtensionPlugin {
@@ -37,6 +47,15 @@
qmlRegisterRevision<QDeclarativeWebView, 0>("QtWebKit", 1, 0);
qmlRegisterRevision<QDeclarativeWebView, 1>("QtWebKit", 1, 1);
#endif
+
+#if defined(HAVE_WEBKIT2)
+ qmlRegisterType<QDesktopWebView>(uri, 3, 0, "DesktopWebView");
+ qmlRegisterType<QTouchWebView>(uri, 3, 0, "TouchWebView");
+ qmlRegisterUncreatableType<QWebNavigationController>(uri, 3, 0, "NavigationController", QObject::tr("Cannot create separate instance of NavigationController"));
+ qmlRegisterUncreatableType<QWebPreferences>(uri, 3, 0, "WebPreferences", QObject::tr("Cannot create separate instance of WebPreferences"));
+ qmlRegisterUncreatableType<QTouchWebPage>(uri, 3, 0, "TouchWebPage", QObject::tr("Cannot create separate instance of TouchWebPage, use TouchWebView"));
+ qmlRegisterUncreatableType<QNetworkReply>(uri, 3, 0, "NetworkReply", QObject::tr("Cannot create separate instance of NetworkReply"));
+#endif
}
};
Modified: trunk/Source/WebKit.pro (97765 => 97766)
--- trunk/Source/WebKit.pro 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/Source/WebKit.pro 2011-10-18 16:59:44 UTC (rev 97766)
@@ -32,8 +32,7 @@
webkit2 {
SUBDIRS += \
WebKit2/WebProcess.pro \
- WebKit2/UIProcess/API/qt/tests \
- WebKit2/UIProcess/API/qt/qmlplugin
+ WebKit2/UIProcess/API/qt/tests
}
exists($$PWD/WebKit/qt/declarative) {
Modified: trunk/Source/WebKit2/ChangeLog (97765 => 97766)
--- trunk/Source/WebKit2/ChangeLog 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-18 16:59:44 UTC (rev 97766)
@@ -1,3 +1,32 @@
+2011-10-18 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Merge QML plugin for WebKit2 with the original WebKit1 plugin
+
+ We don't need a separate plugin, as we no longer expose the WK2
+ APIs under QtWebKit.experimental, but now use QtWebKit. The version
+ was also changed to 3.0 instead of 5.0, as the original plugin was
+ versioned 1.0, and bumping to 3.0 fits the scheme used by QtWebKit releases.
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/API/qt/qmlplugin/plugin.cpp: Removed.
+ * UIProcess/API/qt/qmlplugin/qmldir: Removed.
+ * UIProcess/API/qt/qmlplugin/qmlplugin.pro: Removed.
+ * UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_linkHovered.qml:
+ * UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_loadFail.qml:
+ * UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_loadProgress.qml:
+ * UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_loadProgressSignal.qml:
+ * UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_navigationPolicyForUrl.qml:
+ * UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_preferences.qml:
+ * UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_properties.qml:
+ * UIProcess/API/qt/tests/qmltests/TouchWebView/tst_load.qml:
+ * UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadFail.qml:
+ * UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadNegativeSizeView.qml:
+ * UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadProgress.qml:
+ * UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadProgressSignal.qml:
+ * UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadZeroSizeView.qml:
+ * UIProcess/API/qt/tests/qmltests/TouchWebView/tst_properties.qml:
+
2011-10-18 Dinu Jacob <[email protected]>
[Qt][WK2] ASSERT when displaying context menu in input field
Deleted: trunk/Source/WebKit2/UIProcess/API/qt/qmlplugin/plugin.cpp (97765 => 97766)
--- trunk/Source/WebKit2/UIProcess/API/qt/qmlplugin/plugin.cpp 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qmlplugin/plugin.cpp 2011-10-18 16:59:44 UTC (rev 97766)
@@ -1,52 +0,0 @@
-/*
- Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include "qdesktopwebview.h"
-#include "qtouchwebpage.h"
-#include "qtouchwebview.h"
-#include "qwebnavigationcontroller.h"
-#include "qwebpreferences.h"
-
-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qdeclarativeextensionplugin.h>
-#include <QtNetwork/qnetworkreply.h>
-
-QT_BEGIN_NAMESPACE
-
-class WebKit2QmlPlugin : public QDeclarativeExtensionPlugin {
- Q_OBJECT
-public:
- virtual void registerTypes(const char* uri)
- {
- Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebKit.experimental"));
- qmlRegisterType<QDesktopWebView>(uri, 5, 0, "DesktopWebView");
- qmlRegisterType<QTouchWebView>(uri, 5, 0, "TouchWebView");
- qmlRegisterUncreatableType<QWebNavigationController>(uri, 5, 0, "NavigationController", QObject::tr("Cannot create separate instance of NavigationController"));
- qmlRegisterUncreatableType<QWebPreferences>(uri, 5, 0, "WebPreferences", QObject::tr("Cannot create separate instance of WebPreferences"));
- 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"));
- }
-};
-
-QT_END_NAMESPACE
-
-#include "plugin.moc"
-
-Q_EXPORT_PLUGIN2(webkit2qmlplugin, QT_PREPEND_NAMESPACE(WebKit2QmlPlugin));
-
Deleted: trunk/Source/WebKit2/UIProcess/API/qt/qmlplugin/qmldir (97765 => 97766)
--- trunk/Source/WebKit2/UIProcess/API/qt/qmlplugin/qmldir 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qmlplugin/qmldir 2011-10-18 16:59:44 UTC (rev 97766)
@@ -1 +0,0 @@
-plugin webkit2qmlplugin
Deleted: trunk/Source/WebKit2/UIProcess/API/qt/qmlplugin/qmlplugin.pro (97765 => 97766)
--- trunk/Source/WebKit2/UIProcess/API/qt/qmlplugin/qmlplugin.pro 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qmlplugin/qmlplugin.pro 2011-10-18 16:59:44 UTC (rev 97766)
@@ -1,34 +0,0 @@
-TEMPLATE = lib
-TARGET = webkit2qmlplugin
-TARGETPATH = QtWebKit/experimental
-CONFIG += qt plugin
-
-SOURCES += plugin.cpp
-
-include(../../../../../WebKit.pri)
-QT += declarative \
- network
-
-QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
-
-
-# From WK1 qml module. Copies the qmldir file to the build directory,
-# so we can use it in place without installing.
-QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
-copy2build.input = QMLDIRFILE
-copy2build.output = $$OUTPUT_DIR/imports/$$TARGETPATH/qmldir
-!contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS
-copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-copy2build.name = COPY ${QMAKE_FILE_IN}
-copy2build.CONFIG += no_link
-QMAKE_EXTRA_COMPILERS += copy2build
-
-
-DESTDIR = $$OUTPUT_DIR/imports/$$TARGETPATH
-
-target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-
-qmldir.files += $$PWD/qmldir
-qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-
-INSTALLS += target qmldir
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_linkHovered.qml (97765 => 97766)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_linkHovered.qml 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_linkHovered.qml 2011-10-18 16:59:44 UTC (rev 97766)
@@ -1,6 +1,6 @@
import QtQuick 2.0
import QtTest 1.0
-import QtWebKit.experimental 5.0
+import QtWebKit 3.0
DesktopWebView {
id: webView
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_loadFail.qml (97765 => 97766)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_loadFail.qml 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_loadFail.qml 2011-10-18 16:59:44 UTC (rev 97766)
@@ -1,6 +1,6 @@
import QtQuick 2.0
import QtTest 1.0
-import QtWebKit.experimental 5.0
+import QtWebKit 3.0
DesktopWebView {
id: webView
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_loadProgress.qml (97765 => 97766)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_loadProgress.qml 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_loadProgress.qml 2011-10-18 16:59:44 UTC (rev 97766)
@@ -1,6 +1,6 @@
import QtQuick 2.0
import QtTest 1.0
-import QtWebKit.experimental 5.0
+import QtWebKit 3.0
DesktopWebView {
id: webView
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_loadProgressSignal.qml (97765 => 97766)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_loadProgressSignal.qml 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_loadProgressSignal.qml 2011-10-18 16:59:44 UTC (rev 97766)
@@ -1,6 +1,6 @@
import QtQuick 2.0
import QtTest 1.0
-import QtWebKit.experimental 5.0
+import QtWebKit 3.0
DesktopWebView {
id: webView
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_loadZeroSizeView.qml (97765 => 97766)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_loadZeroSizeView.qml 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_loadZeroSizeView.qml 2011-10-18 16:59:44 UTC (rev 97766)
@@ -1,6 +1,6 @@
import QtQuick 2.0
import QtTest 1.0
-import QtWebKit.experimental 5.0
+import QtWebKit 3.0
DesktopWebView {
id: webView
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_navigationPolicyForUrl.qml (97765 => 97766)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_navigationPolicyForUrl.qml 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_navigationPolicyForUrl.qml 2011-10-18 16:59:44 UTC (rev 97766)
@@ -1,6 +1,6 @@
import QtQuick 2.0
import QtTest 1.0
-import QtWebKit.experimental 5.0
+import QtWebKit 3.0
Item {
DesktopWebView {
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_preferences.qml (97765 => 97766)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_preferences.qml 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_preferences.qml 2011-10-18 16:59:44 UTC (rev 97766)
@@ -1,6 +1,6 @@
import QtQuick 2.0
import QtTest 1.0
-import QtWebKit.experimental 5.0
+import QtWebKit 3.0
DesktopWebView {
id: webView
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_properties.qml (97765 => 97766)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_properties.qml 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopWebView/tst_properties.qml 2011-10-18 16:59:44 UTC (rev 97766)
@@ -1,6 +1,6 @@
import QtQuick 2.0
import QtTest 1.0
-import QtWebKit.experimental 5.0
+import QtWebKit 3.0
DesktopWebView {
id: webView
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_load.qml (97765 => 97766)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_load.qml 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_load.qml 2011-10-18 16:59:44 UTC (rev 97766)
@@ -1,6 +1,6 @@
import QtQuick 2.0
import QtTest 1.0
-import QtWebKit.experimental 5.0
+import QtWebKit 3.0
TouchWebView {
id: webView
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadFail.qml (97765 => 97766)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadFail.qml 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadFail.qml 2011-10-18 16:59:44 UTC (rev 97766)
@@ -1,6 +1,6 @@
import QtQuick 2.0
import QtTest 1.0
-import QtWebKit.experimental 5.0
+import QtWebKit 3.0
TouchWebView {
id: webView
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadNegativeSizeView.qml (97765 => 97766)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadNegativeSizeView.qml 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadNegativeSizeView.qml 2011-10-18 16:59:44 UTC (rev 97766)
@@ -1,6 +1,6 @@
import QtQuick 2.0
import QtTest 1.0
-import QtWebKit.experimental 5.0
+import QtWebKit 3.0
TouchWebView {
id: webView
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadProgress.qml (97765 => 97766)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadProgress.qml 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadProgress.qml 2011-10-18 16:59:44 UTC (rev 97766)
@@ -1,6 +1,6 @@
import QtQuick 2.0
import QtTest 1.0
-import QtWebKit.experimental 5.0
+import QtWebKit 3.0
TouchWebView {
id: webView
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadProgressSignal.qml (97765 => 97766)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadProgressSignal.qml 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadProgressSignal.qml 2011-10-18 16:59:44 UTC (rev 97766)
@@ -1,6 +1,6 @@
import QtQuick 2.0
import QtTest 1.0
-import QtWebKit.experimental 5.0
+import QtWebKit 3.0
TouchWebView {
id: webView
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadZeroSizeView.qml (97765 => 97766)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadZeroSizeView.qml 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadZeroSizeView.qml 2011-10-18 16:59:44 UTC (rev 97766)
@@ -1,6 +1,6 @@
import QtQuick 2.0
import QtTest 1.0
-import QtWebKit.experimental 5.0
+import QtWebKit 3.0
TouchWebView {
id: webView
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_properties.qml (97765 => 97766)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_properties.qml 2011-10-18 16:31:32 UTC (rev 97765)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_properties.qml 2011-10-18 16:59:44 UTC (rev 97766)
@@ -1,6 +1,6 @@
import QtQuick 2.0
import QtTest 1.0
-import QtWebKit.experimental 5.0
+import QtWebKit 3.0
TouchWebView {
id: webView
