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,58 @@
|
||||
/*
|
||||
* @RDE_HEADER@
|
||||
* <short description>
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Malte Schröder, SLSE, 2016-06-08
|
||||
*/
|
||||
|
||||
#include "showLogFile.h"
|
||||
#include "ui_showLogFile.h"
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
|
||||
namespace DBAdministration
|
||||
{
|
||||
ShowLogFile::ShowLogFile(QWidget *parent)
|
||||
: QWidget(parent)
|
||||
, m_ui(new Ui::ShowLogFile)
|
||||
, m_logger(getLogger("ShowLogFile"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
connect(m_ui->pbClose, &QPushButton::clicked, this, &ShowLogFile::onClosedClicked);
|
||||
|
||||
}
|
||||
|
||||
ShowLogFile::~ShowLogFile()
|
||||
{
|
||||
delete m_ui;
|
||||
}
|
||||
|
||||
bool ShowLogFile::init()
|
||||
{
|
||||
QString logFile = NGL::Settings::logPath() + QStringLiteral("/") + QString::fromLatin1(qgetenv("USER")) + QStringLiteral("_scm.log");
|
||||
|
||||
ERROR_LOG(m_logger) << "Logfile: " << logFile;
|
||||
|
||||
QFile file(logFile);
|
||||
|
||||
if (!file.open(QIODevice::ReadOnly))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Cannot open file " << logFile;
|
||||
return false;
|
||||
}
|
||||
|
||||
QByteArray output = file.readAll();
|
||||
|
||||
m_ui->plainTextEdit->setPlainText(QString::fromLocal8Bit(output));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void ShowLogFile::onClosedClicked()
|
||||
{
|
||||
close();
|
||||
}
|
||||
|
||||
} // namespace DBAdministration
|
||||
Reference in new issue
Block a user