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
@@ -20,9 +20,6 @@ SET(SRCS_common
|
||||
ppm_db_impl_custom.h
|
||||
logger.cpp
|
||||
logger.h
|
||||
ppm_translation.h
|
||||
ppm_translation.cpp
|
||||
ppm_types.h
|
||||
)
|
||||
|
||||
# Generate ppm_enums.idl / ppm.idl
|
||||
@@ -41,13 +38,12 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
||||
# generate ppm_[d|f]tc.h
|
||||
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY2(AAR SV WS HLA svcPpmCommon SHARED ${SRCS_common})
|
||||
NGL_ADD_LIBRARY(AAR SV WS HLA svcPpmCommon SHARED ${SRCS_common})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcPpmCommon
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcPpmCommon
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
@@ -62,7 +58,6 @@ NGL_TARGET_LINK_LIBRARIES(svcPpmCommon
|
||||
LtsCoordTrans
|
||||
ngldb
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcPpmCommon)
|
||||
|
||||
#
|
||||
@@ -76,14 +71,13 @@ SET(SRCS_client
|
||||
# generate ppm_[d|f]tc_impl.[cpp|h]
|
||||
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY2(WS AAR SV HLA svcPpmClient SHARED ${SRCS_client})
|
||||
NGL_ADD_LIBRARY(WS AAR SV HLA svcPpmClient SHARED ${SRCS_client})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcPpmClient
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcPpmClient
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
@@ -92,7 +86,6 @@ NGL_TARGET_LINK_LIBRARIES(svcPpmClient
|
||||
svcPpmCommon
|
||||
ddsftc
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcPpmClient)
|
||||
|
||||
#
|
||||
@@ -107,14 +100,13 @@ SET(SRCS_server
|
||||
CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
|
||||
|
||||
# WS for RecordReplayPlugin
|
||||
NGL_ADD_LIBRARY2(AAR SV WS svcPpmServer SHARED ${SRCS_server})
|
||||
NGL_ADD_LIBRARY(AAR SV WS svcPpmServer SHARED ${SRCS_server})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcPpmServer
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcPpmServer
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
@@ -125,7 +117,6 @@ NGL_TARGET_LINK_LIBRARIES(svcPpmServer
|
||||
ngldb
|
||||
LtsUtilsCore
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcPpmServer)
|
||||
|
||||
#
|
||||
|
||||
Reference in new issue
Block a user