Diff
Modified: trunk/Source/WebKit2/ChangeLog (101161 => 101162)
--- trunk/Source/WebKit2/ChangeLog 2011-11-25 10:57:43 UTC (rev 101161)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-25 11:39:27 UTC (rev 101162)
@@ -1,3 +1,24 @@
+2011-11-25 Simon Hausmann <[email protected]>
+
+ [Qt] Cleanup in QML tests.
+
+ Reviewed by Tor Arne Vestbø.
+
+ Use a simple QML component for the "DesktopWebView" instead of a new QML type.
+ This will allow the use of the experimental extension in the future.
+
+ * UIProcess/API/qt/qquickwebview.cpp:
+ (QQuickWebViewExperimental::useTraditionalDesktopBehaviour):
+ * UIProcess/API/qt/qquickwebview_p.h:
+ * UIProcess/API/qt/tests/qmltests/DesktopBehavior/DesktopWebView.qml: Added.
+ * UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_linkHovered.qml:
+ * UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_loadHtml.qml:
+ * UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_messaging.qml:
+ * UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_navigationRequested.qml:
+ * UIProcess/API/qt/tests/qmltests/qmltests.pro:
+ * UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp:
+ (main):
+
2011-11-24 Zeno Albisser <[email protected]>
[Qt]WK2][Mac] Use Mac port's IPC implementation instead of Unix sockets
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (101161 => 101162)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2011-11-25 10:57:43 UTC (rev 101161)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2011-11-25 11:39:27 UTC (rev 101162)
@@ -440,6 +440,12 @@
emit promptDialogChanged();
}
+bool QQuickWebViewExperimental::useTraditionalDesktopBehaviour() const
+{
+ Q_D(const QQuickWebView);
+ return d->useTraditionalDesktopBehaviour;
+}
+
QQuickWebView::QQuickWebView(QQuickItem* parent)
: QQuickItem(parent)
, d_ptr(new QQuickWebViewPrivate(this))
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h (101161 => 101162)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h 2011-11-25 10:57:43 UTC (rev 101161)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h 2011-11-25 11:39:27 UTC (rev 101162)
@@ -168,6 +168,7 @@
Q_PROPERTY(QDeclarativeComponent* alertDialog READ alertDialog WRITE setAlertDialog NOTIFY alertDialogChanged)
Q_PROPERTY(QDeclarativeComponent* confirmDialog READ confirmDialog WRITE setConfirmDialog NOTIFY confirmDialogChanged)
Q_PROPERTY(QDeclarativeComponent* promptDialog READ promptDialog WRITE setPromptDialog NOTIFY promptDialogChanged)
+ Q_PROPERTY(bool useTraditionalDesktopBehaviour READ useTraditionalDesktopBehaviour WRITE setUseTraditionalDesktopBehaviour)
public:
QQuickWebViewExperimental(QQuickWebView* webView);
@@ -180,6 +181,8 @@
QDeclarativeComponent* promptDialog() const;
void setPromptDialog(QDeclarativeComponent*);
+ bool useTraditionalDesktopBehaviour() const;
+
public Q_SLOTS:
void setUseTraditionalDesktopBehaviour(bool enable);
Added: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/DesktopWebView.qml (0 => 101162)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/DesktopWebView.qml (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/DesktopWebView.qml 2011-11-25 11:39:27 UTC (rev 101162)
@@ -0,0 +1,9 @@
+import QtQuick 2.0
+import QtWebKit 3.0
+import QtWebKit.experimental 3.0
+
+WebView {
+ id: component
+ experimental.useTraditionalDesktopBehaviour: true
+}
+
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_linkHovered.qml (101161 => 101162)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_linkHovered.qml 2011-11-25 10:57:43 UTC (rev 101161)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_linkHovered.qml 2011-11-25 11:39:27 UTC (rev 101162)
@@ -1,7 +1,6 @@
import QtQuick 2.0
import QtTest 1.0
import QtWebKit 3.0
-import QtWebKitTest 1.0
DesktopWebView {
id: webView
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_loadHtml.qml (101161 => 101162)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_loadHtml.qml 2011-11-25 10:57:43 UTC (rev 101161)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_loadHtml.qml 2011-11-25 11:39:27 UTC (rev 101162)
@@ -1,7 +1,6 @@
import QtQuick 2.0
import QtTest 1.0
import QtWebKit 3.0
-import QtWebKitTest 1.0
DesktopWebView {
id: webView
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_messaging.qml (101161 => 101162)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_messaging.qml 2011-11-25 10:57:43 UTC (rev 101161)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_messaging.qml 2011-11-25 11:39:27 UTC (rev 101162)
@@ -1,7 +1,6 @@
import QtQuick 2.0
import QtTest 1.0
import QtWebKit 3.0
-import QtWebKitTest 1.0
Item {
DesktopWebView {
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_navigationRequested.qml (101161 => 101162)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_navigationRequested.qml 2011-11-25 10:57:43 UTC (rev 101161)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_navigationRequested.qml 2011-11-25 11:39:27 UTC (rev 101162)
@@ -1,7 +1,6 @@
import QtQuick 2.0
import QtTest 1.0
import QtWebKit 3.0
-import QtWebKitTest 1.0
Item {
DesktopWebView {
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro (101161 => 101162)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro 2011-11-25 10:57:43 UTC (rev 101161)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro 2011-11-25 11:39:27 UTC (rev 101162)
@@ -28,4 +28,5 @@
DesktopBehavior/tst_linkHovered.qml \
DesktopBehavior/tst_messaging.qml \
DesktopBehavior/tst_navigationRequested.qml \
- DesktopBehavior/tst_loadHtml.qml
+ DesktopBehavior/tst_loadHtml.qml \
+ DesktopBehavior/DesktopWebView.qml
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp (101161 => 101162)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp 2011-11-25 10:57:43 UTC (rev 101161)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp 2011-11-25 11:39:27 UTC (rev 101162)
@@ -20,22 +20,10 @@
#include "config.h"
#include "../util.h"
-#include "qquickwebpage_p.h"
-#include "qquickwebview_p.h"
-
#include <QVarLengthArray>
#include <QtQuickTest/quicktest.h>
#include <QtWidgets/QApplication>
-class DesktopWebView : public QQuickWebView {
-public:
- DesktopWebView(QQuickItem* parent = 0)
- : QQuickWebView(parent)
- {
- experimental()->setUseTraditionalDesktopBehaviour(true);
- }
-};
-
int main(int argc, char** argv)
{
QVarLengthArray<char*, 8> arguments;
@@ -54,6 +42,5 @@
// Instantiate QApplication to prevent quick_test_main to instantiate a QGuiApplication.
// This can be removed as soon as we do not use QtWidgets any more.
QApplication app(argc, argv);
- qmlRegisterType<DesktopWebView>("QtWebKitTest", 1, 0, "DesktopWebView");
return quick_test_main(argc, argv, "qmltests", 0, QUICK_TEST_SOURCE_DIR);
}
