diff options
71 files changed, 142 insertions, 91 deletions
diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt index 8fb7705..45ecd24 100644 --- a/.prev_CMakeLists.txt +++ b/.prev_CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from qtremoteobjects.pro. -cmake_minimum_required(VERSION 3.15.0) +cmake_minimum_required(VERSION 3.16) include(.cmake.conf) project(QtRemoteObjects diff --git a/CMakeLists.txt b/CMakeLists.txt index 2684bf7..f69182d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from qtremoteobjects.pro. -cmake_minimum_required(VERSION 3.15.0) +cmake_minimum_required(VERSION 3.16) include(.cmake.conf) project(QtRemoteObjects @@ -12,7 +12,7 @@ project(QtRemoteObjects # special case begin find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Network) -find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Quick QuickTest) +find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Gui Widgets Quick QuickTest) # special case end if(NOT TARGET Qt::Network) diff --git a/examples/remoteobjects/clientapp/CMakeLists.txt b/examples/remoteobjects/clientapp/CMakeLists.txt index 3431885..d184774 100644 --- a/examples/remoteobjects/clientapp/CMakeLists.txt +++ b/examples/remoteobjects/clientapp/CMakeLists.txt @@ -20,9 +20,13 @@ find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS RemoteObjects) find_package(Qt6 COMPONENTS Quick) -add_qt_gui_executable(clientapp +qt_add_executable(clientapp main.cpp ) +set_target_properties(clientapp PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(clientapp PUBLIC Qt::Core Qt::Gui diff --git a/examples/remoteobjects/cppclient/CMakeLists.txt b/examples/remoteobjects/cppclient/CMakeLists.txt index f6dd299..d12fe7e 100644 --- a/examples/remoteobjects/cppclient/CMakeLists.txt +++ b/examples/remoteobjects/cppclient/CMakeLists.txt @@ -18,9 +18,13 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/cppclient") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS RemoteObjects) -add_executable(CppClient +qt_add_executable(CppClient main.cpp ) +set_target_properties(CppClient PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE FALSE +) target_link_libraries(CppClient PUBLIC Qt::Core Qt::RemoteObjects diff --git a/examples/remoteobjects/modelviewclient/CMakeLists.txt b/examples/remoteobjects/modelviewclient/CMakeLists.txt index cda7293..79b792a 100644 --- a/examples/remoteobjects/modelviewclient/CMakeLists.txt +++ b/examples/remoteobjects/modelviewclient/CMakeLists.txt @@ -20,9 +20,13 @@ find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Widgets) find_package(Qt6 COMPONENTS RemoteObjects) -add_executable(modelviewclient +qt_add_executable(modelviewclient main.cpp ) +set_target_properties(modelviewclient PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE FALSE +) target_link_libraries(modelviewclient PUBLIC Qt::Core Qt::Gui diff --git a/examples/remoteobjects/modelviewserver/CMakeLists.txt b/examples/remoteobjects/modelviewserver/CMakeLists.txt index 6471a35..b8402eb 100644 --- a/examples/remoteobjects/modelviewserver/CMakeLists.txt +++ b/examples/remoteobjects/modelviewserver/CMakeLists.txt @@ -20,9 +20,13 @@ find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Widgets) find_package(Qt6 COMPONENTS RemoteObjects) -add_qt_gui_executable(modelviewserver +qt_add_executable(modelviewserver main.cpp ) +set_target_properties(modelviewserver PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(modelviewserver PUBLIC Qt::Core Qt::Gui diff --git a/examples/remoteobjects/plugins/CMakeLists.txt b/examples/remoteobjects/plugins/CMakeLists.txt index ff0c5f4..ee689d2 100644 --- a/examples/remoteobjects/plugins/CMakeLists.txt +++ b/examples/remoteobjects/plugins/CMakeLists.txt @@ -30,6 +30,10 @@ qt6_add_qml_module(qmlqtimeexampleplugin target_sources(qmlqtimeexampleplugin PRIVATE plugin.cpp ) +set_target_properties(qmlqtimeexampleplugin PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(qmlqtimeexampleplugin PUBLIC Qt::Core Qt::Gui diff --git a/examples/remoteobjects/qmlmodelviewclient/CMakeLists.txt b/examples/remoteobjects/qmlmodelviewclient/CMakeLists.txt index c03320a..584f3e5 100644 --- a/examples/remoteobjects/qmlmodelviewclient/CMakeLists.txt +++ b/examples/remoteobjects/qmlmodelviewclient/CMakeLists.txt @@ -21,9 +21,13 @@ find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Quick) find_package(Qt6 COMPONENTS RemoteObjects) -add_qt_gui_executable(qmlmodelviewclient +qt_add_executable(qmlmodelviewclient main.cpp ) +set_target_properties(qmlmodelviewclient PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(qmlmodelviewclient PUBLIC Qt::Core Qt::Gui diff --git a/examples/remoteobjects/server/CMakeLists.txt b/examples/remoteobjects/server/CMakeLists.txt index 53506c7..dad4381 100644 --- a/examples/remoteobjects/server/CMakeLists.txt +++ b/examples/remoteobjects/server/CMakeLists.txt @@ -18,10 +18,14 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/server") find_package(Qt6 COMPONENTS RemoteObjects) find_package(Qt6 COMPONENTS Core) -add_executable(server +qt_add_executable(server main.cpp timemodel.cpp timemodel.h ) +set_target_properties(server PROPERTIES + WIN32_EXECUTABLE FALSE + MACOSX_BUNDLE TRUE +) target_link_libraries(server PUBLIC Qt::Core Qt::RemoteObjects diff --git a/examples/remoteobjects/simpleswitch/directconnectclient/CMakeLists.txt b/examples/remoteobjects/simpleswitch/directconnectclient/CMakeLists.txt index bbdedd9..d99d5fc 100644 --- a/examples/remoteobjects/simpleswitch/directconnectclient/CMakeLists.txt +++ b/examples/remoteobjects/simpleswitch/directconnectclient/CMakeLists.txt @@ -18,10 +18,14 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/simpleswitch/direct find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS RemoteObjects) -add_executable(directconnectclient +qt_add_executable(directconnectclient client.cpp client.h main.cpp ) +set_target_properties(directconnectclient PROPERTIES + WIN32_EXECUTABLE FALSE + MACOSX_BUNDLE FALSE +) target_link_libraries(directconnectclient PUBLIC Qt::Core Qt::RemoteObjects diff --git a/examples/remoteobjects/simpleswitch/directconnectdynamicclient/CMakeLists.txt b/examples/remoteobjects/simpleswitch/directconnectdynamicclient/CMakeLists.txt index 8818c42..d13d06b 100644 --- a/examples/remoteobjects/simpleswitch/directconnectdynamicclient/CMakeLists.txt +++ b/examples/remoteobjects/simpleswitch/directconnectdynamicclient/CMakeLists.txt @@ -18,10 +18,14 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/simpleswitch/direct find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS RemoteObjects) -add_executable(directconnectdynamicclient +qt_add_executable(directconnectdynamicclient dynamicclient.cpp dynamicclient.h main.cpp ) +set_target_properties(directconnectdynamicclient PROPERTIES + WIN32_EXECUTABLE FALSE + MACOSX_BUNDLE FALSE +) target_link_libraries(directconnectdynamicclient PUBLIC Qt::Core Qt::RemoteObjects diff --git a/examples/remoteobjects/simpleswitch/directconnectserver/CMakeLists.txt b/examples/remoteobjects/simpleswitch/directconnectserver/CMakeLists.txt index 63aa555..f64b03c 100644 --- a/examples/remoteobjects/simpleswitch/directconnectserver/CMakeLists.txt +++ b/examples/remoteobjects/simpleswitch/directconnectserver/CMakeLists.txt @@ -18,10 +18,14 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/simpleswitch/direct find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS RemoteObjects) -add_executable(directconnectserver +qt_add_executable(directconnectserver main.cpp simpleswitch.cpp simpleswitch.h ) +set_target_properties(directconnectserver PROPERTIES + WIN32_EXECUTABLE FALSE + MACOSX_BUNDLE FALSE +) target_link_libraries(directconnectserver PUBLIC Qt::Core Qt::RemoteObjects diff --git a/examples/remoteobjects/simpleswitch/registryconnectedclient/CMakeLists.txt b/examples/remoteobjects/simpleswitch/registryconnectedclient/CMakeLists.txt index 258c569..7a70caf 100644 --- a/examples/remoteobjects/simpleswitch/registryconnectedclient/CMakeLists.txt +++ b/examples/remoteobjects/simpleswitch/registryconnectedclient/CMakeLists.txt @@ -18,10 +18,14 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/simpleswitch/regist find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS RemoteObjects) -add_executable(registryconnectedclient +qt_add_executable(registryconnectedclient dynamicclient.cpp dynamicclient.h main.cpp ) +set_target_properties(registryconnectedclient PROPERTIES + WIN32_EXECUTABLE FALSE + MACOSX_BUNDLE FALSE +) target_link_libraries(registryconnectedclient PUBLIC Qt::Core Qt::RemoteObjects diff --git a/examples/remoteobjects/simpleswitch/registryconnectedserver/CMakeLists.txt b/examples/remoteobjects/simpleswitch/registryconnectedserver/CMakeLists.txt index 74747da..0746cd6 100644 --- a/examples/remoteobjects/simpleswitch/registryconnectedserver/CMakeLists.txt +++ b/examples/remoteobjects/simpleswitch/registryconnectedserver/CMakeLists.txt @@ -18,10 +18,14 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/simpleswitch/regist find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS RemoteObjects) -add_executable(registryconnectedserver +qt_add_executable(registryconnectedserver main.cpp simpleswitch.cpp simpleswitch.h ) +set_target_properties(registryconnectedserver PROPERTIES + WIN32_EXECUTABLE FALSE + MACOSX_BUNDLE FALSE +) target_link_libraries(registryconnectedserver PUBLIC Qt::Core Qt::RemoteObjects diff --git a/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt b/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt index d6fbe8e..c634398 100644 --- a/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt +++ b/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt @@ -18,9 +18,13 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/ssl/sslcppclient") find_package(Qt6 COMPONENTS RemoteObjects) find_package(Qt6 COMPONENTS Core) -add_executable(SslCppClient +qt_add_executable(SslCppClient main.cpp ) +set_target_properties(SslCppClient PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE FALSE +) target_link_libraries(SslCppClient PUBLIC # Remove: gui Qt::Core diff --git a/examples/remoteobjects/ssl/sslserver/CMakeLists.txt b/examples/remoteobjects/ssl/sslserver/CMakeLists.txt index 117bf5a..3ba15d9 100644 --- a/examples/remoteobjects/ssl/sslserver/CMakeLists.txt +++ b/examples/remoteobjects/ssl/sslserver/CMakeLists.txt @@ -18,11 +18,15 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/ssl/sslserver") find_package(Qt6 COMPONENTS RemoteObjects) find_package(Qt6 COMPONENTS Core) -add_executable(sslserver +qt_add_executable(sslserver main.cpp sslserver.cpp sslserver.h timemodel.cpp timemodel.h ) +set_target_properties(sslserver PROPERTIES + WIN32_EXECUTABLE FALSE + MACOSX_BUNDLE TRUE +) target_link_libraries(sslserver PUBLIC Qt::Core Qt::RemoteObjects diff --git a/examples/remoteobjects/websockets/wsclient/CMakeLists.txt b/examples/remoteobjects/websockets/wsclient/CMakeLists.txt index d733be6..52287d0 100644 --- a/examples/remoteobjects/websockets/wsclient/CMakeLists.txt +++ b/examples/remoteobjects/websockets/wsclient/CMakeLists.txt @@ -21,10 +21,14 @@ find_package(Qt6 COMPONENTS Widgets) find_package(Qt6 COMPONENTS RemoteObjects) find_package(Qt6 COMPONENTS WebSockets) -add_executable(wsclient +qt_add_executable(wsclient ../common/websocketiodevice.cpp ../common/websocketiodevice.h main.cpp ) +set_target_properties(wsclient PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE FALSE +) target_include_directories(wsclient PUBLIC ../common ) diff --git a/examples/remoteobjects/websockets/wsserver/CMakeLists.txt b/examples/remoteobjects/websockets/wsserver/CMakeLists.txt index d1fe00d..b896388 100644 --- a/examples/remoteobjects/websockets/wsserver/CMakeLists.txt +++ b/examples/remoteobjects/websockets/wsserver/CMakeLists.txt @@ -21,10 +21,14 @@ find_package(Qt6 COMPONENTS Widgets) find_package(Qt6 COMPONENTS RemoteObjects) find_package(Qt6 COMPONENTS WebSockets) -add_executable(wsserver +qt_add_executable(wsserver ../common/websocketiodevice.cpp ../common/websocketiodevice.h main.cpp ) +set_target_properties(wsserver PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE FALSE +) target_include_directories(wsserver PUBLIC ../common ) diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt index 6fd7dae..606e312 100644 --- a/tests/auto/.prev_CMakeLists.txt +++ b/tests/auto/.prev_CMakeLists.txt @@ -6,6 +6,7 @@ add_subdirectory(modelreplica) add_subdirectory(modelview) add_subdirectory(pods) add_subdirectory(proxy) +add_subdirectory(rep_from_header) add_subdirectory(repc) add_subdirectory(repcodegenerator) add_subdirectory(repparser) diff --git a/tests/auto/benchmarks/CMakeLists.txt b/tests/auto/benchmarks/CMakeLists.txt index 901a80d..8acf3f0 100644 --- a/tests/auto/benchmarks/CMakeLists.txt +++ b/tests/auto/benchmarks/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_benchmarkstest Test: ##################################################################### -qt_add_test(tst_benchmarkstest +qt_internal_add_test(tst_benchmarkstest SOURCES tst_benchmarkstest.cpp DEFINES diff --git a/tests/auto/external_IODevice/sslTestServer/CMakeLists.txt b/tests/auto/external_IODevice/sslTestServer/CMakeLists.txt index 4321a07..91bd2f6 100644 --- a/tests/auto/external_IODevice/sslTestServer/CMakeLists.txt +++ b/tests/auto/external_IODevice/sslTestServer/CMakeLists.txt @@ -4,7 +4,7 @@ ## sslTestServer Binary: ##################################################################### -qt_add_executable(sslTestServer +qt_internal_add_executable(sslTestServer OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp @@ -49,7 +49,7 @@ set(cert_resource_files "server.key" ) -qt_add_resource(sslTestServer "cert" +qt_internal_add_resource(sslTestServer "cert" PREFIX "/sslcert" BASE diff --git a/tests/auto/external_IODevice/tst_client/CMakeLists.txt b/tests/auto/external_IODevice/tst_client/CMakeLists.txt index bfd150b..ff339e3 100644 --- a/tests/auto/external_IODevice/tst_client/CMakeLists.txt +++ b/tests/auto/external_IODevice/tst_client/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_external_IODevice Test: ##################################################################### -qt_add_test(tst_external_IODevice +qt_internal_add_test(tst_external_IODevice OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES tst_client.cpp @@ -44,7 +44,7 @@ set(cert_resource_files "server.key" ) -qt_add_resource(tst_external_IODevice "cert" +qt_internal_add_resource(tst_external_IODevice "cert" PREFIX "/sslcert" BASE diff --git a/tests/auto/integration/.prev_CMakeLists.txt b/tests/auto/integration/.prev_CMakeLists.txt index 8e32209..353a36f 100644 --- a/tests/auto/integration/.prev_CMakeLists.txt +++ b/tests/auto/integration/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_integration Test: ##################################################################### -qt_add_test(tst_integration +qt_internal_add_test(tst_integration SOURCES engine.cpp engine.h speedometer.cpp speedometer.h diff --git a/tests/auto/integration/CMakeLists.txt b/tests/auto/integration/CMakeLists.txt index ff96745..f273141 100644 --- a/tests/auto/integration/CMakeLists.txt +++ b/tests/auto/integration/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_integration Test: ##################################################################### -qt_add_test(tst_integration +qt_internal_add_test(tst_integration SOURCES engine.cpp engine.h speedometer.cpp speedometer.h diff --git a/tests/auto/integration_external/client/CMakeLists.txt b/tests/auto/integration_external/client/CMakeLists.txt index 551acb9..f3e1959 100644 --- a/tests/auto/integration_external/client/CMakeLists.txt +++ b/tests/auto/integration_external/client/CMakeLists.txt @@ -4,7 +4,7 @@ ## integration_external_client Binary: ##################################################################### -qt_add_executable(integration_external_client +qt_internal_add_executable(integration_external_client OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/integration_external/external/CMakeLists.txt b/tests/auto/integration_external/external/CMakeLists.txt index c29e37e..c3986e0 100644 --- a/tests/auto/integration_external/external/CMakeLists.txt +++ b/tests/auto/integration_external/external/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_integration_external Test: ##################################################################### -qt_add_test(tst_integration_external +qt_internal_add_test(tst_integration_external OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES tst_integration_external.cpp diff --git a/tests/auto/integration_external/server/CMakeLists.txt b/tests/auto/integration_external/server/CMakeLists.txt index c7f0025..51e3dab 100644 --- a/tests/auto/integration_external/server/CMakeLists.txt +++ b/tests/auto/integration_external/server/CMakeLists.txt @@ -4,7 +4,7 @@ ## integration_external_server Binary: ##################################################################### -qt_add_executable(integration_external_server +qt_internal_add_executable(integration_external_server OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/integration_multiprocess/client/CMakeLists.txt b/tests/auto/integration_multiprocess/client/CMakeLists.txt index c85e351..c09acb0 100644 --- a/tests/auto/integration_multiprocess/client/CMakeLists.txt +++ b/tests/auto/integration_multiprocess/client/CMakeLists.txt @@ -4,7 +4,7 @@ ## integration_multiprocess_client Binary: ##################################################################### -qt_add_executable(integration_multiprocess_client +qt_internal_add_executable(integration_multiprocess_client OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/integration_multiprocess/server/CMakeLists.txt b/tests/auto/integration_multiprocess/server/CMakeLists.txt index 5981c8b..59a33e6 100644 --- a/tests/auto/integration_multiprocess/server/CMakeLists.txt +++ b/tests/auto/integration_multiprocess/server/CMakeLists.txt @@ -4,7 +4,7 @@ ## integration_multiprocess_server Binary: ##################################################################### -qt_add_executable(integration_multiprocess_server +qt_internal_add_executable(integration_multiprocess_server OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/integration_multiprocess/tst/CMakeLists.txt b/tests/auto/integration_multiprocess/tst/CMakeLists.txt index 236b1ef..3216dd2 100644 --- a/tests/auto/integration_multiprocess/tst/CMakeLists.txt +++ b/tests/auto/integration_multiprocess/tst/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_integration_multiprocess Test: ##################################################################### -qt_add_test(tst_integration_multiprocess +qt_internal_add_test(tst_integration_multiprocess OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES tst_integration_multiprocess.cpp diff --git a/tests/auto/localsockettestserver/.prev_CMakeLists.txt b/tests/auto/localsockettestserver/.prev_CMakeLists.txt index 8486704..d634b8f 100644 --- a/tests/auto/localsockettestserver/.prev_CMakeLists.txt +++ b/tests/auto/localsockettestserver/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## localsockettestserver Binary: ##################################################################### -qt_add_executable(localsockettestserver +qt_internal_add_executable(localsockettestserver SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/localsockettestserver/CMakeLists.txt b/tests/auto/localsockettestserver/CMakeLists.txt index ad43434..7530318 100644 --- a/tests/auto/localsockettestserver/CMakeLists.txt +++ b/tests/auto/localsockettestserver/CMakeLists.txt @@ -4,7 +4,7 @@ ## localsockettestserver Binary: ##################################################################### -qt_add_executable(localsockettestserver +qt_internal_add_executable(localsockettestserver SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/modelreplica/CMakeLists.txt b/tests/auto/modelreplica/CMakeLists.txt index 610aa9b..9787e6b 100644 --- a/tests/auto/modelreplica/CMakeLists.txt +++ b/tests/auto/modelreplica/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_modelreplicatest Test: ##################################################################### -qt_add_test(tst_modelreplicatest +qt_internal_add_test(tst_modelreplicatest SOURCES tst_modelreplicatest.cpp DEFINES diff --git a/tests/auto/modelview/CMakeLists.txt b/tests/auto/modelview/CMakeLists.txt index 39b03a5..9b42767 100644 --- a/tests/auto/modelview/CMakeLists.txt +++ b/tests/auto/modelview/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_modelview Test: ##################################################################### -qt_add_test(tst_modelview +qt_internal_add_test(tst_modelview SOURCES modeltest.cpp modeltest.h tst_modelview.cpp @@ -16,12 +16,12 @@ qt_add_test(tst_modelview ## Scopes: ##################################################################### -qt_extend_target(tst_modelview CONDITION boot2qt +qt_internal_extend_target(tst_modelview CONDITION boot2qt DEFINES SLOW_MODELTEST ) -qt_extend_target(tst_modelview CONDITION MINGW +qt_internal_extend_target(tst_modelview CONDITION MINGW DEFINES SLOW_MODELTEST ) diff --git a/tests/auto/pods/CMakeLists.txt b/tests/auto/pods/CMakeLists.txt index 9c8fe32..35699ab 100644 --- a/tests/auto/pods/CMakeLists.txt +++ b/tests/auto/pods/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_pods Test: ##################################################################### -qt_add_test(tst_pods +qt_internal_add_test(tst_pods SOURCES tst_pods.cpp PUBLIC_LIBRARIES @@ -14,8 +14,5 @@ qt6_add_repc_replica(tst_pods pods.h ) -#### Keys ignored in scope 1:.:.:pods.pro:<TRUE>: -# QOBJECT_REP = "$$REP_FILES" - ## Scopes: ##################################################################### diff --git a/tests/auto/proxy/CMakeLists.txt b/tests/auto/proxy/CMakeLists.txt index 222f097..45eb7c4 100644 --- a/tests/auto/proxy/CMakeLists.txt +++ b/tests/auto/proxy/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_proxy Test: ##################################################################### -qt_add_test(tst_proxy +qt_internal_add_test(tst_proxy SOURCES tst_proxy.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/proxy_multiprocess/client/CMakeLists.txt b/tests/auto/proxy_multiprocess/client/CMakeLists.txt index e2f235d..b937778 100644 --- a/tests/auto/proxy_multiprocess/client/CMakeLists.txt +++ b/tests/auto/proxy_multiprocess/client/CMakeLists.txt @@ -4,7 +4,7 @@ ## proxy_multiprocess_client Binary: ##################################################################### -qt_add_executable(proxy_multiprocess_client +qt_internal_add_executable(proxy_multiprocess_client OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../namespace.h diff --git a/tests/auto/proxy_multiprocess/proxy/CMakeLists.txt b/tests/auto/proxy_multiprocess/proxy/CMakeLists.txt index 2b0a514..6ed74e1 100644 --- a/tests/auto/proxy_multiprocess/proxy/CMakeLists.txt +++ b/tests/auto/proxy_multiprocess/proxy/CMakeLists.txt @@ -4,7 +4,7 @@ ## proxy Binary: ##################################################################### -qt_add_executable(proxy +qt_internal_add_executable(proxy OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/proxy_multiprocess/server/.prev_CMakeLists.txt b/tests/auto/proxy_multiprocess/server/.prev_CMakeLists.txt index 8f9426b..e360429 100644 --- a/tests/auto/proxy_multiprocess/server/.prev_CMakeLists.txt +++ b/tests/auto/proxy_multiprocess/server/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## proxy_multiprocess_server Binary: ##################################################################### -add_qt_executable(proxy_multiprocess_server +qt_internal_add_executable(proxy_multiprocess_server OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ${CMAKE_CURRENT_BINARY_DIR}/rep_subclass_source.h diff --git a/tests/auto/proxy_multiprocess/server/CMakeLists.txt b/tests/auto/proxy_multiprocess/server/CMakeLists.txt index 6ddc010..e360429 100644 --- a/tests/auto/proxy_multiprocess/server/CMakeLists.txt +++ b/tests/auto/proxy_multiprocess/server/CMakeLists.txt @@ -4,7 +4,7 @@ ## proxy_multiprocess_server Binary: ##################################################################### -qt_add_executable(proxy_multiprocess_server +qt_internal_add_executable(proxy_multiprocess_server OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ${CMAKE_CURRENT_BINARY_DIR}/rep_subclass_source.h diff --git a/tests/auto/proxy_multiprocess/tst/CMakeLists.txt b/tests/auto/proxy_multiprocess/tst/CMakeLists.txt index d3dcdfb..c46101d 100644 --- a/tests/auto/proxy_multiprocess/tst/CMakeLists.txt +++ b/tests/auto/proxy_multiprocess/tst/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_proxy_multiprocess Test: ##################################################################### -qt_add_test(tst_proxy_multiprocess +qt_internal_add_test(tst_proxy_multiprocess OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES tst_proxy_multiprocess.cpp diff --git a/tests/auto/qml/integration/CMakeLists.txt b/tests/auto/qml/integration/CMakeLists.txt index b5d15ec..4e3787b 100644 --- a/tests/auto/qml/integration/CMakeLists.txt +++ b/tests/auto/qml/integration/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qmlintegration +qt_internal_add_test(tst_qmlintegration GUI QMLTEST SOURCES diff --git a/tests/auto/qml/usertypes/CMakeLists.txt b/tests/auto/qml/usertypes/CMakeLists.txt index 3345deb..ec21e4d 100644 --- a/tests/auto/qml/usertypes/CMakeLists.txt +++ b/tests/auto/qml/usertypes/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_usertypes Test: ##################################################################### -qt_add_test(tst_usertypes +qt_internal_add_test(tst_usertypes SOURCES tst_usertypes.cpp DEFINES diff --git a/tests/auto/rep_from_header/CMakeLists.txt b/tests/auto/rep_from_header/CMakeLists.txt index 92b3cf8..2f4ef7b 100644 --- a/tests/auto/rep_from_header/CMakeLists.txt +++ b/tests/auto/rep_from_header/CMakeLists.txt @@ -1,10 +1,10 @@ -# Generated from pods.pro. +# Generated from rep_from_header.pro. ##################################################################### -## tst_pods Test: +## tst_rep_from_header Test: ##################################################################### -qt_add_test(tst_rep_from_header +qt_internal_add_test(tst_rep_from_header SOURCES tst_rep_from_header.cpp PUBLIC_LIBRARIES @@ -12,8 +12,5 @@ qt_add_test(tst_rep_from_header ) qt6_rep_from_header(tst_rep_from_header pods.h) -#### Keys ignored in scope 1:.:.:pods.pro:<TRUE>: +#### Keys ignored in scope 1:.:.:rep_from_header.pro:<TRUE>: # QOBJECT_REP = "$$REP_FILES" - -## Scopes: -##################################################################### diff --git a/tests/auto/repc/enums/CMakeLists.txt b/tests/auto/repc/enums/CMakeLists.txt index decd889..1b5677d 100644 --- a/tests/auto/repc/enums/CMakeLists.txt +++ b/tests/auto/repc/enums/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_enums Test: ##################################################################### -qt_add_test(tst_enums +qt_internal_add_test(tst_enums SOURCES tst_enums.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/repc/pods/CMakeLists.txt b/tests/auto/repc/pods/CMakeLists.txt index 8965c6f..4153c80 100644 --- a/tests/auto/repc/pods/CMakeLists.txt +++ b/tests/auto/repc/pods/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_repc_pods Test: ##################################################################### -qt_add_test(tst_repc_pods +qt_internal_add_test(tst_repc_pods SOURCES tst_pods.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/repc/signature/differentClassEnum/CMakeLists.txt b/tests/auto/repc/signature/differentClassEnum/CMakeLists.txt index 58904f4..d85d5e2 100644 --- a/tests/auto/repc/signature/differentClassEnum/CMakeLists.txt +++ b/tests/auto/repc/signature/differentClassEnum/CMakeLists.txt @@ -4,7 +4,7 @@ ## differentClassEnum Binary: ##################################################################### -qt_add_executable(differentClassEnum +qt_internal_add_executable(differentClassEnum OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../mismatch.cpp diff --git a/tests/auto/repc/signature/differentGlobalEnum/CMakeLists.txt b/tests/auto/repc/signature/differentGlobalEnum/CMakeLists.txt index e1c05df..ac31193 100644 --- a/tests/auto/repc/signature/differentGlobalEnum/CMakeLists.txt +++ b/tests/auto/repc/signature/differentGlobalEnum/CMakeLists.txt @@ -4,7 +4,7 @@ ## differentGlobalEnum Binary: ##################################################################### -qt_add_executable(differentGlobalEnum +qt_internal_add_executable(differentGlobalEnum OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../mismatch.cpp diff --git a/tests/auto/repc/signature/differentPropertyCount/CMakeLists.txt b/tests/auto/repc/signature/differentPropertyCount/CMakeLists.txt index 5808928..0bf8ca7 100644 --- a/tests/auto/repc/signature/differentPropertyCount/CMakeLists.txt +++ b/tests/auto/repc/signature/differentPropertyCount/CMakeLists.txt @@ -4,7 +4,7 @@ ## differentPropertyCount Binary: ##################################################################### -qt_add_executable(differentPropertyCount +qt_internal_add_executable(differentPropertyCount OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../mismatch.cpp diff --git a/tests/auto/repc/signature/differentPropertyType/CMakeLists.txt b/tests/auto/repc/signature/differentPropertyType/CMakeLists.txt index a289c1a..5d82bb0 100644 --- a/tests/auto/repc/signature/differentPropertyType/CMakeLists.txt +++ b/tests/auto/repc/signature/differentPropertyType/CMakeLists.txt @@ -4,7 +4,7 @@ ## differentPropertyType Binary: ##################################################################### -qt_add_executable(differentPropertyType +qt_internal_add_executable(differentPropertyType OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../mismatch.cpp diff --git a/tests/auto/repc/signature/differentSignalCount/CMakeLists.txt b/tests/auto/repc/signature/differentSignalCount/CMakeLists.txt index c655189..5ac2aa9 100644 --- a/tests/auto/repc/signature/differentSignalCount/CMakeLists.txt +++ b/tests/auto/repc/signature/differentSignalCount/CMakeLists.txt @@ -4,7 +4,7 @@ ## differentSignalCount Binary: ##################################################################### -qt_add_executable(differentSignalCount +qt_internal_add_executable(differentSignalCount OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../mismatch.cpp diff --git a/tests/auto/repc/signature/differentSignalParamCount/CMakeLists.txt b/tests/auto/repc/signature/differentSignalParamCount/CMakeLists.txt index 035b58e..c2a17bc 100644 --- a/tests/auto/repc/signature/differentSignalParamCount/CMakeLists.txt +++ b/tests/auto/repc/signature/differentSignalParamCount/CMakeLists.txt @@ -4,7 +4,7 @@ ## differentSignalParamCount Binary: ##################################################################### -qt_add_executable(differentSignalParamCount +qt_internal_add_executable(differentSignalParamCount OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../mismatch.cpp diff --git a/tests/auto/repc/signature/differentSignalParamType/CMakeLists.txt b/tests/auto/repc/signature/differentSignalParamType/CMakeLists.txt index 9f3e84d..d23fd08 100644 --- a/tests/auto/repc/signature/differentSignalParamType/CMakeLists.txt +++ b/tests/auto/repc/signature/differentSignalParamType/CMakeLists.txt @@ -4,7 +4,7 @@ ## differentSignalParamType Binary: ##################################################################### -qt_add_executable(differentSignalParamType +qt_internal_add_executable(differentSignalParamType OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../mismatch.cpp diff --git a/tests/auto/repc/signature/differentSlotCount/CMakeLists.txt b/tests/auto/repc/signature/differentSlotCount/CMakeLists.txt index f7e483a..9d7f1a8 100644 --- a/tests/auto/repc/signature/differentSlotCount/CMakeLists.txt +++ b/tests/auto/repc/signature/differentSlotCount/CMakeLists.txt @@ -4,7 +4,7 @@ ## differentSlotCount Binary: ##################################################################### -qt_add_executable(differentSlotCount +qt_internal_add_executable(differentSlotCount OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../mismatch.cpp diff --git a/tests/auto/repc/signature/differentSlotParamCount/CMakeLists.txt b/tests/auto/repc/signature/differentSlotParamCount/CMakeLists.txt index 6b8d8d7..7084b20 100644 --- a/tests/auto/repc/signature/differentSlotParamCount/CMakeLists.txt +++ b/tests/auto/repc/signature/differentSlotParamCount/CMakeLists.txt @@ -4,7 +4,7 @@ ## differentSlotParamCount Binary: ##################################################################### -qt_add_executable(differentSlotParamCount +qt_internal_add_executable(differentSlotParamCount OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../mismatch.cpp diff --git a/tests/auto/repc/signature/differentSlotParamType/CMakeLists.txt b/tests/auto/repc/signature/differentSlotParamType/CMakeLists.txt index e7be5ce..01d3c0a 100644 --- a/tests/auto/repc/signature/differentSlotParamType/CMakeLists.txt +++ b/tests/auto/repc/signature/differentSlotParamType/CMakeLists.txt @@ -4,7 +4,7 @@ ## differentSlotParamType Binary: ##################################################################### -qt_add_executable(differentSlotParamType +qt_internal_add_executable(differentSlotParamType OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../mismatch.cpp diff --git a/tests/auto/repc/signature/differentSlotType/CMakeLists.txt b/tests/auto/repc/signature/differentSlotType/CMakeLists.txt index efc2730..6606183 100644 --- a/tests/auto/repc/signature/differentSlotType/CMakeLists.txt +++ b/tests/auto/repc/signature/differentSlotType/CMakeLists.txt @@ -4,7 +4,7 @@ ## differentSlotType Binary: ##################################################################### -qt_add_executable(differentSlotType +qt_internal_add_executable(differentSlotType OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../mismatch.cpp diff --git a/tests/auto/repc/signature/matchAndQuit/CMakeLists.txt b/tests/auto/repc/signature/matchAndQuit/CMakeLists.txt index 65147ac..f8f31d3 100644 --- a/tests/auto/repc/signature/matchAndQuit/CMakeLists.txt +++ b/tests/auto/repc/signature/matchAndQuit/CMakeLists.txt @@ -4,7 +4,7 @@ ## matchAndQuit Binary: ##################################################################### -qt_add_executable(matchAndQuit +qt_internal_add_executable(matchAndQuit OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/repc/signature/scrambledProperties/CMakeLists.txt b/tests/auto/repc/signature/scrambledProperties/CMakeLists.txt index cfc295e..14669d9 100644 --- a/tests/auto/repc/signature/scrambledProperties/CMakeLists.txt +++ b/tests/auto/repc/signature/scrambledProperties/CMakeLists.txt @@ -4,7 +4,7 @@ ## scrambledProperties Binary: ##################################################################### -qt_add_executable(scrambledProperties +qt_internal_add_executable(scrambledProperties OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../mismatch.cpp diff --git a/tests/auto/repc/signature/scrambledSignals/CMakeLists.txt b/tests/auto/repc/signature/scrambledSignals/CMakeLists.txt index 60c00bc..08ad04e 100644 --- a/tests/auto/repc/signature/scrambledSignals/CMakeLists.txt +++ b/tests/auto/repc/signature/scrambledSignals/CMakeLists.txt @@ -4,7 +4,7 @@ ## scrambledSignals Binary: ##################################################################### -qt_add_executable(scrambledSignals +qt_internal_add_executable(scrambledSignals OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../mismatch.cpp diff --git a/tests/auto/repc/signature/scrambledSlots/CMakeLists.txt b/tests/auto/repc/signature/scrambledSlots/CMakeLists.txt index ee1d828..2388379 100644 --- a/tests/auto/repc/signature/scrambledSlots/CMakeLists.txt +++ b/tests/auto/repc/signature/scrambledSlots/CMakeLists.txt @@ -4,7 +4,7 @@ ## scrambledSlots Binary: ##################################################################### -qt_add_executable(scrambledSlots +qt_internal_add_executable(scrambledSlots OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../mismatch.cpp diff --git a/tests/auto/repc/signature/signatureServer/CMakeLists.txt b/tests/auto/repc/signature/signatureServer/CMakeLists.txt index 21af3e1..45bdebb 100644 --- a/tests/auto/repc/signature/signatureServer/CMakeLists.txt +++ b/tests/auto/repc/signature/signatureServer/CMakeLists.txt @@ -4,7 +4,7 @@ ## signatureServer Binary: ##################################################################### -qt_add_executable(signatureServer +qt_internal_add_executable(signatureServer OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ${CMAKE_CURRENT_BINARY_DIR}/rep_server_source.h diff --git a/tests/auto/repc/signature/signatureTests/CMakeLists.txt b/tests/auto/repc/signature/signatureTests/CMakeLists.txt index 5de8420..83b0436 100644 --- a/tests/auto/repc/signature/signatureTests/CMakeLists.txt +++ b/tests/auto/repc/signature/signatureTests/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_signature Test: ##################################################################### -qt_add_test(tst_signature +qt_internal_add_test(tst_signature OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES tst_signature.cpp diff --git a/tests/auto/repc/signature/state/CMakeLists.txt b/tests/auto/repc/signature/state/CMakeLists.txt index 71409c8..725bb85 100644 --- a/tests/auto/repc/signature/state/CMakeLists.txt +++ b/tests/auto/repc/signature/state/CMakeLists.txt @@ -4,7 +4,7 @@ ## state Binary: ##################################################################### -qt_add_executable(state +qt_internal_add_executable(state OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/repcodegenerator/CMakeLists.txt b/tests/auto/repcodegenerator/CMakeLists.txt index aa98b47..dccd8ef 100644 --- a/tests/auto/repcodegenerator/CMakeLists.txt +++ b/tests/auto/repcodegenerator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_repcodegenerator Test: ##################################################################### -qt_add_test(tst_repcodegenerator +qt_internal_add_test(tst_repcodegenerator SOURCES tst_repcodegenerator.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/repparser/.prev_CMakeLists.txt b/tests/auto/repparser/.prev_CMakeLists.txt index 3bd8cff..3a93b8c 100644 --- a/tests/auto/repparser/.prev_CMakeLists.txt +++ b/tests/auto/repparser/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_parser Test: ##################################################################### -qt_add_test(tst_parser +qt_internal_add_test(tst_parser SOURCES tst_parser.cpp INCLUDE_DIRECTORIES @@ -23,7 +23,7 @@ qt_process_qlalr( ## Scopes: ##################################################################### -qt_extend_target(tst_parser CONDITION MSVC +qt_internal_extend_target(tst_parser CONDITION MSVC COMPILE_OPTIONS /wd4129 ) diff --git a/tests/auto/restart/client/CMakeLists.txt b/tests/auto/restart/client/CMakeLists.txt index d9fca22..423a73c 100644 --- a/tests/auto/restart/client/CMakeLists.txt +++ b/tests/auto/restart/client/CMakeLists.txt @@ -4,7 +4,7 @@ ## restart_client Binary: ##################################################################### -qt_add_executable(restart_client +qt_internal_add_executable(restart_client OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/restart/server/CMakeLists.txt b/tests/auto/restart/server/CMakeLists.txt index 603318f..b95ad13 100644 --- a/tests/auto/restart/server/CMakeLists.txt +++ b/tests/auto/restart/server/CMakeLists.txt @@ -4,7 +4,7 @@ ## restart_server Binary: ##################################################################### -qt_add_executable(restart_server +qt_internal_add_executable(restart_server OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/restart/tst/CMakeLists.txt b/tests/auto/restart/tst/CMakeLists.txt index 33fd223..b40a2c7 100644 --- a/tests/auto/restart/tst/CMakeLists.txt +++ b/tests/auto/restart/tst/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_restart Test: ##################################################################### -qt_add_test(tst_restart +qt_internal_add_test(tst_restart OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES tst_restart.cpp diff --git a/tests/auto/subclassreplica/CMakeLists.txt b/tests/auto/subclassreplica/CMakeLists.txt index 2129941..8e7e7a9 100644 --- a/tests/auto/subclassreplica/CMakeLists.txt +++ b/tests/auto/subclassreplica/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_subclassreplicatest Test: ##################################################################### -qt_add_test(tst_subclassreplicatest +qt_internal_add_test(tst_subclassreplicatest SOURCES tst_subclassreplicatest.cpp DEFINES diff --git a/tools/repc/.prev_CMakeLists.txt b/tools/repc/.prev_CMakeLists.txt index 7b87329..e697e42 100644 --- a/tools/repc/.prev_CMakeLists.txt +++ b/tools/repc/.prev_CMakeLists.txt @@ -10,13 +10,6 @@ qt_add_tool(${target_name} SOURCES cppcodegenerator.cpp cppcodegenerator.h main.cpp - moc_copy/moc.cpp moc_copy/moc.h - moc_copy/outputrevision.h - moc_copy/parser.cpp moc_copy/parser.h - moc_copy/preprocessor.cpp moc_copy/preprocessor.h - moc_copy/symbols.h - moc_copy/token.cpp moc_copy/token.h - moc_copy/utils.h repcodegenerator.cpp repcodegenerator.h utils.cpp utils.h DEFINES @@ -27,7 +20,6 @@ qt_add_tool(${target_name} RO_INSTALL_HEADERS=\"$$[QT_INSTALL_HEADERS]/QtRemoteObjects\" INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/src/repparser - moc_copy PUBLIC_LIBRARIES Qt::CorePrivate ) |