summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-22 02:29:10 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-22 02:29:10 (GMT)
commit57548709d983a172dc5923b9345c0df96d7dcba1 (patch)
tree4e3390c74ee762cdd73aff291ede60f08f04348f /tests/auto
parent0f761d9d95bc187cb786ce7dc03a7d8c9ad9d779 (diff)
parentbc5b362ae8754ba4bd9d12ddbf9c4a7e21502ff4 (diff)
downloadQt-57548709d983a172dc5923b9345c0df96d7dcba1.zip
Qt-57548709d983a172dc5923b9345c0df96d7dcba1.tar.gz
Qt-57548709d983a172dc5923b9345c0df96d7dcba1.tar.bz2
Merge remote branch 'staging/master' into bearermanagement/unit-tests
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qnetworksession/lackey/lackey.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qnetworksession/lackey/lackey.pro b/tests/auto/qnetworksession/lackey/lackey.pro
index 8fbdd58..5db6743 100644
--- a/tests/auto/qnetworksession/lackey/lackey.pro
+++ b/tests/auto/qnetworksession/lackey/lackey.pro
@@ -6,6 +6,7 @@ QT = core network
DESTDIR = ./
win32:CONFIG += console
+mac:CONFIG -= app_bundle
symbian {
# Needed for interprocess communication and opening QNetworkSession