aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Köhne <kai.koehne@qt.io>2022-03-21 18:50:14 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-03-22 16:27:12 +0000
commitf2b398268ef54231c494027aa339b7e9bee57854 (patch)
tree47fec04384192132f763881509524c7c3eda9d2c
parent2109417633a9e60128e8dcee2accc7f68f405055 (diff)
Remove .prev_CMakeLists.txt
Change-Id: Icaf0fac81f51432c706a948d0986aae68e44fffb Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 7bd0a9f0c6c2d7791a89e304442970b08d8a295a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--.prev_CMakeLists.txt20
-rw-r--r--src/imports/qmlwebsockets/.prev_CMakeLists.txt25
-rw-r--r--tests/.prev_CMakeLists.txt7
-rw-r--r--tests/auto/.prev_CMakeLists.txt7
4 files changed, 0 insertions, 59 deletions
diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt
deleted file mode 100644
index d1a8235..0000000
--- a/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated from qtwebsockets.pro.
-
-cmake_minimum_required(VERSION 3.15.0)
-
-include(.cmake.conf)
-project(QtWebSockets
- VERSION "${QT_REPO_MODULE_VERSION}"
- DESCRIPTION "Qt WebSockets Libraries"
- HOMEPAGE_URL "https://qt.io/"
- LANGUAGES CXX C
-)
-
-find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL)
-find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL)
-
-if(NOT TARGET Qt::Network)
- message(NOTICE "Skipping the build as the condition \"TARGET Qt::Network\" is not met.")
- return()
-endif()
-qt_build_repo()
diff --git a/src/imports/qmlwebsockets/.prev_CMakeLists.txt b/src/imports/qmlwebsockets/.prev_CMakeLists.txt
deleted file mode 100644
index 94fd4af..0000000
--- a/src/imports/qmlwebsockets/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-# Generated from qmlwebsockets.pro.
-
-#####################################################################
-## qmlwebsockets Plugin:
-#####################################################################
-
-qt_internal_add_qml_module(qmlwebsockets
- URI "QtWebSockets"
- VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
- CLASSNAME QtWebSocketsDeclarativeModule
- SKIP_TYPE_REGISTRATION
- SOURCES
- qmlwebsockets_plugin.cpp qmlwebsockets_plugin.h
- qqmlwebsocket.cpp qqmlwebsocket.h
- qqmlwebsocketserver.cpp qqmlwebsocketserver.h
- PUBLIC_LIBRARIES
- Qt::CorePrivate
- Qt::QmlPrivate
- Qt::WebSockets
-)
-
-#### Keys ignored in scope 1:.:.:qmlwebsockets.pro:<TRUE>:
-# IMPORT_VERSION = "1.$$QT_MINOR_VERSION"
-# OTHER_FILES = "qmldir"
-# TARGETPATH = "QtWebSockets"
diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt
deleted file mode 100644
index 2214137..0000000
--- a/tests/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Generated from tests.pro.
-
-if(QT_BUILD_STANDALONE_TESTS)
- # Add qt_find_package calls for extra dependencies that need to be found when building
- # the standalone tests here.
-endif()
-qt_build_tests()
diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt
deleted file mode 100644
index 39b8e8d..0000000
--- a/tests/auto/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Generated from auto.pro.
-
-add_subdirectory(cmake)
-add_subdirectory(websockets)
-if(TARGET Qt::Quick)
- add_subdirectory(qml)
-endif()