diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-27 22:51:09 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-27 22:51:09 +0200 |
| commit | 190fa97c83472863fd886e86f626ab8196ed51b3 (patch) | |
| tree | 49edb9f6a41d6c999c9bb43ae28911a8e7212757 /tests/auto/network/access | |
| parent | 3aa163491c9c8f28c88ac87cafc6418f2c0e46c5 (diff) | |
| parent | 5971e0918757737425151c39a5f81a238663a17a (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
examples/widgets/doc/src/addressbook-fr.qdoc
Change-Id: Id1196e8e0c6445f1616c3f29234c974d809f8e48
Diffstat (limited to 'tests/auto/network/access')
3 files changed, 3 insertions, 6 deletions
diff --git a/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro b/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro index 56572a2490..2b5ffab088 100644 --- a/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro +++ b/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro @@ -1,8 +1,7 @@ CONFIG += testcase CONFIG += parallel_test TARGET = tst_qabstractnetworkcache -QT += network testlib -QT -= gui +QT = core network testlib SOURCES += tst_qabstractnetworkcache.cpp TESTDATA += tests/* diff --git a/tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro b/tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro index ebef3b007d..7342252963 100644 --- a/tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro +++ b/tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro @@ -1,7 +1,6 @@ CONFIG += testcase CONFIG += parallel_test TARGET = tst_qnetworkcachemetadata -QT -= gui -QT += network testlib +QT = core network testlib SOURCES += tst_qnetworkcachemetadata.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro b/tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro index d84a332870..57f9c0534a 100644 --- a/tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro +++ b/tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro @@ -1,7 +1,6 @@ CONFIG += testcase CONFIG += parallel_test TARGET = tst_qnetworkdiskcache -QT -= gui -QT += network testlib +QT = core network testlib SOURCES += tst_qnetworkdiskcache.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |