summaryrefslogtreecommitdiffstats
path: root/src/network/access/access.pri
diff options
context:
space:
mode:
authorTimur Pocheptsov <timur.pocheptsov@qt.io>2018-09-13 12:59:59 +0200
committerTimur Pocheptsov <timur.pocheptsov@qt.io>2018-09-24 11:49:05 +0000
commit4b7ff8e98c0208273a25d84e1f0322cad5bce2bf (patch)
treedeb2fa37984f56cc813ab7378185775eade6f5fa /src/network/access/access.pri
parent4fc4f7b0ce0e6ee186a7d7fe9b5dd20e94efe432 (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/access.pri')
-rw-r--r--src/network/access/access.pri14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/network/access/access.pri b/src/network/access/access.pri
index a129beda15..ec0273377f 100644
--- a/src/network/access/access.pri
+++ b/src/network/access/access.pri
@@ -24,8 +24,7 @@ HEADERS += \
access/qabstractnetworkcache.h \
access/qnetworkfile_p.h \
access/qhsts_p.h \
- access/qhstspolicy.h \
- access/qhstsstore_p.h
+ access/qhstspolicy.h
SOURCES += \
access/qnetworkaccessauthenticationmanager.cpp \
@@ -45,8 +44,7 @@ SOURCES += \
access/qabstractnetworkcache.cpp \
access/qnetworkfile.cpp \
access/qhsts.cpp \
- access/qhstspolicy.cpp \
- access/qhstsstore.cpp
+ access/qhstspolicy.cpp
qtConfig(ftp) {
HEADERS += \
@@ -66,6 +64,14 @@ qtConfig(networkdiskcache) {
SOURCES += access/qnetworkdiskcache.cpp
}
+qtConfig(settings) {
+ HEADERS += \
+ access/qhstsstore_p.h
+
+ SOURCES += \
+ access/qhstsstore.cpp
+}
+
mac: LIBS_PRIVATE += -framework Security
include($$PWD/../../3rdparty/zlib_dependency.pri)