diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-15 19:47:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-15 19:47:57 +0200 |
| commit | 40a1f69e8663fb79560c26cfad5ead45b1b3ee5f (patch) | |
| tree | a8ceb093a098a38b29c0fe27e41af480ae10b876 /tests/auto/network | |
| parent | 446afc10451d5097d7bd20b1b8d20325c4d54fa5 (diff) | |
| parent | 6b2071c697d4c48f0cd289b28b443ebffc3432e6 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
configure.json
mkspecs/macx-tvos-clang/qmake.conf
mkspecs/macx-watchos-clang/qmake.conf
Change-Id: Iaf32339ace59dff9ed344972472744c55d75025c
Diffstat (limited to 'tests/auto/network')
| -rw-r--r-- | tests/auto/network/access/qnetworkreply/test/test.pro | 1 | ||||
| -rw-r--r-- | tests/auto/network/socket/socket.pro | 2 | ||||
| -rw-r--r-- | tests/auto/network/ssl/ssl.pro | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/network/access/qnetworkreply/test/test.pro b/tests/auto/network/access/qnetworkreply/test/test.pro index 47e7f5ed15..45a5734305 100644 --- a/tests/auto/network/access/qnetworkreply/test/test.pro +++ b/tests/auto/network/access/qnetworkreply/test/test.pro @@ -5,6 +5,7 @@ SOURCES += ../tst_qnetworkreply.cpp TARGET = ../tst_qnetworkreply QT = core-private network-private testlib +QT_FOR_CONFIG += gui-private RESOURCES += ../qnetworkreply.qrc TESTDATA += ../empty ../rfc3252.txt ../resource ../bigfile ../*.jpg ../certs \ diff --git a/tests/auto/network/socket/socket.pro b/tests/auto/network/socket/socket.pro index 307f7e92de..06fe356a5a 100644 --- a/tests/auto/network/socket/socket.pro +++ b/tests/auto/network/socket/socket.pro @@ -1,4 +1,6 @@ TEMPLATE=subdirs +QT_FOR_CONFIG += network + SUBDIRS=\ qhttpsocketengine \ qudpsocket \ diff --git a/tests/auto/network/ssl/ssl.pro b/tests/auto/network/ssl/ssl.pro index 65e35ea4c0..ec74748f5b 100644 --- a/tests/auto/network/ssl/ssl.pro +++ b/tests/auto/network/ssl/ssl.pro @@ -1,4 +1,6 @@ TEMPLATE=subdirs +QT_FOR_CONFIG += network + SUBDIRS=\ qsslcertificate \ qsslcipher \ |