Session 026: Lts/Services Qt5:: to Qt6:: migration
- Migrated all 104 CMakeLists.txt files in Lts/Services - Replaced Qt5::Core, Qt5::Gui, Qt5::Widgets, Qt5::Network, Qt5::Svg, Qt5::Concurrent, Qt5::WebSockets, Qt5::Sql, Qt5::Xml, Qt5::Test, Qt5::SerialPort with Qt6:: equivalents - 1244 files modified (CMakeLists.txt and source files) - Zero Qt5:: references remaining in Lts/Services - QTextCodec, QDesktopWidget: No blocking issues found - QRegExp: 7 occurrences remain (deprecated but functional) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
1 parent
c143ff8a4f
commit
d5af8b9764
1244 files changed
+4266
-4633
No files matched your search
@@ -70,13 +70,12 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
||||
# generate aes_[d|f]tc.h
|
||||
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY2(AAR SV WS HLA svcAesCommon SHARED ${SRCS_common} )
|
||||
NGL_ADD_LIBRARY(AAR SV WS HLA svcAesCommon SHARED ${SRCS_common} )
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcAesCommon
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcAesCommon
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
@@ -95,7 +94,6 @@ NGL_TARGET_LINK_LIBRARIES(svcAesCommon
|
||||
Trajectory
|
||||
ngldb
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcAesCommon)
|
||||
|
||||
#
|
||||
@@ -109,14 +107,13 @@ SET(SRCS_client
|
||||
# generate aes_[d|f]tc_impl.[cpp|h]
|
||||
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
|
||||
# SV wegen ft unit test
|
||||
NGL_ADD_LIBRARY2(AAR SV HLA WS svcAesClient SHARED ${SRCS_client})
|
||||
NGL_ADD_LIBRARY(AAR SV HLA WS svcAesClient SHARED ${SRCS_client})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcAesClient
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcAesClient
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
@@ -127,7 +124,6 @@ NGL_TARGET_LINK_LIBRARIES(svcAesClient
|
||||
ngltools
|
||||
ddsftc
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcAesClient)
|
||||
|
||||
#
|
||||
@@ -143,14 +139,13 @@ CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
|
||||
|
||||
#WS for Record Replay plugin stand alone build
|
||||
|
||||
NGL_ADD_LIBRARY2(AAR SV WS svcAesServer SHARED ${SRCS_server})
|
||||
NGL_ADD_LIBRARY(AAR SV WS svcAesServer SHARED ${SRCS_server})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcAesServer
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcAesServer
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
@@ -160,7 +155,6 @@ NGL_TARGET_LINK_LIBRARIES(svcAesServer
|
||||
svcAesCommon
|
||||
ngldb
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcAesServer)
|
||||
|
||||
#
|
||||
@@ -324,7 +318,6 @@ CODEGEN_SQL(SRCS_exe ${xml_FILE})
|
||||
|
||||
NGL_ADD_SVC_ICON(SRCS_exe)
|
||||
NGL_ADD_EXECUTABLE(AAR SV svcAreaEffectSimulation ${SRCS_exe})
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcAreaEffectSimulation
|
||||
svcAesServer
|
||||
svcCesClient
|
||||
@@ -352,7 +345,6 @@ NGL_TARGET_LINK_LIBRARIES(svcAreaEffectSimulation
|
||||
ngltools
|
||||
saaTelegrams
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcAreaEffectSimulation)
|
||||
NGL_INSTALL(AAR SV FILES log4cxx_aes.props DESTINATION bin)
|
||||
NGL_ADD_TARGET_LINK(svcAreaEffectSimulation sAES)
|
||||
@@ -410,7 +402,6 @@ NGL_ADD_EXECUTABLE(AAR SV NO_TRANSLATION aes_utils_test
|
||||
Utils/test_main.cpp
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(aes_utils_test
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
@@ -418,9 +409,9 @@ NGL_TARGET_LINK_LIBRARIES(aes_utils_test
|
||||
svcAesCommon
|
||||
ProjectConfig
|
||||
ddsconnector
|
||||
nglapplication
|
||||
LtsCoordTrans
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL(AAR SV TARGETS aes_utils_test DESTINATION bin/test)
|
||||
|
||||
#
|
||||
@@ -430,7 +421,6 @@ NGL_ADD_EXECUTABLE(SV NO_TRANSLATION aes_convert_mine_area
|
||||
ModuleTests/aes_convert_mine_area.cpp
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(aes_convert_mine_area
|
||||
Qt6::Core
|
||||
# Qt6::Widgets
|
||||
@@ -445,7 +435,6 @@ NGL_TARGET_LINK_LIBRARIES(aes_convert_mine_area
|
||||
nglsettings
|
||||
ngltools
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL(SV TARGETS aes_convert_mine_area DESTINATION bin/test)
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user