From a2f1431eb25596931e6da97df2c48a9df3f94942 Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Fri, 20 Mar 2015 12:03:09 +0100 Subject: Introduce mock UIDelegates for testing. Switch JS dialogs test to using this over the testsupport plugin. This is a less intrusive approach that lives as self contained qml modules within the test infrastructure. As an added benefit, it covers the UI delegation logic from end to end, including what happens in ui_delegates_manager.cpp. Change-Id: I1cc0afaf5514d53e1f3b4b0682379dd2d8d8a913 Reviewed-by: Andras Becsi --- src/webengine/api/qquickwebenginetestsupport_p.h | 25 ------------------------ 1 file changed, 25 deletions(-) (limited to 'src/webengine/api/qquickwebenginetestsupport_p.h') diff --git a/src/webengine/api/qquickwebenginetestsupport_p.h b/src/webengine/api/qquickwebenginetestsupport_p.h index 06950e416..832ac2803 100644 --- a/src/webengine/api/qquickwebenginetestsupport_p.h +++ b/src/webengine/api/qquickwebenginetestsupport_p.h @@ -39,7 +39,6 @@ #include -#include "javascript_dialog_controller.h" #include #include @@ -47,24 +46,6 @@ QT_BEGIN_NAMESPACE class QQuickWebEngineLoadRequest; -class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineJavaScriptDialog : public QObject { - Q_OBJECT - Q_PROPERTY(QString message READ message CONSTANT) - Q_PROPERTY(QString defaultValue READ defaultValue CONSTANT) - -public: - QQuickWebEngineJavaScriptDialog(QSharedPointer); - QString message() const; - QString defaultValue() const; - -public Q_SLOTS: - void reject(); - void accept(const QString &input = QString()); - -private: - QSharedPointer m_dialogController; -}; - class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineErrorPage : public QObject { Q_OBJECT @@ -85,12 +66,6 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineTestSupport : public QObject { public: QQuickWebEngineTestSupport(); QQuickWebEngineErrorPage *errorPage() const; - void testDialog(QSharedPointer dialog); - -Q_SIGNALS: - void alertDialog(QQuickWebEngineJavaScriptDialog *dialog); - void confirmDialog(QQuickWebEngineJavaScriptDialog *dialog); - void promptDialog(QQuickWebEngineJavaScriptDialog *dialog); private: QScopedPointer m_errorPage; -- cgit v1.2.3