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@
|
||||
* DDS View -> The "LogView" for DDS
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
// #include "nglsettings.h"
|
||||
#include "mainwindow.h"
|
||||
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
//#include <nglsettings/nglsettings_settings.h>
|
||||
#include <nglapplication/nglapplication.h>
|
||||
#include <LtsPluginManager/lts_plugin_loader.h>
|
||||
#include <PluginInterfaces/style_plugin_interface.h>
|
||||
|
||||
//#include <QtCore/QSettings>
|
||||
//#include <QInputDialog>
|
||||
//#include <QUrl>
|
||||
|
||||
|
||||
class CmdLineParser : public LtsCommandLineParser::LtsCommandLineParser
|
||||
{
|
||||
public:
|
||||
CmdLineParser() : LtsCommandLineParser::LtsCommandLineParser(ProvideCommandLineParameterOptions(LtsCommandLineParser::CreateDomainIdFromIp |
|
||||
LtsCommandLineParser::DomainId |
|
||||
LtsCommandLineParser::ExerciseId |
|
||||
LtsCommandLineParser::TcpConnectionUrl))
|
||||
{}
|
||||
const char *langCode() const { return m_langCode.data(); }
|
||||
|
||||
bool init()
|
||||
{
|
||||
setDomainId(-1);
|
||||
QCommandLineOption langCodeOption(QStringList() << QLatin1String("l") << QLatin1String("langCode"),
|
||||
QLatin1String("Language."),
|
||||
QLatin1String("en_US|de_DE"),
|
||||
QLatin1String("en_US"));
|
||||
addOption(langCodeOption);
|
||||
|
||||
if (!LtsCommandLineParser::init())
|
||||
return false;
|
||||
|
||||
if (isSet(langCodeOption))
|
||||
m_langCode = value(langCodeOption).toLatin1();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private:
|
||||
QByteArray m_langCode;
|
||||
};
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
NGLApplication app(argc, argv);
|
||||
app.createLogger("VideoImporter", "log4cxx_videoimporter.props");
|
||||
NGL::INGLLogger &logger = app.baseLogger();
|
||||
QCoreApplication::setApplicationName(QLatin1String("Video Importer"));
|
||||
QCoreApplication::setOrganizationName(QLatin1String("RDE"));
|
||||
|
||||
LtsPluginManager::LtsPluginLoader::getInstance()->loadPlugins(LtsPluginManager::PluginType::STYLE, nullptr
|
||||
, QStringList() << QStringLiteral("rme.light")); // load style plugin
|
||||
|
||||
CmdLineParser options;
|
||||
if (!options.init())
|
||||
return -1;
|
||||
|
||||
// NGL::Settings settings(app.organizationName(), app.applicationName());
|
||||
|
||||
STARTUP_LOG(logger);
|
||||
|
||||
// NGL::init_translator(options.langCode());
|
||||
|
||||
MainWindow *mw = new MainWindow();
|
||||
|
||||
mw->show();
|
||||
|
||||
app.setQuitOnLastWindowClosed(true);
|
||||
|
||||
int retval = app.exec();
|
||||
|
||||
SHUTDOWN_LOG(logger);
|
||||
|
||||
return retval;
|
||||
}
|
||||
Reference in new issue
Block a user