summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2018-06-25 08:56:54 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2018-06-25 08:37:18 +0000
commit372b5504fd766470dc9fddd05b07adfc99b7faa3 (patch)
tree4c25a703fe3bc5eaa3d69c3c09a7f68298b7739f /src/network
parentc3059391fea326b7115cf038ecdad8e820a0c2d5 (diff)
Do not build SPDY support if SSL is disabled
QSpdyProtocolHandler requires the features http and ssl. This fixes the moc warning src/network/access/qspdyprotocolhandler_p.h:0: Note: No relevant classes found. No output generated. for the -no-ssl build. Change-Id: I915751e98fc67e8601a8da8c5d18b11304bc0390 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Peter Hartmann <peter-qt@hartmann.tk>
Diffstat (limited to 'src/network')
-rw-r--r--src/network/access/access.pri13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/network/access/access.pri b/src/network/access/access.pri
index 1d6a04a424..a129beda15 100644
--- a/src/network/access/access.pri
+++ b/src/network/access/access.pri
@@ -84,8 +84,7 @@ qtConfig(http) {
access/qhttpnetworkrequest.cpp \
access/qhttpprotocolhandler.cpp \
access/qhttpthreaddelegate.cpp \
- access/qnetworkreplyhttpimpl.cpp \
- access/qspdyprotocolhandler.cpp
+ access/qnetworkreplyhttpimpl.cpp
HEADERS += \
access/qabstractprotocolhandler_p.h \
@@ -99,6 +98,12 @@ qtConfig(http) {
access/qhttpnetworkrequest_p.h \
access/qhttpprotocolhandler_p.h \
access/qhttpthreaddelegate_p.h \
- access/qnetworkreplyhttpimpl_p.h \
- access/qspdyprotocolhandler_p.h
+ access/qnetworkreplyhttpimpl_p.h
+
+ qtConfig(ssl) {
+ SOURCES += \
+ access/qspdyprotocolhandler.cpp
+ HEADERS += \
+ access/qspdyprotocolhandler_p.h
+ }
}