diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2023-01-18 12:52:06 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2023-01-18 17:10:46 +0100 |
| commit | 474426afa4cf52e057d321498f78bb0fbd626022 (patch) | |
| tree | da12e51f533484b7d977268f6f64c30ec756bbe0 | |
| parent | 61bc85654f63f0df774a2044dc0f242bea5e007d (diff) | |
Fix deprecation of Quota Permission Request API
Add reason string and version for deprecation. Also mark the
constructor of QWebEngineQuotaRequest class deprecated.
Amends 8fd7140082e3a752ca80882a29128ffc12d12fa4
Pick-to: 6.5
Task-number: QTBUG-109580
Task-number: QTBUG-56354
Change-Id: Ifa15bb5eaccabd62acbeb05df071c4bdc9584c95
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
| -rw-r--r-- | src/core/api/qwebenginepage.h | 3 | ||||
| -rw-r--r-- | src/core/api/qwebenginequotarequest.h | 5 | ||||
| -rw-r--r-- | src/webenginequick/api/qquickwebengineview_p.h | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/core/api/qwebenginepage.h b/src/core/api/qwebenginepage.h index 04272e7fa..c60feb3ab 100644 --- a/src/core/api/qwebenginepage.h +++ b/src/core/api/qwebenginepage.h @@ -310,7 +310,8 @@ Q_SIGNALS: void featurePermissionRequestCanceled(const QUrl &securityOrigin, QWebEnginePage::Feature feature); void fullScreenRequested(QWebEngineFullScreenRequest fullScreenRequest); #if QT_DEPRECATED_SINCE(6, 5) - QT_DEPRECATED void quotaRequested(QWebEngineQuotaRequest quotaRequest); + QT_DEPRECATED_VERSION_X_6_5("Requesting host quota is no longer supported.") + void quotaRequested(QWebEngineQuotaRequest quotaRequest); #endif void registerProtocolHandlerRequested(QWebEngineRegisterProtocolHandlerRequest request); void fileSystemAccessRequested(QWebEngineFileSystemAccessRequest request); diff --git a/src/core/api/qwebenginequotarequest.h b/src/core/api/qwebenginequotarequest.h index 846a75152..f542f5576 100644 --- a/src/core/api/qwebenginequotarequest.h +++ b/src/core/api/qwebenginequotarequest.h @@ -18,13 +18,14 @@ class Q_WEBENGINECORE_EXPORT QWebEngineQuotaRequest Q_PROPERTY(QUrl origin READ origin CONSTANT FINAL) Q_PROPERTY(qint64 requestedSize READ requestedSize CONSTANT FINAL) public: + QT_DEPRECATED_VERSION_X_6_5("Requesting host quota is no longer supported.") QWebEngineQuotaRequest() {} Q_INVOKABLE void accept(); Q_INVOKABLE void reject(); QUrl origin() const; qint64 requestedSize() const; - bool operator==(const QWebEngineQuotaRequest &) const { return false; } - bool operator!=(const QWebEngineQuotaRequest &) const { return true; } + bool operator==(const QWebEngineQuotaRequest &) const { Q_UNREACHABLE(); } + bool operator!=(const QWebEngineQuotaRequest &) const { Q_UNREACHABLE(); } }; QT_END_NAMESPACE diff --git a/src/webenginequick/api/qquickwebengineview_p.h b/src/webenginequick/api/qquickwebengineview_p.h index 4c61680d7..906e7c3fd 100644 --- a/src/webenginequick/api/qquickwebengineview_p.h +++ b/src/webenginequick/api/qquickwebengineview_p.h @@ -517,7 +517,8 @@ Q_SIGNALS: Q_REVISION(1,4) void fileDialogRequested(QQuickWebEngineFileDialogRequest *request); Q_REVISION(1,5) void pdfPrintingFinished(const QString &filePath, bool success); #if QT_DEPRECATED_SINCE(6, 5) - Q_REVISION(1,7) QT_DEPRECATED void quotaRequested(const QWebEngineQuotaRequest &request); + QT_DEPRECATED_VERSION_X_6_5("Requesting host quota is no longer supported.") + Q_REVISION(1, 7) void quotaRequested(const QWebEngineQuotaRequest &request); #endif Q_REVISION(1,7) void geometryChangeRequested(const QRect &geometry, const QRect &frameGeometry); Q_REVISION(1,7) void inspectedViewChanged(); |