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,92 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* GridLaout with auto column layouter.
|
||||
* Layouts all widgets depending on the maxColumn value
|
||||
* releayouts if maxColumn changed
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include <QGridLayout>
|
||||
#include <QVector>
|
||||
|
||||
#include "lts_widgets_export.h"
|
||||
#include "lts_base.h"
|
||||
|
||||
class QWidget;
|
||||
|
||||
namespace LtsWidgets
|
||||
{
|
||||
/**
|
||||
* @brief The LtsGridLayout class provides a LayoutItem for the Lts Layout System and is the equivalent to the QGridLayout.
|
||||
* An LtsGridLayout can be added to a Widget as any other LayoutItem
|
||||
* A LtsGridLayout got two modes:
|
||||
* The first one is the normal operation Mode with a fixed ColumnSize
|
||||
* every time a widget is added wit add_widget (not addWidget!)
|
||||
* it will use the next column at the current used row
|
||||
* when maxColum is reached in the current row
|
||||
* the Widget will be added to a new row
|
||||
*
|
||||
* The Second Mode is enabeled with AutoSize
|
||||
* There the MaxColumnSize will be calculated
|
||||
* when a rezize event accure
|
||||
*/
|
||||
class LTSWIDGETS_EXPORT LtsGridLayout : public QGridLayout
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
/**
|
||||
* @brief Constructor for LtsGridLayout
|
||||
* @param ButtonSize for calcualting Gridzize on autoSize
|
||||
* @param Parent widget
|
||||
* @param max Column to use
|
||||
*/
|
||||
explicit LtsGridLayout(LtsWidgets::ButtonSize buttonSize, QWidget *parent = nullptr, int maxColumn = 1);
|
||||
|
||||
/**
|
||||
* @brief adds a QWidget to the Layout in the current Row
|
||||
* if MaxColumn is reached, the widget will be added to a new row
|
||||
* @param QWidget addet to the Layout
|
||||
*/
|
||||
void add_widget(QWidget *widget);
|
||||
|
||||
/**
|
||||
* @brief enables autoSize
|
||||
* calculates on rezize the MaxColum count for given ButtonSize
|
||||
* @param enable autoSize
|
||||
*/
|
||||
void setAutoSize(bool enable);
|
||||
|
||||
/**
|
||||
* @brief set MaxColumn
|
||||
* @param int maxColum count
|
||||
*/
|
||||
void setMaxColumn(int max);
|
||||
|
||||
|
||||
private:
|
||||
void addWidgetInternal(QWidget *widget);
|
||||
|
||||
public Q_SLOTS:
|
||||
void onParentResize(QResizeEvent *e);
|
||||
|
||||
|
||||
private Q_SLOTS:
|
||||
void onWidgetDestroyed();
|
||||
private:
|
||||
|
||||
LtsWidgets::ButtonSize m_buttonSize;
|
||||
int m_defaultMaxColumn;
|
||||
int m_maxColumn;
|
||||
int m_colSize;
|
||||
QVector<QWidget *> m_widgetList;
|
||||
QRect m_oldGeo;
|
||||
QSize m_oldSize;
|
||||
bool m_autoSize;
|
||||
|
||||
|
||||
};
|
||||
|
||||
} // namespace
|
||||
Reference in new issue
Block a user