From ce35c0db0d9dd849c736eabaeb57d597186aaa13 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Mon, 14 Jan 2013 14:43:52 +0100 Subject: QSslConfiguration: toggle on demand loading of root certs properly make sure we keep track of when we can load root certs and when we cannot (we cannot when the developer set the certs explicitly). This is implemented the same way for QSslSocket already, and needs to be duplicated because we have 2 methods for setting CA certificates: one in QSslSocket and one in QSslConfiguration. In addition, adapt the auto test which checks whether setting a default QSslConfiguration works: There is no way to set on demand loading through the API, so it should be enabled by default. Task-number: QTBUG-29103 Change-Id: I5146128aaa385dfcc0ad1e0ef81a92d9350ec5f2 Reviewed-by: Richard J. Moore --- tests/manual/qnetworkreply/qnetworkreply.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/manual/qnetworkreply/qnetworkreply.pro') diff --git a/tests/manual/qnetworkreply/qnetworkreply.pro b/tests/manual/qnetworkreply/qnetworkreply.pro index 3d98ee429f..64666103a0 100644 --- a/tests/manual/qnetworkreply/qnetworkreply.pro +++ b/tests/manual/qnetworkreply/qnetworkreply.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qnetworkreply QT -= gui -QT += network testlib +QT += core-private network network-private testlib SOURCES += main.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -- cgit v1.2.3