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,28 @@
|
||||
#
|
||||
# I won't fix this.
|
||||
#
|
||||
# $Id$
|
||||
# $HeadURL$
|
||||
# $Author$
|
||||
# Created by Mike Wille, SLSE, 2017-02-17
|
||||
#
|
||||
|
||||
|
||||
set(tbts_SRCS
|
||||
tab_bar_tab_style.h
|
||||
tab_bar_tab_style.cpp
|
||||
)
|
||||
|
||||
NGL_ADD_LIBRARY(WS AAR SV TabBarTabStyle SHARED ${tbts_SRCS})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(TabBarTabStyle
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
)
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(TabBarTabStyle
|
||||
PUBLIC
|
||||
Qt5::Core
|
||||
Qt5::Gui
|
||||
)
|
||||
|
||||
NGL_INSTALL_TARGET(TabBarTabStyle)
|
||||
@@ -0,0 +1,13 @@
|
||||
#include "tab_bar_tab_style.h"
|
||||
|
||||
|
||||
namespace Styles
|
||||
{
|
||||
QColor TabBarTabStyle::primarySelected = QColor();
|
||||
QColor TabBarTabStyle::primaryNormal = QColor();
|
||||
QColor TabBarTabStyle::primaryDisabled = QColor();
|
||||
|
||||
QColor TabBarTabStyle::secondarySelected = QColor();
|
||||
QColor TabBarTabStyle::secondaryNormal = QColor();
|
||||
QColor TabBarTabStyle::secondaryDisabled = QColor();
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
// TODO: hdr
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QColor>
|
||||
|
||||
|
||||
#ifndef TABBARTABSTYLE_EXPORT
|
||||
# ifdef BUILD_STATIC_LIBRARIES
|
||||
# define TABBARTABSTYLE_EXPORT
|
||||
# else
|
||||
# if defined(MAKE_TABBARTABSTYLE_LIB)
|
||||
# define TABBARTABSTYLE_EXPORT Q_DECL_EXPORT
|
||||
# else
|
||||
# define TABBARTABSTYLE_EXPORT Q_DECL_IMPORT
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
|
||||
|
||||
namespace Styles
|
||||
{
|
||||
class TABBARTABSTYLE_EXPORT TabBarTabStyle
|
||||
{
|
||||
public:
|
||||
static QColor primarySelected;
|
||||
static QColor primaryNormal;
|
||||
static QColor primaryDisabled;
|
||||
|
||||
static QColor secondarySelected;
|
||||
static QColor secondaryNormal;
|
||||
static QColor secondaryDisabled;
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user