Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,91 @@
|
||||
#
|
||||
# $Id$
|
||||
# $HeadURL$
|
||||
# $Author$
|
||||
#
|
||||
# CMakeLists.txt fuer DdsView
|
||||
#
|
||||
|
||||
SET(ddsview_SRCS
|
||||
detailview.cpp
|
||||
detailviewdlg.cpp
|
||||
detailviewdlg.h
|
||||
detailview.h
|
||||
initialisation.cpp
|
||||
initialisation.h
|
||||
logger.cpp
|
||||
logger.h
|
||||
main.cpp
|
||||
mainwindow.cpp
|
||||
mainwindow.h
|
||||
nglsettings.cpp
|
||||
nglsettings.h
|
||||
sequences/abstractsequencewidget.cpp
|
||||
sequences/abstractsequencewidget.h
|
||||
sequences/tabsequencewidget.cpp
|
||||
sequences/tabsequencewidget.h
|
||||
sequences/listsequencewidget.cpp
|
||||
sequences/listsequencewidget.h
|
||||
samplemodel.cpp
|
||||
samplemodel.h
|
||||
sampleview.cpp
|
||||
sampleview.h
|
||||
subscriber.cpp
|
||||
subscriber.h
|
||||
telegrammodel.cpp
|
||||
telegrammodel.h
|
||||
telegramview.cpp
|
||||
telegramview.h
|
||||
topicselector.cpp
|
||||
topicselector.h
|
||||
topic_tree_model.cpp
|
||||
topic_tree_model.h
|
||||
typecodeselector.cpp
|
||||
typecodeselectordlg.cpp
|
||||
typecodeselectordlg.h
|
||||
typecodeselector.h
|
||||
xmlhelper.cpp
|
||||
xmlhelper.h
|
||||
zwmsui_version.cpp
|
||||
zwmsui_version.h
|
||||
rw/rwwidgets.cpp
|
||||
rw/rwwidgets.h
|
||||
coorddetaildlg.cpp
|
||||
coorddetaildlg.h
|
||||
)
|
||||
|
||||
SET(ddsview_UICS
|
||||
ui/mainwindow.ui
|
||||
ui/zwmsui_versionview.ui
|
||||
ui/detailviewdlg.ui
|
||||
ui/typecodeselectordlg.ui
|
||||
ui/topicselector.ui
|
||||
ui/coorddetaildlg.ui
|
||||
)
|
||||
|
||||
NGL_WRAP_UI(ddsview_SRCS ${ddsview_UICS})
|
||||
NGL_ADD_TOOL_ICON(ddsview_SRCS "dds")
|
||||
|
||||
NGL_ADD_EXECUTABLE(ddsview TOOLSWS TOOLSSV NO_TRANSLATION WIN32 ${ddsview_SRCS} ${ddsview_UICS})
|
||||
NGL_TARGET_LINK_LIBRARIES(ddsview
|
||||
ddsconnector
|
||||
LtsCommandLineParser
|
||||
LtsCoordTrans
|
||||
ltsCoordWidget
|
||||
LtsWidgets
|
||||
LtsPluginLoader
|
||||
nglapplication
|
||||
NGLLogger
|
||||
nglsettings
|
||||
nglwidgets
|
||||
Qt5::Core
|
||||
Qt5::Gui
|
||||
Qt5::Xml
|
||||
RTI::nddsc
|
||||
RTI::nddscore
|
||||
topicdiscover
|
||||
topic_type_plugin
|
||||
)
|
||||
|
||||
NGL_INSTALL_TARGET(ddsview)
|
||||
NGL_INSTALL(TOOLSWS TOOLSSV FILES log4cxx_ddsview.props DESTINATION "bin")
|
||||
Reference in new issue
Block a user