summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJesus Fernandez <jesus.fernandez@qt.io>2018-08-16 14:17:14 +0200
committerJesus Fernandez <Jesus.Fernandez@qt.io>2018-08-17 11:01:11 +0000
commit790586e42920a4cbf10bb808aa1b716247628cc4 (patch)
treea789809cc53bb87bbfc658b4e10963a468f978cc /tests
parent39a0e9bb5a3e87522bfe4a3107560fd6ef7632b4 (diff)
downloadqtwebsockets-790586e42920a4cbf10bb808aa1b716247628cc4.tar.gz
Remove redundant options and a stray define
Change-Id: Ic7ce11f1631197e6ee019b66c0d7ec56590c5ab5 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/websockets/dataprocessor/dataprocessor.pro2
-rw-r--r--tests/auto/websockets/handshakerequest/handshakerequest.pro2
-rw-r--r--tests/auto/websockets/handshakeresponse/handshakeresponse.pro2
-rw-r--r--tests/auto/websockets/qdefaultmaskgenerator/qdefaultmaskgenerator.pro2
-rw-r--r--tests/auto/websockets/qwebsocket/qwebsocket.pro2
-rw-r--r--tests/auto/websockets/qwebsocketcorsauthenticator/qwebsocketcorsauthenticator.pro2
-rw-r--r--tests/auto/websockets/qwebsocketserver/qwebsocketserver.pro2
-rw-r--r--tests/auto/websockets/websocketframe/websocketframe.pro2
-rw-r--r--tests/auto/websockets/websocketprotocol/websocketprotocol.pro2
-rw-r--r--tests/manual/compliance/compliance.pro4
-rw-r--r--tests/manual/websockets/websockets.pro5
11 files changed, 11 insertions, 16 deletions
diff --git a/tests/auto/websockets/dataprocessor/dataprocessor.pro b/tests/auto/websockets/dataprocessor/dataprocessor.pro
index ad99900..907bfeb 100644
--- a/tests/auto/websockets/dataprocessor/dataprocessor.pro
+++ b/tests/auto/websockets/dataprocessor/dataprocessor.pro
@@ -6,7 +6,7 @@ TEMPLATE = app
TARGET = tst_dataprocessor
-QT = core testlib websockets websockets-private
+QT = testlib websockets-private
SOURCES += tst_dataprocessor.cpp
diff --git a/tests/auto/websockets/handshakerequest/handshakerequest.pro b/tests/auto/websockets/handshakerequest/handshakerequest.pro
index aa7779e..b641445 100644
--- a/tests/auto/websockets/handshakerequest/handshakerequest.pro
+++ b/tests/auto/websockets/handshakerequest/handshakerequest.pro
@@ -6,7 +6,7 @@ TEMPLATE = app
TARGET = tst_handshakerequest
-QT = core testlib websockets websockets-private
+QT = testlib websockets-private
SOURCES += tst_handshakerequest.cpp
diff --git a/tests/auto/websockets/handshakeresponse/handshakeresponse.pro b/tests/auto/websockets/handshakeresponse/handshakeresponse.pro
index ab6682b..61ff2f7 100644
--- a/tests/auto/websockets/handshakeresponse/handshakeresponse.pro
+++ b/tests/auto/websockets/handshakeresponse/handshakeresponse.pro
@@ -6,7 +6,7 @@ TEMPLATE = app
TARGET = tst_handshakeresponse
-QT = core testlib websockets websockets-private
+QT = testlib websockets-private
SOURCES += tst_handshakeresponse.cpp
diff --git a/tests/auto/websockets/qdefaultmaskgenerator/qdefaultmaskgenerator.pro b/tests/auto/websockets/qdefaultmaskgenerator/qdefaultmaskgenerator.pro
index c3b1046..07ea14d 100644
--- a/tests/auto/websockets/qdefaultmaskgenerator/qdefaultmaskgenerator.pro
+++ b/tests/auto/websockets/qdefaultmaskgenerator/qdefaultmaskgenerator.pro
@@ -6,7 +6,7 @@ TEMPLATE = app
TARGET = tst_defaultmaskgenerator
-QT = core testlib websockets websockets-private
+QT = testlib websockets-private
SOURCES += tst_defaultmaskgenerator.cpp
diff --git a/tests/auto/websockets/qwebsocket/qwebsocket.pro b/tests/auto/websockets/qwebsocket/qwebsocket.pro
index 1b08dc7..df143d5 100644
--- a/tests/auto/websockets/qwebsocket/qwebsocket.pro
+++ b/tests/auto/websockets/qwebsocket/qwebsocket.pro
@@ -2,7 +2,7 @@ CONFIG += console
CONFIG += testcase
CONFIG -= app_bundle
-QT = core testlib websockets
+QT = testlib websockets
TARGET = tst_qwebsocket
diff --git a/tests/auto/websockets/qwebsocketcorsauthenticator/qwebsocketcorsauthenticator.pro b/tests/auto/websockets/qwebsocketcorsauthenticator/qwebsocketcorsauthenticator.pro
index 9a5af6b..caa97ad 100644
--- a/tests/auto/websockets/qwebsocketcorsauthenticator/qwebsocketcorsauthenticator.pro
+++ b/tests/auto/websockets/qwebsocketcorsauthenticator/qwebsocketcorsauthenticator.pro
@@ -6,7 +6,7 @@ TEMPLATE = app
TARGET = tst_qwebsocketcorsauthenticator
-QT = core testlib websockets
+QT = testlib websockets
SOURCES += tst_qwebsocketcorsauthenticator.cpp
diff --git a/tests/auto/websockets/qwebsocketserver/qwebsocketserver.pro b/tests/auto/websockets/qwebsocketserver/qwebsocketserver.pro
index 178fd88..c1ca4af 100644
--- a/tests/auto/websockets/qwebsocketserver/qwebsocketserver.pro
+++ b/tests/auto/websockets/qwebsocketserver/qwebsocketserver.pro
@@ -2,7 +2,7 @@ CONFIG += console
CONFIG += testcase
CONFIG -= app_bundle
-QT = core testlib websockets
+QT = testlib websockets
TARGET = tst_qwebsocketserver
diff --git a/tests/auto/websockets/websocketframe/websocketframe.pro b/tests/auto/websockets/websocketframe/websocketframe.pro
index 8f58302..babb296 100644
--- a/tests/auto/websockets/websocketframe/websocketframe.pro
+++ b/tests/auto/websockets/websocketframe/websocketframe.pro
@@ -6,7 +6,7 @@ TEMPLATE = app
TARGET = tst_websocketframe
-QT = core testlib websockets websockets-private
+QT = testlib websockets-private
SOURCES += tst_websocketframe.cpp
diff --git a/tests/auto/websockets/websocketprotocol/websocketprotocol.pro b/tests/auto/websockets/websocketprotocol/websocketprotocol.pro
index 27748a9..22a8140 100644
--- a/tests/auto/websockets/websocketprotocol/websocketprotocol.pro
+++ b/tests/auto/websockets/websocketprotocol/websocketprotocol.pro
@@ -6,7 +6,7 @@ TEMPLATE = app
TARGET = tst_websocketprotocol
-QT = core testlib websockets websockets-private
+QT = testlib websockets-private
SOURCES += tst_websocketprotocol.cpp
diff --git a/tests/manual/compliance/compliance.pro b/tests/manual/compliance/compliance.pro
index 30ac320..078c258 100644
--- a/tests/manual/compliance/compliance.pro
+++ b/tests/manual/compliance/compliance.pro
@@ -1,5 +1,4 @@
CONFIG += console
-CONFIG += c++11
CONFIG += testcase
CONFIG -= app_bundle
@@ -7,7 +6,6 @@ TEMPLATE = app
TARGET = tst_compliance
-QT = core network websockets testlib
+QT = websockets testlib
SOURCES += tst_compliance.cpp
-
diff --git a/tests/manual/websockets/websockets.pro b/tests/manual/websockets/websockets.pro
index a8b2edb..62000b9 100644
--- a/tests/manual/websockets/websockets.pro
+++ b/tests/manual/websockets/websockets.pro
@@ -1,5 +1,4 @@
CONFIG += console
-CONFIG += c++11
CONFIG += testcase
CONFIG -= app_bundle
@@ -7,8 +6,6 @@ TEMPLATE = app
TARGET = tst_websockets
-QT = core network websockets testlib
+QT = websockets testlib
SOURCES += tst_websockets.cpp
-
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0