diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-18 20:03:20 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-18 20:03:20 +0100 |
commit | 3654a4a3c1cb2ac9bb8b486877d9f1e6a6b220be (patch) | |
tree | 611c16caa5096bd1348f188c9072354f1e613a9f /tests/auto/network/ssl/ssl.pro | |
parent | c04f3584abd621f09e8f2c81b9c6c87212a993a3 (diff) | |
parent | f4900d340a4c620b56871995741696d28e53c167 (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/network/ssl/ssl.pro')
-rw-r--r-- | tests/auto/network/ssl/ssl.pro | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/network/ssl/ssl.pro b/tests/auto/network/ssl/ssl.pro index 294caeba5a..06f4a05241 100644 --- a/tests/auto/network/ssl/ssl.pro +++ b/tests/auto/network/ssl/ssl.pro @@ -4,11 +4,11 @@ SUBDIRS=\ qsslcipher \ qsslerror \ qsslkey \ - qsslsocket \ - qsslsocket_onDemandCertificates_member \ - qsslsocket_onDemandCertificates_static \ -!contains(QT_CONFIG, private_tests): SUBDIRS -= \ - qsslsocket \ - qsslsocket_onDemandCertificates_member \ - qsslsocket_onDemandCertificates_static \ +contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked): + contains(QT_CONFIG, private_tests) { + SUBDIRS += \ + qsslsocket \ + qsslsocket_onDemandCertificates_member \ + qsslsocket_onDemandCertificates_static \ + } |