diff options
author | Peter Varga <pvarga@inf.u-szeged.hu> | 2021-05-20 16:10:59 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-07-06 17:22:47 +0000 |
commit | 8f7a386a5228428122813ebea1d7489783b00633 (patch) | |
tree | a266be6e7a659c14ccb0982967f3ae6d6d40956a /src/webenginequick | |
parent | ca4ba8beb736efcd95445cc801e2b5a77642a931 (diff) |
Remove deprecated useforglobalcertificateverification
It enabled an unrecommended OCSP path on Linux
[ChangeLog] (Q)WebEngineSettings::useForGlobalCertificateVerification
has been removed.
Pick-to: 6.2
Task-number: QTBUG-91467
Change-Id: I9f5d1ad5e4fcb59abd31e6a133ded7bf8319c811
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
Diffstat (limited to 'src/webenginequick')
-rw-r--r-- | src/webenginequick/api/qquickwebengineprofile.cpp | 69 | ||||
-rw-r--r-- | src/webenginequick/api/qquickwebengineprofile.h | 9 | ||||
-rw-r--r-- | src/webenginequick/api/qquickwebengineprofile_p.h | 2 |
3 files changed, 0 insertions, 80 deletions
diff --git a/src/webenginequick/api/qquickwebengineprofile.cpp b/src/webenginequick/api/qquickwebengineprofile.cpp index 18bed6db5..1c32c9ffb 100644 --- a/src/webenginequick/api/qquickwebengineprofile.cpp +++ b/src/webenginequick/api/qquickwebengineprofile.cpp @@ -297,12 +297,6 @@ void QQuickWebEngineProfilePrivate::downloadUpdated(const DownloadItemInfo &info } } -void QQuickWebEngineProfilePrivate::useForGlobalCertificateVerificationChanged() -{ - Q_Q(QQuickWebEngineProfile); - Q_EMIT q->useForGlobalCertificateVerificationChanged(); -} - void QQuickWebEngineProfilePrivate::showNotification(QSharedPointer<QtWebEngineCore::UserNotificationController> &controller) { Q_Q(QQuickWebEngineProfile); @@ -799,69 +793,6 @@ bool QQuickWebEngineProfile::isSpellCheckEnabled() const } /*! - \property QQuickWebEngineProfile::useForGlobalCertificateVerification - \since 5.13 - \obsolete - - This property holds whether this profile is used for downloading and - caching during global certificate verification when using the online - certificate status protocol (OCSP), certificate revokation lists (CRLs), - and authority information access (AIA), for example. - - As long as one profile has this option enabled, all other profiles will be - able to use it for certificate verification. Only one profile at a time can - have this option enabled. It is recommended that the profile has a disk HTTP - cache to avoid needlessly re-downloading. - - By default, no profile has this property enabled. - - Originally only affected Linux/NSS installations, where having a profile with - this role enabled OCSP. - - Since 5.15.3 no longer does anything, and certificate verification is now - done using AIO on the requesting profile. -*/ - -/*! - \qmlproperty bool WebEngineProfile::useForGlobalCertificateVerification - \since QtWebEngine 1.9 - \obsolete - - This property holds whether this profile is used for downloading and - caching during global certificate verification when using the online - certificate status protocol (OCSP), certificate revokation lists (CRLs), - and authority information access (AIA), for example. - - As long as one profile has this option enabled, all other profiles will be - able to use it for certificate verification. Only one profile at a time can - have this option enabled. It is recommended that the profile has a disk HTTP - cache to avoid needlessly re-downloading. - - By default, no profile has this property enabled. - - Originally only affected Linux/NSS installations, where having a profile with - this role enabled OCSP. - - Since 5.15.3 no longer does anything, and certificate verification is now - done using AIO on the requesting profile. -*/ - -void QQuickWebEngineProfile::setUseForGlobalCertificateVerification(bool enable) -{ - Q_D(QQuickWebEngineProfile); - if (enable != d->profileAdapter()->isUsedForGlobalCertificateVerification()) { - d->profileAdapter()->setUseForGlobalCertificateVerification(enable); - emit useForGlobalCertificateVerificationChanged(); - } -} - -bool QQuickWebEngineProfile::isUsedForGlobalCertificateVerification() const -{ - const Q_D(QQuickWebEngineProfile); - return d->profileAdapter()->isUsedForGlobalCertificateVerification(); -} - -/*! \qmlproperty string WebEngineProfile::downloadPath \since QtWebEngine 1.9 diff --git a/src/webenginequick/api/qquickwebengineprofile.h b/src/webenginequick/api/qquickwebengineprofile.h index 393bba0ae..5ffcbf442 100644 --- a/src/webenginequick/api/qquickwebengineprofile.h +++ b/src/webenginequick/api/qquickwebengineprofile.h @@ -73,11 +73,6 @@ class Q_WEBENGINE_EXPORT QQuickWebEngineProfile : public QObject { Q_PROPERTY(QStringList spellCheckLanguages READ spellCheckLanguages WRITE setSpellCheckLanguages NOTIFY spellCheckLanguagesChanged FINAL REVISION(1,3)) Q_PROPERTY(bool spellCheckEnabled READ isSpellCheckEnabled WRITE setSpellCheckEnabled NOTIFY spellCheckEnabledChanged FINAL REVISION(1,3)) Q_PROPERTY(QQuickWebEngineScriptCollection *userScripts READ userScripts) - Q_PROPERTY(bool useForGlobalCertificateVerification - READ isUsedForGlobalCertificateVerification - WRITE setUseForGlobalCertificateVerification - NOTIFY useForGlobalCertificateVerificationChanged - FINAL REVISION(1,5)) Q_PROPERTY(QString downloadPath READ downloadPath WRITE setDownloadPath NOTIFY downloadPathChanged FINAL REVISION(1,5)) QML_NAMED_ELEMENT(WebEngineProfile) QML_ADDED_IN_VERSION(1, 1) @@ -147,9 +142,6 @@ public: QQuickWebEngineScriptCollection *userScripts() const; - void setUseForGlobalCertificateVerification(bool b); - bool isUsedForGlobalCertificateVerification() const; - QString downloadPath() const; void setDownloadPath(const QString &path); @@ -169,7 +161,6 @@ Q_SIGNALS: Q_REVISION(1,1) void httpAcceptLanguageChanged(); Q_REVISION(1,3) void spellCheckLanguagesChanged(); Q_REVISION(1,3) void spellCheckEnabledChanged(); - Q_REVISION(1,5) void useForGlobalCertificateVerificationChanged(); Q_REVISION(1,5) void downloadPathChanged(); void downloadRequested(QQuickWebEngineDownloadRequest *download); void downloadFinished(QQuickWebEngineDownloadRequest *download); diff --git a/src/webenginequick/api/qquickwebengineprofile_p.h b/src/webenginequick/api/qquickwebengineprofile_p.h index 8c2b14fda..8e465d876 100644 --- a/src/webenginequick/api/qquickwebengineprofile_p.h +++ b/src/webenginequick/api/qquickwebengineprofile_p.h @@ -86,8 +86,6 @@ public: void downloadRequested(DownloadItemInfo &info) override; void downloadUpdated(const DownloadItemInfo &info) override; - void useForGlobalCertificateVerificationChanged() override; - void showNotification(QSharedPointer<QtWebEngineCore::UserNotificationController> &controller) override; private: |