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,103 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Test for LtsDataView and their AbstractDisplayWidgets
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Mike Wille, SLSE, 2016-03-14
|
||||
*/
|
||||
|
||||
#include "test.h"
|
||||
|
||||
#include <lts_data_view.h>
|
||||
|
||||
#include <QApplication>
|
||||
#include <QDebug>
|
||||
#include <QLabel>
|
||||
#include <QStandardItem>
|
||||
#include <QStandardItemModel>
|
||||
#include <QElapsedTimer>
|
||||
#include <QScrollArea>
|
||||
#include <QScroller>
|
||||
|
||||
|
||||
Disp::Disp()
|
||||
: LtsDataView::AbstractDisplayWidget(nullptr)
|
||||
, m_label(new QLabel(this))
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
bool Disp::init(const QModelIndex &idx)
|
||||
{
|
||||
if (!idx.isValid())
|
||||
return false;
|
||||
|
||||
m_label->setText(rowData(idx, 0).toString());
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
QApplication app(argc,argv);
|
||||
|
||||
int rows = 20;
|
||||
int cols = 7;
|
||||
|
||||
QElapsedTimer et;
|
||||
et.start();
|
||||
qWarning() << "creating" << rows << "items";
|
||||
qWarning() << "wait..";
|
||||
|
||||
LtsDataView::LtsDataView *view = new LtsDataView::LtsDataView();
|
||||
|
||||
QStandardItemModel model;
|
||||
|
||||
for (int r = 0; r < rows; r++)
|
||||
{
|
||||
for (int c = 0; c < cols; c++)
|
||||
{
|
||||
QStandardItem *item = new QStandardItem(QStringLiteral("Item %1/%2").arg(r).arg(c));
|
||||
model.setItem(r,c,item);
|
||||
}
|
||||
}
|
||||
|
||||
view->setModel(&model, [](){ return new Disp(); });
|
||||
view->show();
|
||||
|
||||
#ifdef TABLET_MODE
|
||||
auto widget = view;
|
||||
if (widget)
|
||||
{
|
||||
widget->setAttribute(Qt::WA_AcceptTouchEvents);
|
||||
|
||||
{
|
||||
QScrollArea *sca = qobject_cast<QScrollArea *>(widget);
|
||||
if (sca)
|
||||
{
|
||||
qWarning() << widget << "is scroll area";
|
||||
QScroller::grabGesture(sca->viewport(), QScroller::LeftMouseButtonGesture);
|
||||
QScroller::grabGesture(sca, QScroller::LeftMouseButtonGesture);
|
||||
}
|
||||
else
|
||||
{
|
||||
QAbstractItemView *aiv = qobject_cast<QAbstractItemView *>(widget);
|
||||
if (aiv)
|
||||
{
|
||||
qWarning() << widget << "is abst. item view";
|
||||
QScroller::grabGesture(aiv->viewport(), QScroller::LeftMouseButtonGesture);
|
||||
QScroller::grabGesture(aiv, QScroller::LeftMouseButtonGesture);
|
||||
aiv->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
|
||||
aiv->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
qWarning() << "took" << et.elapsed() << "ms";
|
||||
|
||||
return app.exec();
|
||||
}
|
||||
Reference in new issue
Block a user