diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-21 03:00:08 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-21 03:00:14 +0200 |
| commit | e0d35eb9877ae7cb2efd653e0d426e276a72612c (patch) | |
| tree | 6b6da6db0f372515072899e520f48816866536de | |
| parent | ca07e263cfd16830b19f69ed135dba25bdf19442 (diff) | |
| parent | 4bfb1805a725b41d965c2388b1609b7acae67442 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
| -rw-r--r-- | tests/auto/qcoapclient/qcoapclient.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qcoapinternalreply/qcoapinternalreply.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qcoapinternalrequest/qcoapinternalrequest.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qcoapmessage/qcoapmessage.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qcoapoption/qcoapoption.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qcoapqudpconnection/qcoapqudpconnection.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qcoapreply/qcoapreply.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qcoaprequest/qcoaprequest.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qcoapresource/qcoapresource.pro | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/qcoapclient/qcoapclient.pro b/tests/auto/qcoapclient/qcoapclient.pro index 59cfc4f..3208df3 100644 --- a/tests/auto/qcoapclient/qcoapclient.pro +++ b/tests/auto/qcoapclient/qcoapclient.pro @@ -1,4 +1,4 @@ -QT = testlib core-private network core coap coap-private +QT = testlib network core coap coap-private CONFIG += testcase include(../coaptestserver.pri) diff --git a/tests/auto/qcoapinternalreply/qcoapinternalreply.pro b/tests/auto/qcoapinternalreply/qcoapinternalreply.pro index a8e0777..5503806 100644 --- a/tests/auto/qcoapinternalreply/qcoapinternalreply.pro +++ b/tests/auto/qcoapinternalreply/qcoapinternalreply.pro @@ -1,4 +1,4 @@ -QT = testlib core-private network core coap coap-private +QT = testlib network core coap coap-private CONFIG += testcase SOURCES += tst_qcoapinternalreply.cpp diff --git a/tests/auto/qcoapinternalrequest/qcoapinternalrequest.pro b/tests/auto/qcoapinternalrequest/qcoapinternalrequest.pro index a1e57a6..1c31e73 100644 --- a/tests/auto/qcoapinternalrequest/qcoapinternalrequest.pro +++ b/tests/auto/qcoapinternalrequest/qcoapinternalrequest.pro @@ -1,4 +1,4 @@ -QT = testlib core-private network core coap coap-private +QT = testlib network core coap coap-private CONFIG += testcase SOURCES += \ diff --git a/tests/auto/qcoapmessage/qcoapmessage.pro b/tests/auto/qcoapmessage/qcoapmessage.pro index 47179d6..20bf421 100644 --- a/tests/auto/qcoapmessage/qcoapmessage.pro +++ b/tests/auto/qcoapmessage/qcoapmessage.pro @@ -1,4 +1,4 @@ -QT = testlib core-private network core coap +QT = testlib network core coap CONFIG += testcase SOURCES += tst_qcoapmessage.cpp diff --git a/tests/auto/qcoapoption/qcoapoption.pro b/tests/auto/qcoapoption/qcoapoption.pro index 411dc4c..f368fa8 100644 --- a/tests/auto/qcoapoption/qcoapoption.pro +++ b/tests/auto/qcoapoption/qcoapoption.pro @@ -1,4 +1,4 @@ -QT = testlib core-private core coap coap-private +QT = testlib core coap coap-private CONFIG += testcase SOURCES += tst_qcoapoption.cpp diff --git a/tests/auto/qcoapqudpconnection/qcoapqudpconnection.pro b/tests/auto/qcoapqudpconnection/qcoapqudpconnection.pro index 984d62d..69b7b81 100644 --- a/tests/auto/qcoapqudpconnection/qcoapqudpconnection.pro +++ b/tests/auto/qcoapqudpconnection/qcoapqudpconnection.pro @@ -1,4 +1,4 @@ -QT = testlib network core-private core coap coap-private +QT = testlib network core coap coap-private CONFIG += testcase include(../coaptestserver.pri) diff --git a/tests/auto/qcoapreply/qcoapreply.pro b/tests/auto/qcoapreply/qcoapreply.pro index acd82b9..45958f9 100644 --- a/tests/auto/qcoapreply/qcoapreply.pro +++ b/tests/auto/qcoapreply/qcoapreply.pro @@ -1,4 +1,4 @@ -QT = testlib core-private network core coap coap-private +QT = testlib network core coap coap-private CONFIG += testcase SOURCES += tst_qcoapreply.cpp diff --git a/tests/auto/qcoaprequest/qcoaprequest.pro b/tests/auto/qcoaprequest/qcoaprequest.pro index e25ce28..a759b66 100644 --- a/tests/auto/qcoaprequest/qcoaprequest.pro +++ b/tests/auto/qcoaprequest/qcoaprequest.pro @@ -1,4 +1,4 @@ -QT = testlib core-private network core coap coap-private +QT = testlib network core coap coap-private CONFIG += testcase SOURCES += tst_qcoaprequest.cpp diff --git a/tests/auto/qcoapresource/qcoapresource.pro b/tests/auto/qcoapresource/qcoapresource.pro index 8acf36b..2f7c8a0 100644 --- a/tests/auto/qcoapresource/qcoapresource.pro +++ b/tests/auto/qcoapresource/qcoapresource.pro @@ -1,4 +1,4 @@ -QT = testlib network core-private core coap coap-private +QT = testlib network core coap coap-private CONFIG += testcase SOURCES += tst_qcoapresource.cpp |