diff --git a/examples/examples.pro b/examples/examples.pro index 158e1ce7f4194bb50d9b6c565efb0c8bc204e2bc..ba224f8042790491ede8dbf4f1f61bc0a1b4caa9 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 eacaedce3ba241f92d4c94e69fb09c13464d41b5..e84da1180d9af331b1afac16ffb1ec3c9a7d37f7 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 37d782375e9c7dbb2d9acfd152991b039969495c..a67643f32c8067e3a563e66a804789a7ef37bbc8 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 4f1a64fce567a4df20fc8e30419298898a91fdf4..1f36181524c21e07d28092717ed8da1425a20f46 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 df6f248ddcdcf56f69bab74bd6b92f339291e573..235ccc021aa87021e11156efc58ce2c8b810a960 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 925feceaff6eac74cc411c3cd1e13c7bfbee7aa7..3fa9d9bb15d76d9a65cbc9d9d5c50289970eb003 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 b1c052837037f5167aa0a14fb0420d342e05e82f..a214a6d861e08afe5e2adebfb949adb1ed99697f 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 fef47f479457961eaca7f0d48e0904365d289b2c..fa631bda2e7645b2527329272e24eff16e427f3a 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 a6610b645543bdb015128c6e3629b6f175824d0c..fbdf01c1ee07ebce157fc210412683a16cd7e1f7 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 ad99900f7f685280210b3abacf9dbefd04bd58da..907bfebbe8398e457f08b1998c78346ffab876a0 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 aa7779ed3fa162549224512e3962039e702ab948..b641445117e717e236624c42546bf8af1afc6d44 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 ab6682b42284c55a467949e1a7419367896fe997..61ff2f79805a9bebc4b40ccb805215216e939868 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 c3b1046c7b9cb323f78ba8cedc3a4522381f0358..07ea14d7099f282a0b4665397a9f67c883d873be 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 1b08dc7c377373459b416b3c0f92d7894a2f25ee..df143d5bb08a619d330722c0b33f5f533311d798 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 9a5af6b0c6e619a61abb16daf9bc8f81b1aad676..caa97ad163886c5547f2cb68085460081eeb8e36 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 178fd8870e6d529c89d2fcc07c448bad5f05ae8d..c1ca4afadd38361d7b122138f3359f58686fad26 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 8f58302a84c714d3a639bb0e7dcf256a0a46cc28..babb2966cc1d597b7fed115f0dc2bb86eff30467 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 27748a9f532847f126267f94cc0817601ea34246..22a814002ca6e861ef7d58bf0d4df88de5d07573 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 30ac320803e836bea823f9d76df9267833843c87..078c258efae1de3c2366c764b0b639e915eb7462 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 a8b2edbc69f2cafb680018044487769e11994730..62000b9e30515f630dcf31b0954579b6a9684a9d 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