diff options
author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-01-01 21:24:28 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-02 01:37:42 +0100 |
commit | 628d3f85d2d06e25851684aede396fd1b0a12db9 (patch) | |
tree | 22f1e727b003802efe09649e825e458c19fa376e /tests/auto/network | |
parent | dce0563b27269bb01b5d0bcc79066e95e4447ef6 (diff) |
tests: use contains(QT_CONFIG,private_tests) consistently
These tests used requires(contains(QT_CONFIG,private_tests)) in their
.pro file, but did not subtract themselves from their parent project
SUBDIRS when private_tests weren't enabled.
In the best case, this wastes a little time as qmake iterates over these
projects which won't be built. In some worse esoteric cases, this may
break compilation or packaging.
Change-Id: If36b1b8f69c3509128786fec67899ae18ffaa2bc
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/network')
-rw-r--r-- | tests/auto/network/socket/socket.pro | 9 | ||||
-rw-r--r-- | tests/auto/network/ssl/ssl.pro | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/tests/auto/network/socket/socket.pro b/tests/auto/network/socket/socket.pro index 49fb52d1a5..426dca2277 100644 --- a/tests/auto/network/socket/socket.pro +++ b/tests/auto/network/socket/socket.pro @@ -10,8 +10,7 @@ SUBDIRS=\ platformsocketengine \ !contains(QT_CONFIG, private_tests): SUBDIRS -= \ - platformsocketengine \ - qhttpsocketengine \ - qsocks5socketengine \ - - + platformsocketengine \ + qtcpsocket \ + qhttpsocketengine \ + qsocks5socketengine \ diff --git a/tests/auto/network/ssl/ssl.pro b/tests/auto/network/ssl/ssl.pro index dd92ec0358..294caeba5a 100644 --- a/tests/auto/network/ssl/ssl.pro +++ b/tests/auto/network/ssl/ssl.pro @@ -7,3 +7,8 @@ SUBDIRS=\ qsslsocket \ qsslsocket_onDemandCertificates_member \ qsslsocket_onDemandCertificates_static \ + +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ + qsslsocket \ + qsslsocket_onDemandCertificates_member \ + qsslsocket_onDemandCertificates_static \ |