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,84 @@
|
||||
// **************************************************************************
|
||||
//
|
||||
// (C) Copyright 2009 Swiss SIMTEC AG
|
||||
//
|
||||
// **************************************************************************
|
||||
//
|
||||
// $HeadURL$
|
||||
// $LastChangedBy$
|
||||
// $LastChangedDate$
|
||||
// $LastChangedRevision$
|
||||
//
|
||||
// **************************************************************************
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QDialog>
|
||||
#include <QtCore/QSettings>
|
||||
|
||||
class QLineEdit;
|
||||
|
||||
namespace N_LogView
|
||||
{
|
||||
/**
|
||||
* This class lets the user view and change the settings of the application
|
||||
*
|
||||
* @author alois.wismer
|
||||
* @version 1.0
|
||||
* @created 09-Mrz-2010 14:49:40
|
||||
*/
|
||||
class LogViewOptionDialog : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
||||
enum SettingsChangedFlag {
|
||||
SpecFilesGroup = 0x01,
|
||||
ServerGroup = 0x02,
|
||||
InjectionGroup = 0x04
|
||||
};
|
||||
|
||||
static const QString KRLOG_FILES;
|
||||
static const QLatin1String SPEC_FILES_GROUP;
|
||||
static const QLatin1String P0_FILENAME;
|
||||
static const QLatin1String P5_FILENAME;
|
||||
static const QLatin1String SERVER_GROUP;
|
||||
static const QLatin1String CENTRAL_PORT;
|
||||
static const QLatin1String TETRA_PORT;
|
||||
static const QLatin1String SIZE;
|
||||
static const QLatin1String POS;
|
||||
static const QLatin1String CENTRAL_IS_SERVER;
|
||||
static const QLatin1String CENTRAL_HOSTNAME;
|
||||
static const QLatin1String LOG_FILENAME;
|
||||
static const QLatin1String INJECTION_GROUP;
|
||||
static const QLatin1String INJECTION_HOSTNAME;
|
||||
static const QLatin1String INJECTION_PORT;
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @param a_parent a_parent
|
||||
*/
|
||||
explicit LogViewOptionDialog(QWidget* a_parent);
|
||||
|
||||
signals:
|
||||
void settingsChanged(uint32_t changed); // bitfield of SettingsChangedFlag enum
|
||||
|
||||
protected:
|
||||
|
||||
static const QString SPEC_FILES;
|
||||
static const QLatin1String DIR;
|
||||
bool m_IsServer;
|
||||
QLineEdit *m_P0Edit;
|
||||
QLineEdit *m_P5Edit;
|
||||
QSettings m_Settings;
|
||||
QLineEdit *m_InjectHostnameEdit;
|
||||
QLineEdit *m_InjectPortEdit;
|
||||
|
||||
protected slots:
|
||||
void browseP0File();
|
||||
void browseP5File();
|
||||
void save();
|
||||
};
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user