diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-09-08 15:18:42 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-09 05:46:54 +0200 |
| commit | e815b93d12c560dcf91bd48eb06ff5822a570876 (patch) | |
| tree | c8f4194a882be0b3ae1cd1862d8607001008f28a | |
| parent | 13908a560b49157c8d290273e55bf14cbc7f0c9f (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: I189c108ee9943b15114becf9d6b04f78dbabbe31
Reviewed-on: http://codereview.qt-project.org/4389
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
| -rw-r--r-- | tests/auto/dbus.pro | 3 | ||||
| -rw-r--r-- | tests/auto/gui.pro | 2 | ||||
| -rw-r--r-- | tests/auto/network.pro | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/tests/auto/dbus.pro b/tests/auto/dbus.pro index 6dd8ce325c..cd845d7043 100644 --- a/tests/auto/dbus.pro +++ b/tests/auto/dbus.pro @@ -18,3 +18,6 @@ SUBDIRS=\ qdbusthreading \ qdbusxmlparser \ +!contains(QT_CONFIG,private_tests): SUBDIRS -= \ + qdbusmarshall \ + diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro index cf7db60c6d..765d522f1c 100644 --- a/tests/auto/gui.pro +++ b/tests/auto/gui.pro @@ -218,11 +218,11 @@ win32:SUBDIRS -= qtextpiecetable qgraphicssceneindex \ qlistwidget \ qmainwindow \ - qnetworkreply \ qpathclipper \ qpixmapcache \ qsidebar \ qstylesheetstyle \ + qtcpsocket \ qtextlayout \ qtextpiecetable \ qtipc \ diff --git a/tests/auto/network.pro b/tests/auto/network.pro index 7f9ef3c04e..f8dd4123df 100644 --- a/tests/auto/network.pro +++ b/tests/auto/network.pro @@ -51,6 +51,10 @@ SUBDIRS=\ qhttpnetworkconnection \ qhttpnetworkreply \ qhttpsocketengine \ + qnetworkreply \ qsocketnotifier \ qsocks5socketengine \ + qsslsocket \ + qsslsocket_onDemandCertificates_member \ + qsslsocket_onDemandCertificates_static \ |