diff options
author | Peter Varga <pvarga@inf.u-szeged.hu> | 2020-11-26 16:25:51 +0100 |
---|---|---|
committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2020-12-01 08:53:30 +0100 |
commit | e861ee912cb633643fc49d26db960b652e6f3357 (patch) | |
tree | 115bb654522f179fde1ad82c53a26327fab3f83b /tests | |
parent | 935715e2a90111dd6c1894532670f5b0563f1800 (diff) | |
download | qtwebsockets-e861ee912cb633643fc49d26db960b652e6f3357.tar.gz |
Remove Qt5 leftovers
Change-Id: Ifecb6f90687601a20e719db3ba194e33f3303f24
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qml/.prev_CMakeLists.txt | 6 | ||||
-rw-r--r-- | tests/auto/qml/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/auto/qml/qml.pro | 2 | ||||
-rw-r--r-- | tests/auto/qml/qmlwebsockets_compat/qmlwebsockets_compat.pro | 9 | ||||
-rw-r--r-- | tests/auto/qml/qmlwebsockets_compat/tst_qmlwebsockets_compat.cpp | 30 | ||||
-rw-r--r-- | tests/auto/qml/qmlwebsockets_compat/tst_qmlwebsockets_compat.qml | 47 | ||||
-rw-r--r-- | tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp | 13 |
7 files changed, 1 insertions, 107 deletions
diff --git a/tests/auto/qml/.prev_CMakeLists.txt b/tests/auto/qml/.prev_CMakeLists.txt deleted file mode 100644 index 96eef3f..0000000 --- a/tests/auto/qml/.prev_CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -# Generated from qml.pro. - -if(NOT UIKIT) - add_subdirectory(qmlwebsockets) - add_subdirectory(qmlwebsockets_compat) -endif() diff --git a/tests/auto/qml/CMakeLists.txt b/tests/auto/qml/CMakeLists.txt index 8788707..ffaf99c 100644 --- a/tests/auto/qml/CMakeLists.txt +++ b/tests/auto/qml/CMakeLists.txt @@ -2,5 +2,4 @@ if(NOT UIKIT) add_subdirectory(qmlwebsockets) - # add_subdirectory(qmlwebsockets_compat) # special case remove endif() diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro index 8951c55..56667e6 100644 --- a/tests/auto/qml/qml.pro +++ b/tests/auto/qml/qml.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -!uikit: SUBDIRS += qmlwebsockets qmlwebsockets_compat +!uikit: SUBDIRS += qmlwebsockets diff --git a/tests/auto/qml/qmlwebsockets_compat/qmlwebsockets_compat.pro b/tests/auto/qml/qmlwebsockets_compat/qmlwebsockets_compat.pro deleted file mode 100644 index 104e6de..0000000 --- a/tests/auto/qml/qmlwebsockets_compat/qmlwebsockets_compat.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = app -TARGET = tst_qmlwebsockets_compat -CONFIG += qmltestcase -CONFIG += console -SOURCES += tst_qmlwebsockets_compat.cpp - -importFiles.path = . -DEPLOYMENT += importFiles - diff --git a/tests/auto/qml/qmlwebsockets_compat/tst_qmlwebsockets_compat.cpp b/tests/auto/qml/qmlwebsockets_compat/tst_qmlwebsockets_compat.cpp deleted file mode 100644 index c0e09cf..0000000 --- a/tests/auto/qml/qmlwebsockets_compat/tst_qmlwebsockets_compat.cpp +++ /dev/null @@ -1,30 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QtQuickTest/quicktest.h> -QUICK_TEST_MAIN(qmlwebsockets_compat) diff --git a/tests/auto/qml/qmlwebsockets_compat/tst_qmlwebsockets_compat.qml b/tests/auto/qml/qmlwebsockets_compat/tst_qmlwebsockets_compat.qml deleted file mode 100644 index d9ba35d..0000000 --- a/tests/auto/qml/qmlwebsockets_compat/tst_qmlwebsockets_compat.qml +++ /dev/null @@ -1,47 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.5 -import Qt.WebSockets 1.0 - -Rectangle { - width: 360 - height: 360 - - function appendMessage(message) { - messageBox.text += "\n" + message - } - - WebSocketServer { - id: server - } - - WebSocket { - id: socket - } -} diff --git a/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp b/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp index 62d8d43..09bc2fd 100644 --- a/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp +++ b/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp @@ -196,11 +196,7 @@ void tst_QWebSocketServer::tst_initialisation() QCOMPARE(server.maxPendingConnections(), 30); QCOMPARE(server.serverPort(), quint16(0)); QCOMPARE(server.serverAddress(), QHostAddress()); -#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) QCOMPARE(server.socketDescriptor(), -1); -#else // ### Qt 6: Remove leftovers - QCOMPARE(server.nativeDescriptor(), -1); -#endif // (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) QVERIFY(!server.hasPendingConnections()); QVERIFY(!server.nextPendingConnection()); QCOMPARE(server.error(), QWebSocketProtocol::CloseCodeNormal); @@ -225,11 +221,7 @@ void tst_QWebSocketServer::tst_initialisation() QCOMPARE(server.maxPendingConnections(), 30); QCOMPARE(server.serverPort(), quint16(0)); QCOMPARE(server.serverAddress(), QHostAddress()); -#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) QCOMPARE(server.socketDescriptor(), -1); -#else // ### Qt 6: Remove leftovers - QCOMPARE(server.nativeDescriptor(), -1); -#endif // (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) QVERIFY(!server.hasPendingConnections()); QVERIFY(!server.nextPendingConnection()); QCOMPARE(server.error(), QWebSocketProtocol::CloseCodeNormal); @@ -265,13 +257,8 @@ void tst_QWebSocketServer::tst_settersAndGetters() server.setMaxPendingConnections(INT_MAX); QCOMPARE(server.maxPendingConnections(), INT_MAX); -#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) QVERIFY(!server.setSocketDescriptor(-2)); QCOMPARE(server.socketDescriptor(), -1); -#else // ### Qt 6: Remove leftovers - QVERIFY(!server.setNativeDescriptor(-2)); - QCOMPARE(server.nativeDescriptor(), -1); -#endif // (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) server.setServerName(QStringLiteral("Qt WebSocketServer")); QCOMPARE(server.serverName(), QStringLiteral("Qt WebSocketServer")); |