Remove redundant options and a stray define

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

Remove redundant options and a stray define
Change-Id: Ic7ce11f1631197e6ee019b66c0d7ec56590c5ab5 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
790586e4 · Jesus Fernandez · Jesus Fernandez · 39a0e9bb · 790586e4 · 790586e4
Commit 790586e4 authored 6 years ago by Jesus Fernandez Committed by Jesus Fernandez 6 years ago
--- a/examples/examples.pro
+++ b/examples/examples.pro
 TEMPLATE = subdirs

-SUBDIRS = websockets
\ No newline at end of file
+SUBDIRS = websockets
--- a/examples/websockets/echoserver/echoserver.pro
+++ b/examples/websockets/echoserver/echoserver.pro
-QT       += core websockets
-QT       -= gui
+QT = websockets

 TARGET = echoserver
 CONFIG   += console

--- a/examples/websockets/qmlwebsocketclient/qmlwebsocketclient.pro
+++ b/examples/websockets/qmlwebsocketclient/qmlwebsocketclient.pro
-QT += core qml quick websockets
+QT += quick websockets

 TARGET = qmlwebsocketclient


--- a/examples/websockets/qmlwebsocketserver/qmlwebsocketserver.pro
+++ b/examples/websockets/qmlwebsocketserver/qmlwebsocketserver.pro
-QT += core qml quick websockets
+QT += quick websockets

 TARGET = qmlwebsocketserver


--- a/examples/websockets/simplechat/simplechat.pro
+++ b/examples/websockets/simplechat/simplechat.pro
-QT       += core websockets
-QT       -= gui
+QT = websockets

 TARGET = chatserver
 CONFIG   += console

--- a/examples/websockets/sslechoclient/sslechoclient.pro
+++ b/examples/websockets/sslechoclient/sslechoclient.pro
-QT       += core websockets
-QT       -= gui
+QT = websockets

 TARGET = sslechoclient
 CONFIG   += console

--- a/examples/websockets/sslechoserver/sslechoserver.pro
+++ b/examples/websockets/sslechoserver/sslechoserver.pro
-QT       += core websockets
-QT       -= gui
+QT = websockets

 TARGET = sslechoserver
 CONFIG   += console

--- a/src/imports/qmlwebsockets/qmlwebsockets.pro
+++ b/src/imports/qmlwebsockets/qmlwebsockets.pro
-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)
--- a/src/imports/qmlwebsockets_compat/qmlwebsockets_compat.pro
+++ b/src/imports/qmlwebsockets_compat/qmlwebsockets_compat.pro
 ### Qt 6: Remove support for the old "Qt.WebSockets" QML module.

-QT = core websockets qml
+QT = websockets qml

 TARGETPATH = Qt/WebSockets


--- 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


--- 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


--- 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


--- 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


--- 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


--- 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

--- 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


--- 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


--- 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


--- a/tests/manual/compliance/compliance.pro
+++ b/tests/manual/compliance/compliance.pro
 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
-
--- a/tests/manual/websockets/websockets.pro
+++ b/tests/manual/websockets/websockets.pro
 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