3 files changed, 25 insertions, 59 deletions
diff --git a/tests/auto/network/ssl/qsslcipher/CMakeLists.txt b/tests/auto/network/ssl/qsslcipher/CMakeLists.txt
index b6a2348fca..8538f56acd 100644
--- a/tests/auto/network/ssl/qsslcipher/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslcipher/CMakeLists.txt
@@ -1,21 +1,20 @@
-# Generated from qsslcipher.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qsslcipher Test:
 #####################################################################
 
-qt_add_test(tst_qsslcipher
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qsslcipher LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
+qt_internal_add_test(tst_qsslcipher
     SOURCES
         tst_qsslcipher.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Network
+    BUNDLE_ANDROID_OPENSSL_LIBS
 )
-
-## Scopes:
-#####################################################################
-
-#### Keys ignored in scope 3:.:.:qsslcipher.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
-# DESTDIR = "debug"
-
-#### Keys ignored in scope 4:.:.:qsslcipher.pro:else:
-# DESTDIR = "release"
diff --git a/tests/auto/network/ssl/qsslcipher/qsslcipher.pro b/tests/auto/network/ssl/qsslcipher/qsslcipher.pro
deleted file mode 100644
index 392d22c054..0000000000
--- a/tests/auto/network/ssl/qsslcipher/qsslcipher.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-CONFIG += testcase
-
-SOURCES += tst_qsslcipher.cpp
-QT = core network testlib
-
-TARGET = tst_qsslcipher
-
-win32 {
-  CONFIG(debug, debug|release) {
-    DESTDIR = debug
-} else {
-    DESTDIR = release
-  }
-}
diff --git a/tests/auto/network/ssl/qsslcipher/tst_qsslcipher.cpp b/tests/auto/network/ssl/qsslcipher/tst_qsslcipher.cpp
index 9ffba1ec94..6810149c11 100644
--- a/tests/auto/network/ssl/qsslcipher/tst_qsslcipher.cpp
+++ b/tests/auto/network/ssl/qsslcipher/tst_qsslcipher.cpp
@@ -1,37 +1,9 @@
-/****************************************************************************
-**
-** 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 <QtTest/QtTest>
-#include <qsslcipher.h>
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+
 
-#include <QtNetwork/qhostaddress.h>
-#include <QtNetwork/qnetworkproxy.h>
+#include <QTest>
+#include <qsslcipher.h>
 
 class tst_QSslCipher : public QObject
 {
@@ -50,6 +22,15 @@ private slots:
 void tst_QSslCipher::constructing()
 {
     QSslCipher cipher;
+
+    QVERIFY(cipher.isNull());
+    QCOMPARE(cipher.name(), QString());
+    QCOMPARE(cipher.supportedBits(), 0);
+    QCOMPARE(cipher.usedBits(), 0);
+    QCOMPARE(cipher.keyExchangeMethod(), QString());
+    QCOMPARE(cipher.authenticationMethod(), QString());
+    QCOMPARE(cipher.protocolString(), QString());
+    QCOMPARE(cipher.protocol(), QSsl::UnknownProtocol);
 }
 
 #endif // QT_NO_SSL