summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Köhne <kai.koehne@qt.io>2022-03-21 18:49:25 +0100
committerKai Köhne <kai.koehne@qt.io>2022-03-22 15:32:11 +0100
commit452840eb3566c14200986af32745ab587c6471c6 (patch)
tree5b0516a5de6275b9e6462b0232e3f18475318196
parentf362bc317f1281e393238a048cf2b20d7103be29 (diff)
downloadqtwebchannel-452840eb3566c14200986af32745ab587c6471c6.tar.gz
Remove .prev_CMakeLists.txt
Pick-to: 6.3 Change-Id: I78d6a6b2d245743f1cce18955ed3fc05a054f9fa Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--.prev_CMakeLists.txt20
-rw-r--r--examples/webchannel/standalone/.prev_CMakeLists.txt52
-rw-r--r--src/imports/webchannel/.prev_CMakeLists.txt24
-rw-r--r--tests/.prev_CMakeLists.txt7
-rw-r--r--tests/auto/.prev_CMakeLists.txt7
-rw-r--r--tests/auto/qml/.prev_CMakeLists.txt34
-rw-r--r--tests/auto/webchannel/.prev_CMakeLists.txt25
7 files changed, 0 insertions, 169 deletions
diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt
deleted file mode 100644
index 7197c4c..0000000
--- a/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated from qtwebchannel.pro.
-
-cmake_minimum_required(VERSION 3.16)
-
-include(.cmake.conf)
-project(QtWebChannel
- VERSION "${QT_REPO_MODULE_VERSION}"
- DESCRIPTION "Qt WebChannel 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(INTEGRITY)
- message(NOTICE "Skipping the build as the condition \"NOT INTEGRITY\" is not met.")
- return()
-endif()
-qt_build_repo()
diff --git a/examples/webchannel/standalone/.prev_CMakeLists.txt b/examples/webchannel/standalone/.prev_CMakeLists.txt
deleted file mode 100644
index 5ee4b27..0000000
--- a/examples/webchannel/standalone/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-# Generated from standalone.pro.
-
-cmake_minimum_required(VERSION 3.14)
-project(standalone LANGUAGES CXX)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
-
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
- set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webchannel/standalone")
-
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS WebChannel)
-find_package(Qt6 COMPONENTS Widgets)
-find_package(Qt6 COMPONENTS WebSockets)
-
-qt_add_executable(standalone
- ../shared/websocketclientwrapper.cpp ../shared/websocketclientwrapper.h
- ../shared/websockettransport.cpp ../shared/websockettransport.h
- core.h
- dialog.cpp dialog.h dialog.ui
- main.cpp
-)
-set_target_properties(standalone PROPERTIES
- WIN32_EXECUTABLE TRUE
- MACOSX_BUNDLE TRUE
-)
-target_compile_definitions(standalone PUBLIC
- ${CMAKE_CURRENT_BINARY_DIR}"\\\"\""
- BUILD_DIR="\"
-)
-
-target_link_libraries(standalone PUBLIC
- Qt::Core
- Qt::Gui
- Qt::WebChannel
- Qt::WebSockets
- Qt::Widgets
-)
-
-install(TARGETS standalone
- RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
- BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
- LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
-)
diff --git a/src/imports/webchannel/.prev_CMakeLists.txt b/src/imports/webchannel/.prev_CMakeLists.txt
deleted file mode 100644
index d7d2440..0000000
--- a/src/imports/webchannel/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-# Generated from webchannel.pro.
-
-#####################################################################
-## webchannel Plugin:
-#####################################################################
-
-qt_internal_add_qml_module(webchannel
- URI "QtWebChannel"
- VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
- CLASSNAME QWebChannelPlugin
- SKIP_TYPE_REGISTRATION
- SOURCES
- plugin.cpp
- INCLUDE_DIRECTORIES
- ../../webchannel
- PUBLIC_LIBRARIES
- Qt::Core
- Qt::Quick
- Qt::WebChannelPrivate
-)
-
-#### Keys ignored in scope 1:.:.:webchannel.pro:<TRUE>:
-# IMPORT_VERSION = "1.$$QT_MINOR_VERSION"
-# TARGETPATH = "QtWebChannel"
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 1fcf495..0000000
--- a/tests/auto/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Generated from auto.pro.
-
-add_subdirectory(cmake)
-add_subdirectory(webchannel)
-if(TARGET Qt::Quick)
- add_subdirectory(qml)
-endif()
diff --git a/tests/auto/qml/.prev_CMakeLists.txt b/tests/auto/qml/.prev_CMakeLists.txt
deleted file mode 100644
index 18f78b3..0000000
--- a/tests/auto/qml/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-# Generated from qml.pro.
-
-#####################################################################
-## qml Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
- RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
- data/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(qml
- QMLTEST
- QML_IMPORTPATH
- "${CMAKE_CURRENT_BINARY_DIR}/../../../qml"
- "${CMAKE_CURRENT_SOURCE_DIR}"
- SOURCES
- qml.cpp
- testobject.cpp testobject.h
- testtransport.cpp testtransport.h
- testwebchannel.cpp testwebchannel.h
- PUBLIC_LIBRARIES
- Qt::CorePrivate
- Qt::Gui
- Qt::WebChannelPrivate
- TESTDATA ${test_data}
-)
-
-#### Keys ignored in scope 1:.:.:qml.pro:<TRUE>:
-# DISTFILES = "tst_webchannelseparation.qml"
-# IMPORTPATH = "$$OUT_PWD/../../../qml" "$$PWD"
-# OTHER_FILES = "Client.qml" "WebChannelTest.qml" "tst_webchannel.qml" "tst_metaobjectpublisher.qml" "tst_bench.qml" "tst_multiclient.qml"
-# TEMPLATE = "app"
diff --git a/tests/auto/webchannel/.prev_CMakeLists.txt b/tests/auto/webchannel/.prev_CMakeLists.txt
deleted file mode 100644
index fea5db4..0000000
--- a/tests/auto/webchannel/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-# Generated from webchannel.pro.
-
-#####################################################################
-## tst_webchannel Test:
-#####################################################################
-
-qt_internal_add_test(tst_webchannel
- SOURCES
- tst_webchannel.cpp tst_webchannel.h
- INCLUDE_DIRECTORIES
- ../../../src/webchannel
- PUBLIC_LIBRARIES
- Qt::CorePrivate
- Qt::WebChannelPrivate
-)
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_webchannel CONDITION TARGET Qt::Qml
- DEFINES
- WEBCHANNEL_TESTS_CAN_USE_JS_ENGINE
- PUBLIC_LIBRARIES
- Qt::Qml
-)