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,45 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Licence Library
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by hjl, SLSE, 2016-06-01
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <LtsLicence/ltslicence_export.h>
|
||||
#include <QString>
|
||||
#include <QVector>
|
||||
#include <QDateTime>
|
||||
|
||||
namespace LtsLicence
|
||||
{
|
||||
|
||||
struct LTSLICENCE_EXPORT Licence
|
||||
{
|
||||
QString name; ///< licence name
|
||||
bool ignoreMaxCount = false; ///< true=ignore false=consider maxCount
|
||||
bool ignoreExpiration = false; ///< true=ignore false=consider expiration
|
||||
int maxCount = 0; ///< max. number of available licences
|
||||
QDateTime expiration; ///< expiration date
|
||||
int licenceRefCount = 0; ///< number of assignable licences
|
||||
|
||||
QString toString() const;
|
||||
};
|
||||
|
||||
/**
|
||||
* Convert the given XML licence data into an QVector of licence struct
|
||||
* @param unencryptedXmlData xml data to be converted
|
||||
* @return QVector<Licence>, in case of an error the QVector is empty.
|
||||
*/
|
||||
LTSLICENCE_EXPORT QVector<Licence> readLicences(const QByteArray &unencryptedXmlData);
|
||||
|
||||
/**
|
||||
* Convert the given licence vector data into XML format
|
||||
* @param licences Vector with data to be converted
|
||||
* @return XML formatted data, in case of an error the QByteArray is empty.
|
||||
*/
|
||||
LTSLICENCE_EXPORT QByteArray writeUnencryptedLicences(const QVector<Licence> &licences);
|
||||
}
|
||||
Reference in new issue
Block a user