diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2018-09-13 12:59:59 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2018-09-24 11:49:05 +0000 |
| commit | 4b7ff8e98c0208273a25d84e1f0322cad5bce2bf (patch) | |
| tree | deb2fa37984f56cc813ab7378185775eade6f5fa /src/network/access/qhsts_p.h | |
| parent | 4fc4f7b0ce0e6ee186a7d7fe9b5dd20e94efe432 (diff) | |
Protect HSTS code for no-feature-settings build
Under the hood we use QSettings to store HSTS policies.
Qt configured with 'no feature settings' would fail to
build then. For such builds, we fall back to in-memory
only HSTS cache.
Change-Id: I6df551d8c6c96d982080a51ce6b1bdce71d04b9f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/network/access/qhsts_p.h')
| -rw-r--r-- | src/network/access/qhsts_p.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/network/access/qhsts_p.h b/src/network/access/qhsts_p.h index bc8708341d..c219d9eab5 100644 --- a/src/network/access/qhsts_p.h +++ b/src/network/access/qhsts_p.h @@ -69,8 +69,6 @@ QT_BEGIN_NAMESPACE template<typename T> class QList; template <typename T> class QVector; -class QHstsStore; - class Q_AUTOTEST_EXPORT QHstsCache { public: @@ -85,7 +83,9 @@ public: QVector<QHstsPolicy> policies() const; - void setStore(QHstsStore *store); +#if QT_CONFIG(settings) + void setStore(class QHstsStore *store); +#endif // QT_CONFIG(settings) private: @@ -119,7 +119,9 @@ private: }; mutable std::map<HostName, QHstsPolicy> knownHosts; +#if QT_CONFIG(settings) QHstsStore *hstsStore = nullptr; +#endif // QT_CONFIG(settings) }; class Q_AUTOTEST_EXPORT QHstsHeaderParser |