Qt6 Migration: BUILD_RTI Guards, Export-Header und Include-Pfade korrigiert
- BUILD_RTI Guards in LtsSession implementiert (6 Dateien) - LtsSessionDataDds Stub für BUILD_RTI=OFF erstellt - Export-Header Stubs erstellt (GuezNasat, AlarmManagement, MarkerManagement) - Include-Pfade korrigiert (resource_path.h, logger.h, Proxies) - QStringRef → QString migriert (Qt6 Kompatibilität) - Qt6::Gui Dependencies hinzugefügt (LtsElevation, AdvancedSymbology) - FilterManagement-Plugins temporär vom Build ausgeschlossen - MOC-Probleme gefixt (staticMetaObject, override final) - Build erfolgreich: 1940 Targets mit BUILD_RTI=OFF im Docker-Container Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
46 files changed
+2487
-110
No files matched your search
@@ -0,0 +1,8 @@
|
||||
#ifndef SVCALMCOMMON_EXPORT_H
|
||||
#define SVCALMCOMMON_EXPORT_H
|
||||
|
||||
// Stub export macro for AlarmManagement
|
||||
#define SVCALMCOMMON_EXPORT
|
||||
#define SVCALMCOMMON_NO_EXPORT
|
||||
|
||||
#endif // SVCALMCOMMON_EXPORT_H
|
||||
@@ -3,6 +3,10 @@
|
||||
// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
|
||||
// Für die Migration erstellen wir minimale Typ-Definitionen
|
||||
|
||||
#ifdef BUILD_RTI
|
||||
#include <DDS/Core/core.hpp>
|
||||
#endif
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
// Placeholder enums - werden durch echte DDS-Typen ersetzt
|
||||
@@ -16,4 +20,12 @@ struct UnitSymbolPosition
|
||||
double y = 0.0;
|
||||
double z = 0.0;
|
||||
};
|
||||
|
||||
#ifdef BUILD_RTI
|
||||
// RadioSystem wird von DDS generiert
|
||||
using RadioSystem = dds::core::Reference<class RadioSystemObject>;
|
||||
#else
|
||||
// Stub für BUILD_RTI=OFF
|
||||
enum class RadioSystem : int32_t { Cnr = 0, Tvc = 1 };
|
||||
#endif
|
||||
} // namespace AudioVideoManagement
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace Core
|
||||
{
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
#ifndef SVCGNACOMMON_EXPORT_H
|
||||
#define SVCGNACOMMON_EXPORT_H
|
||||
|
||||
// Stub export macro for BUILD_RTI=OFF
|
||||
#define SVCGNACOMMON_EXPORT
|
||||
|
||||
#endif // SVCGNACOMMON_EXPORT_H
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
#pragma once
|
||||
|
||||
// Stub export header for LtsProjectionWorkstation
|
||||
// Created for Qt6 migration with BUILD_RTI=OFF
|
||||
|
||||
#ifndef LTSPROJECTIONWORKSTATION_EXPORT_H
|
||||
#define LTSPROJECTIONWORKSTATION_EXPORT_H
|
||||
|
||||
#define LTSPROJECTIONWORKSTATION_EXPORT
|
||||
#define LTSPROJECTIONWORKSTATION_NO_EXPORT
|
||||
|
||||
#endif // LTSPROJECTIONWORKSTATION_EXPORT_H
|
||||
@@ -0,0 +1,6 @@
|
||||
// Auto-generated export macro for PDM Common
|
||||
// Stub for BUILD_RTI=OFF or missing dependency
|
||||
|
||||
#ifndef PDM_COMMON_EXPORT
|
||||
#define PDM_COMMON_EXPORT
|
||||
#endif
|
||||
Reference in new issue
Block a user