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,74 @@
|
||||
#
|
||||
# CMakeLists.txt for LtsTimeline, the base for EventTimeline and ScriptTimeline aka. Script Editor
|
||||
#
|
||||
# $Id: CMakeLists.txt 39615 2018-03-16 13:36:41Z wille_m $
|
||||
# $HeadURL: svn://192.168.133.21/TDS/branches/product/features/hotline/Lts/Common/LtsEventTimeline/CMakeLists.txt $
|
||||
# $Author: wille_m $
|
||||
#
|
||||
# Created by Mike Wille, SLTE, 2021-05-18
|
||||
#
|
||||
|
||||
SET(src
|
||||
timeline_model.h
|
||||
timeline_model.cpp
|
||||
|
||||
item.h
|
||||
item.cpp
|
||||
item_delegate.h
|
||||
item_delegate.cpp
|
||||
|
||||
timeline_header_view.cpp
|
||||
timeline_header_view.h
|
||||
timeline_header_view_mouse_handler.cpp
|
||||
timeline_header_view_mouse_handler.h
|
||||
timeline_utils.cpp
|
||||
timeline_utils.h
|
||||
timeline_view.h
|
||||
timeline_view.cpp
|
||||
timeline_view_drag_handler.cpp
|
||||
timeline_view_drag_handler.h
|
||||
timeline_view_resize_handler.cpp
|
||||
timeline_view_resize_handler.h
|
||||
timeline_view_selection_handler.cpp
|
||||
timeline_view_selection_handler.h
|
||||
timeline_view_track_handler.cpp
|
||||
timeline_view_track_handler.h
|
||||
timeline_widget.h
|
||||
timeline_widget.cpp
|
||||
|
||||
track.h
|
||||
track.cpp
|
||||
)
|
||||
|
||||
SET(uisrc
|
||||
timeline_widget.ui
|
||||
)
|
||||
|
||||
NGL_WRAP_UI(src ${uisrc})
|
||||
NGL_ADD_LIBRARY2(WS LtsTimeline SHARED ${src})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsTimeline
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsTimeline
|
||||
PRIVATE
|
||||
NGLLogger
|
||||
ngltools # DTG
|
||||
LtsWidgets # LtsMessageDialogNew for remove filter track
|
||||
Qt5::Core
|
||||
Qt5::Gui
|
||||
Qt5::Widgets
|
||||
)
|
||||
NGL_INSTALL_TARGET(LtsTimeline)
|
||||
|
||||
|
||||
# LtsTimelineTest
|
||||
NGL_ADD_EXECUTABLE(WS LtsTimelineTest main.cpp)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsTimelineTest
|
||||
LtsTimeline
|
||||
nglapplication
|
||||
NGLLogger
|
||||
Qt5::Core
|
||||
Qt5::Gui
|
||||
Qt5::Widgets
|
||||
)
|
||||
Reference in new issue
Block a user