summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/ssl
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-09-30 16:46:51 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-10-04 08:25:24 +0000
commit4a561c6baf3174522a6a0addd774adaf84289240 (patch)
tree3b8045a394e0bf2303dad53e80a92ba180d8b640 /tests/auto/network/ssl
parent5a4d469dcba9a2f843d9763f2966aad7c22a6b3d (diff)
remove redundant conditionals regarding ssl
this actually fixes the build when ssl is not enabled, as the openssl features are in the not included network-private module. Change-Id: Ibafae9867af493da184a45cf3981628d475d37a6 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'tests/auto/network/ssl')
-rw-r--r--tests/auto/network/ssl/ssl.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/network/ssl/ssl.pro b/tests/auto/network/ssl/ssl.pro
index ec74748f5b..175f361071 100644
--- a/tests/auto/network/ssl/ssl.pro
+++ b/tests/auto/network/ssl/ssl.pro
@@ -8,7 +8,7 @@ SUBDIRS=\
qsslerror \
qsslkey \
-qtConfig(ssl)|qtConfig(openssl)|qtConfig(openssl-linked) {
+qtConfig(ssl) {
qtConfig(private_tests) {
SUBDIRS += \
qsslsocket \
@@ -21,7 +21,7 @@ winrt: SUBDIRS -= \
qsslsocket_onDemandCertificates_member \
qsslsocket_onDemandCertificates_static \
-qtConfig(ssl)|qtConfig(openssl)|qtConfig(openssl-linked) {
+qtConfig(ssl) {
qtConfig(private_tests) {
SUBDIRS += qasn1element \
qssldiffiehellmanparameters