diff options
-rw-r--r-- | src/webenginequick/api/qquickwebenginedialogrequests.cpp | 114 | ||||
-rw-r--r-- | src/webenginequick/api/qquickwebenginedialogrequests_p.h | 40 | ||||
-rw-r--r-- | src/webenginequick/api/qquickwebengineview_p.h | 2 | ||||
-rw-r--r-- | src/webenginequick/doc/src/webengineview_lgpl.qdoc | 8 | ||||
-rw-r--r-- | tests/auto/quick/publicapi/tst_publicapi.cpp | 10 |
5 files changed, 0 insertions, 174 deletions
diff --git a/src/webenginequick/api/qquickwebenginedialogrequests.cpp b/src/webenginequick/api/qquickwebenginedialogrequests.cpp index 5d56d6b75..3489eab31 100644 --- a/src/webenginequick/api/qquickwebenginedialogrequests.cpp +++ b/src/webenginequick/api/qquickwebenginedialogrequests.cpp @@ -715,120 +715,6 @@ void QQuickWebEngineFileDialogRequest::dialogReject() /////////////////////////////////////////////////////////////////////////////// /*! - \qmltype FormValidationMessageRequest - //! \instantiates QQuickWebEngineFormValidationMessageRequest - \inqmlmodule QtWebEngine - \since QtWebEngine 1.4 - \obsolete - - \brief A request for showing a HTML5 form validation message to the user. - - No longer used since 5.11, as Blink now renders Validation messages internally. -*/ - -QQuickWebEngineFormValidationMessageRequest::QQuickWebEngineFormValidationMessageRequest( - QQuickWebEngineFormValidationMessageRequest::RequestType type, const QRect& anchor, - const QString &mainText, const QString &subText, QObject *parent): - QObject(parent) - , m_anchor(anchor) - , m_mainText(mainText) - , m_subText(subText) - , m_type(type) - , m_accepted(false) -{ - -} - -QQuickWebEngineFormValidationMessageRequest::~QQuickWebEngineFormValidationMessageRequest() -{ - -} - -/*! - \qmlproperty rectangle FormValidationMessageRequest::anchor - \readonly - - An anchor of an element in the viewport for which the form - validation message should be displayed. -*/ - -QRect QQuickWebEngineFormValidationMessageRequest::anchor() const -{ - return m_anchor; -} - -/*! - \qmlproperty bool FormValidationMessageRequest::text - \readonly - - The text of the form validation message. -*/ - - -QString QQuickWebEngineFormValidationMessageRequest::text() const -{ - return m_mainText; -} - -/*! - \qmlproperty bool FormValidationMessageRequest::subText - \readonly - - The subtext of the form validation message. -*/ - - -QString QQuickWebEngineFormValidationMessageRequest::subText() const -{ - return m_subText; -} - -/*! - \qmlproperty enumeration FormValidationMessageRequest::type - \readonly - - The type of the form validation message request. - - \value ValidationMessageRequest.Show - The form validation message should be shown. - \value ValidationMessageRequest.Hide - The form validation message should be hidden. - \value ValidationMessageRequest.Move - The form validation message should be moved. -*/ - -QQuickWebEngineFormValidationMessageRequest::RequestType QQuickWebEngineFormValidationMessageRequest::type() const -{ - return m_type; -} - -/*! - \qmlproperty bool FormValidationMessageRequest::accepted - - Indicates whether the form validation request has been - accepted by the signal handler. - - If the property is \c false after any signal handlers - for WebEngineView::validationMessageRequested have been executed, - a default file validation message will be shown. - To prevent this, set \c {request.accepted} to \c true. - - The default is \c false. -*/ - -bool QQuickWebEngineFormValidationMessageRequest::isAccepted() const -{ - return m_accepted; -} - -void QQuickWebEngineFormValidationMessageRequest::setAccepted(bool accepted) -{ - m_accepted = accepted; -} - -/////////////////////////////////////////////////////////////////////////////// - -/*! \qmltype TooltipRequest //! \instantiates QQuickWebEngineTooltipRequest \inqmlmodule QtWebEngine diff --git a/src/webenginequick/api/qquickwebenginedialogrequests_p.h b/src/webenginequick/api/qquickwebenginedialogrequests_p.h index cee33f8ae..e79e03f46 100644 --- a/src/webenginequick/api/qquickwebenginedialogrequests_p.h +++ b/src/webenginequick/api/qquickwebenginedialogrequests_p.h @@ -241,46 +241,6 @@ private: Q_DISABLE_COPY(QQuickWebEngineFileDialogRequest) }; -class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineFormValidationMessageRequest : public QObject { - Q_OBJECT -public: - enum RequestType { - Show, - Hide, - Move, - }; - Q_ENUM(RequestType) - Q_PROPERTY(QRect anchor READ anchor CONSTANT FINAL) - Q_PROPERTY(QString text READ text CONSTANT FINAL) - Q_PROPERTY(QString subText READ subText CONSTANT FINAL) - Q_PROPERTY(RequestType type READ type CONSTANT FINAL) - Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted FINAL) - QML_NAMED_ELEMENT(FormValidationMessageRequest) - QML_ADDED_IN_VERSION(1, 4) - QML_EXTRA_VERSION(2, 0) - QML_UNCREATABLE("") - - ~QQuickWebEngineFormValidationMessageRequest(); - QRect anchor() const; - QString text() const; - QString subText() const; - RequestType type() const; - bool isAccepted() const; - void setAccepted(bool accepted); - -private: - QQuickWebEngineFormValidationMessageRequest(RequestType type, const QRect &anchor = QRect(), - const QString &mainText = QString(), - const QString &subText = QString(), - QObject *parent = nullptr); - QRect m_anchor; - QString m_mainText; - QString m_subText; - RequestType m_type; - bool m_accepted; - friend class QQuickWebEngineViewPrivate; -}; - class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineTooltipRequest : public QObject { Q_OBJECT public: diff --git a/src/webenginequick/api/qquickwebengineview_p.h b/src/webenginequick/api/qquickwebengineview_p.h index bc51f7690..678b02dda 100644 --- a/src/webenginequick/api/qquickwebengineview_p.h +++ b/src/webenginequick/api/qquickwebengineview_p.h @@ -75,7 +75,6 @@ class QQuickWebEngineJavaScriptDialogRequest; class QQuickWebEngineNewViewRequest; class QQuickWebEngineSettings; class QQuickWebEngineTooltipRequest; -class QQuickWebEngineFormValidationMessageRequest; class QQuickWebEngineViewPrivate; class QWebEngineCertificateError; class QWebEngineContextMenuRequest; @@ -530,7 +529,6 @@ Q_SIGNALS: Q_REVISION(1,4) void javaScriptDialogRequested(QQuickWebEngineJavaScriptDialogRequest *request); Q_REVISION(1,4) void colorDialogRequested(QQuickWebEngineColorDialogRequest *request); Q_REVISION(1,4) void fileDialogRequested(QQuickWebEngineFileDialogRequest *request); - Q_REVISION(1,4) void formValidationMessageRequested(QQuickWebEngineFormValidationMessageRequest *request); Q_REVISION(1,5) void pdfPrintingFinished(const QString &filePath, bool success); Q_REVISION(1,7) void quotaRequested(const QWebEngineQuotaRequest &request); Q_REVISION(1,7) void geometryChangeRequested(const QRect &geometry, const QRect &frameGeometry); diff --git a/src/webenginequick/doc/src/webengineview_lgpl.qdoc b/src/webenginequick/doc/src/webengineview_lgpl.qdoc index f45558b9c..2f64fca7f 100644 --- a/src/webenginequick/doc/src/webengineview_lgpl.qdoc +++ b/src/webenginequick/doc/src/webengineview_lgpl.qdoc @@ -1230,14 +1230,6 @@ */ /*! - \qmlsignal WebEngineView::formValidationMessageRequested(FormValidationMessageRequest request) - \since QtWebEngine 1.4 - \obsolete - - No longer used since 5.11, as Blink now renders Validation messages internally. -*/ - -/*! \qmlsignal WebEngineView::contextMenuRequested(ContextMenuRequest request) \since QtWebEngine 1.4 diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp index 52e2454af..b133ea12e 100644 --- a/tests/auto/quick/publicapi/tst_publicapi.cpp +++ b/tests/auto/quick/publicapi/tst_publicapi.cpp @@ -80,7 +80,6 @@ static const QList<const QMetaObject *> typesToCheck = QList<const QMetaObject * << &QQuickWebEngineJavaScriptDialogRequest::staticMetaObject << &QQuickWebEngineColorDialogRequest::staticMetaObject << &QQuickWebEngineFileDialogRequest::staticMetaObject - << &QQuickWebEngineFormValidationMessageRequest::staticMetaObject << &QQuickWebEngineNewViewRequest::staticMetaObject << &QQuickWebEngineTooltipRequest::staticMetaObject << &QWebEngineContextMenuRequest::staticMetaObject @@ -278,14 +277,6 @@ static const QStringList expectedAPI = QStringList() << "QQuickWebEngineFileDialogRequest.mode --> QQuickWebEngineFileDialogRequest::FileMode" << "QWebEngineFindTextResult.numberOfMatches --> int" << "QWebEngineFindTextResult.activeMatch --> int" - << "QQuickWebEngineFormValidationMessageRequest.Hide --> RequestType" - << "QQuickWebEngineFormValidationMessageRequest.Move --> RequestType" - << "QQuickWebEngineFormValidationMessageRequest.Show --> RequestType" - << "QQuickWebEngineFormValidationMessageRequest.accepted --> bool" - << "QQuickWebEngineFormValidationMessageRequest.anchor --> QRect" - << "QQuickWebEngineFormValidationMessageRequest.subText --> QString" - << "QQuickWebEngineFormValidationMessageRequest.text --> QString" - << "QQuickWebEngineFormValidationMessageRequest.type --> QQuickWebEngineFormValidationMessageRequest::RequestType" << "QQuickWebEngineTooltipRequest.Hide --> RequestType" << "QQuickWebEngineTooltipRequest.Show --> RequestType" << "QQuickWebEngineTooltipRequest.x --> int" @@ -699,7 +690,6 @@ static const QStringList expectedAPI = QStringList() << "QQuickWebEngineView.findText(QString,FindFlags) --> void" << "QQuickWebEngineView.findText(QString,FindFlags,QJSValue) --> void" << "QQuickWebEngineView.findTextFinished(QWebEngineFindTextResult) --> void" - << "QQuickWebEngineView.formValidationMessageRequested(QQuickWebEngineFormValidationMessageRequest*) --> void" << "QQuickWebEngineView.fullScreenCancelled() --> void" << "QQuickWebEngineView.fullScreenRequested(QWebEngineFullScreenRequest) --> void" << "QQuickWebEngineView.geometryChangeRequested(QRect,QRect) --> void" |