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,67 @@
|
||||
#
|
||||
# $Id$
|
||||
# $HeadURL$
|
||||
# $Author$
|
||||
# Created by Hanna Rathje, SLSE, 2017-12-14
|
||||
#
|
||||
|
||||
SET(SRCS_copy
|
||||
copy_exercise.cpp
|
||||
copy_exercise.h
|
||||
exercise_table_generator.cpp
|
||||
exercise_table_generator.h
|
||||
settings.cpp
|
||||
settings.h
|
||||
)
|
||||
NGL_ADD_LIBRARY(AAR SV WS dbAdminCopyExercise ${SRCS_copy})
|
||||
NGL_TARGET_LINK_LIBRARIES(dbAdminCopyExercise
|
||||
PUBLIC
|
||||
Qt5::Core
|
||||
Qt5::Sql
|
||||
codegen_base
|
||||
ngldb
|
||||
NGLLogger
|
||||
nglsettings
|
||||
)
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(dbAdminCopyExercise
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
)
|
||||
|
||||
SET(SRCS
|
||||
local_databases_model.cpp
|
||||
local_databases_model.h
|
||||
logger.cpp
|
||||
logger.h
|
||||
db_administration.cpp
|
||||
db_administration.h
|
||||
main.cpp
|
||||
server_databases_model.cpp
|
||||
server_databases_model.h
|
||||
showLogFile.cpp
|
||||
showLogFile.h
|
||||
|
||||
)
|
||||
|
||||
NGL_WRAP_UI(SRCS ui/db_administration.ui ui/showLogFile.ui)
|
||||
|
||||
NGL_ADD_TOOL_ICON(dbAdministration)
|
||||
NGL_ADD_EXECUTABLE(AAR SV dbAdministration ${SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(dbAdministration
|
||||
dbAdminCopyExercise
|
||||
Qt5::Widgets
|
||||
Qt5::Core
|
||||
Qt5::Network
|
||||
nglapplication
|
||||
ngldb
|
||||
nglcoreapplication
|
||||
ngltools
|
||||
ngltranslator
|
||||
nglwidgets
|
||||
NGLLogger
|
||||
LtsCommandLineParser
|
||||
)
|
||||
|
||||
NGL_INSTALL_TARGET(dbAdministration)
|
||||
NGL_INSTALL(SV AAR FILES log4cxx_dba.props DESTINATION bin)
|
||||
|
||||
Reference in new issue
Block a user