Remove redundant options and a stray define

Change-Id: Ic7ce11f1631197e6ee019b66c0d7ec56590c5ab5
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

20 files changed, 20 insertions, 31 deletions

diff --git a/examples/examples.pro b/examples/examples.pro
index 158e1ce..ba224f8 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 
-SUBDIRS = websockets
\ No newline at end of file
+SUBDIRS = websockets
diff --git a/examples/websockets/echoserver/echoserver.pro b/examples/websockets/echoserver/echoserver.pro
index eacaedc..e84da11 100644
--- a/examples/websockets/echoserver/echoserver.pro
+++ b/examples/websockets/echoserver/echoserver.pro
@@ -1,5 +1,4 @@
-QT       += core websockets
-QT       -= gui
+QT = websockets
 
 TARGET = echoserver
 CONFIG   += console
diff --git a/examples/websockets/qmlwebsocketclient/qmlwebsocketclient.pro b/examples/websockets/qmlwebsocketclient/qmlwebsocketclient.pro
index 37d7823..a67643f 100644
--- a/examples/websockets/qmlwebsocketclient/qmlwebsocketclient.pro
+++ b/examples/websockets/qmlwebsocketclient/qmlwebsocketclient.pro
@@ -1,4 +1,4 @@
-QT += core qml quick websockets
+QT += quick websockets
 
 TARGET = qmlwebsocketclient
 
diff --git a/examples/websockets/qmlwebsocketserver/qmlwebsocketserver.pro b/examples/websockets/qmlwebsocketserver/qmlwebsocketserver.pro
index 4f1a64f..1f36181 100644
--- a/examples/websockets/qmlwebsocketserver/qmlwebsocketserver.pro
+++ b/examples/websockets/qmlwebsocketserver/qmlwebsocketserver.pro
@@ -1,4 +1,4 @@
-QT += core qml quick websockets
+QT += quick websockets
 
 TARGET = qmlwebsocketserver
 
diff --git a/examples/websockets/simplechat/simplechat.pro b/examples/websockets/simplechat/simplechat.pro
index df6f248..235ccc0 100644
--- a/examples/websockets/simplechat/simplechat.pro
+++ b/examples/websockets/simplechat/simplechat.pro
@@ -1,5 +1,4 @@
-QT       += core websockets
-QT       -= gui
+QT = websockets
 
 TARGET = chatserver
 CONFIG   += console
diff --git a/examples/websockets/sslechoclient/sslechoclient.pro b/examples/websockets/sslechoclient/sslechoclient.pro
index 925fece..3fa9d9b 100644
--- a/examples/websockets/sslechoclient/sslechoclient.pro
+++ b/examples/websockets/sslechoclient/sslechoclient.pro
@@ -1,5 +1,4 @@
-QT       += core websockets
-QT       -= gui
+QT = websockets
 
 TARGET = sslechoclient
 CONFIG   += console
diff --git a/examples/websockets/sslechoserver/sslechoserver.pro b/examples/websockets/sslechoserver/sslechoserver.pro
index b1c0528..a214a6d 100644
--- a/examples/websockets/sslechoserver/sslechoserver.pro
+++ b/examples/websockets/sslechoserver/sslechoserver.pro
@@ -1,5 +1,4 @@
-QT       += core websockets
-QT       -= gui
+QT = websockets
 
 TARGET = sslechoserver
 CONFIG   += console
diff --git a/src/imports/qmlwebsockets/qmlwebsockets.pro b/src/imports/qmlwebsockets/qmlwebsockets.pro
index fef47f4..fa631bd 100644
--- a/src/imports/qmlwebsockets/qmlwebsockets.pro
+++ b/src/imports/qmlwebsockets/qmlwebsockets.pro
@@ -1,4 +1,4 @@
-QT = core websockets qml qml-private core-private
+QT = websockets qml-private core-private
 
 TARGETPATH = QtWebSockets
 
@@ -12,8 +12,6 @@ SOURCES +=  qmlwebsockets_plugin.cpp \
 
 OTHER_FILES += qmldir
 
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
-
 IMPORT_VERSION = 1.0
 
 load(qml_plugin)
diff --git a/src/imports/qmlwebsockets_compat/qmlwebsockets_compat.pro b/src/imports/qmlwebsockets_compat/qmlwebsockets_compat.pro
index a6610b6..fbdf01c 100644
--- a/src/imports/qmlwebsockets_compat/qmlwebsockets_compat.pro
+++ b/src/imports/qmlwebsockets_compat/qmlwebsockets_compat.pro
@@ -1,6 +1,6 @@
 ### Qt 6: Remove support for the old "Qt.WebSockets" QML module.
 
-QT = core websockets qml
+QT = websockets qml
 
 TARGETPATH = Qt/WebSockets
 
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