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,88 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* example main file for testing purpose
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Mike Wille, SLSE, 2014-10-01
|
||||
*/
|
||||
|
||||
#include "TimelineWidget.h"
|
||||
#include "TestTimelineModel.h"
|
||||
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <nglapplication/nglapplication.h>
|
||||
#include <Services/ProjectDataManagement/pdm_enums.hpp>
|
||||
#include <Services/ProjectDataManagement/pdm_translation.h>
|
||||
|
||||
#include <time.h>
|
||||
#include <QVBoxLayout>
|
||||
#include <QPushButton>
|
||||
#include <QDebug>
|
||||
|
||||
|
||||
LtsTimelineClassic::TestTimelineModel *ttm;
|
||||
|
||||
|
||||
void add(qint64 time_offset)
|
||||
{
|
||||
qint64 time = 1505292189000;
|
||||
time += time_offset;
|
||||
|
||||
ttm->addTestEvent(new LtsTimelineClassic::Event(0, (int)ProjectDataManagement::EventType_def::Hit, time, 0, 0, 0, 0,
|
||||
QStringList() << QStringLiteral("Test"),
|
||||
LtsTimelineClassic::Event::drawCustomEventGraphicEllipse, QColor("green"), QString()));
|
||||
}
|
||||
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
qputenv("TDS_DEVEL", "yes, of course");
|
||||
qWarning() << "LtsTimelineClassicTest";
|
||||
NGLApplication app(argc, argv);
|
||||
app.createLogger("Timeline", "log4cxx_timeline.props");
|
||||
|
||||
STARTUP_LOG(app.baseLogger());
|
||||
|
||||
int ret = 0;
|
||||
|
||||
#if 1
|
||||
QWidget *widget = new QWidget();
|
||||
widget->setMinimumWidth(500);
|
||||
|
||||
QVBoxLayout *layout = new QVBoxLayout();
|
||||
widget->setLayout(layout);
|
||||
|
||||
LtsTimelineClassic::TimelineWidget *timelineWidget = new LtsTimelineClassic::TimelineWidget();
|
||||
layout->addWidget(timelineWidget);
|
||||
|
||||
QHBoxLayout *btnLayout = new QHBoxLayout();
|
||||
QWidget *btnLayoutWidget = new QWidget();
|
||||
btnLayoutWidget->setLayout(btnLayout);
|
||||
layout->addWidget(btnLayoutWidget);
|
||||
|
||||
btnLayout->addWidget(new QPushButton(QStringLiteral("Filter"))); // dummy
|
||||
btnLayout->addWidget(new QPushButton(QStringLiteral("CSV Export"))); // dummy
|
||||
btnLayout->addStretch(1);
|
||||
|
||||
widget->show();
|
||||
|
||||
ttm = new LtsTimelineClassic::TestTimelineModel();
|
||||
timelineWidget->setTimelineModel(ttm);
|
||||
|
||||
//QObject::connect(timelineWidget, SIGNAL(signalEventAction(EventGraphic*,int)), ttm, SLOT(slotEventAction(EventGraphic*,int))); // make events clickable
|
||||
|
||||
|
||||
|
||||
add(0);
|
||||
add(100 * 60 * 1000);
|
||||
add(3000 * 60 * 1000);
|
||||
|
||||
|
||||
|
||||
ret = app.exec();
|
||||
SHUTDOWN_LOG(app.baseLogger());
|
||||
#endif
|
||||
|
||||
return ret;
|
||||
}
|
||||
Reference in new issue
Block a user