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
@@ -35,13 +35,12 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
||||
# generate eem_[d|f]tc.h
|
||||
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE} PARTS DTC)
|
||||
|
||||
NGL_ADD_LIBRARY2(AAR SV WS svcEemCommon SHARED ${SRCS_common})
|
||||
NGL_ADD_LIBRARY(AAR SV WS svcEemCommon SHARED ${SRCS_common})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcEemCommon
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcEemCommon
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
@@ -53,7 +52,6 @@ NGL_TARGET_LINK_LIBRARIES(svcEemCommon
|
||||
ngldb
|
||||
svcPdmCommon
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcEemCommon)
|
||||
|
||||
#
|
||||
@@ -65,14 +63,13 @@ SET(SRCS_client
|
||||
# generate eem_[d|f]tc.h, eem_[d|f]tc_impl.[cpp|h]
|
||||
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE} PARTS DTC)
|
||||
|
||||
NGL_ADD_LIBRARY2(AAR SV WS svcEemClient SHARED ${SRCS_client})
|
||||
NGL_ADD_LIBRARY(AAR SV WS svcEemClient SHARED ${SRCS_client})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcEemClient
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcEemClient
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
@@ -81,7 +78,6 @@ NGL_TARGET_LINK_LIBRARIES(svcEemClient
|
||||
svcEemCommon
|
||||
ddsftc
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcEemClient)
|
||||
|
||||
#
|
||||
@@ -93,14 +89,13 @@ SET(SRCS_server
|
||||
# generate eem_[d|f]ts.h, eem_[d|f]ts_impl.[cpp|h]
|
||||
CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE} PARTS DTS)
|
||||
|
||||
NGL_ADD_LIBRARY2(AAR SV svcEemServer SHARED ${SRCS_server})
|
||||
NGL_ADD_LIBRARY(AAR SV svcEemServer SHARED ${SRCS_server})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcEemServer
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcEemServer
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
@@ -110,7 +105,6 @@ NGL_TARGET_LINK_LIBRARIES(svcEemServer
|
||||
svcEemCommon
|
||||
ngldb
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcEemServer)
|
||||
|
||||
#
|
||||
|
||||
Reference in new issue
Block a user