Merge feature/qt6-migration-basis-modules-services into feature/qt6-migration-basis-modules
Resolves 17 conflicts against legacy Qt5 semantics; validates with BUILD_RTI=ON BUILD_GRANTLEE=ON.
This commit is contained in:
1200 files changed
+20421
-18259
No files matched your search
+23
@@ -0,0 +1,23 @@
|
||||
// Stub DTC header for AlarmManagement service
|
||||
// Pre-generated for BUILD_GRANTLEE=OFF
|
||||
|
||||
#ifndef ALM_DTC_H
|
||||
#define ALM_DTC_H
|
||||
|
||||
#include <QObject>
|
||||
#include "alm_export.h"
|
||||
|
||||
namespace AlarmManagement {
|
||||
namespace Interface {
|
||||
|
||||
class ALM_EXPORT Dtc : public QObject {
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit Dtc(QObject* parent = nullptr);
|
||||
virtual ~Dtc();
|
||||
};
|
||||
|
||||
} // namespace Interface
|
||||
} // namespace AlarmManagement
|
||||
|
||||
#endif // ALM_DTC_H
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
// Stub FTC header for AlarmManagement service
|
||||
// Pre-generated for BUILD_GRANTLEE=OFF
|
||||
|
||||
#ifndef ALM_FTC_H
|
||||
#define ALM_FTC_H
|
||||
|
||||
#include <QObject>
|
||||
#include "alm_export.h"
|
||||
|
||||
namespace AlarmManagement {
|
||||
namespace Interface {
|
||||
|
||||
class ALM_EXPORT Ftc : public QObject {
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit Ftc(QObject* parent = nullptr);
|
||||
virtual ~Ftc();
|
||||
};
|
||||
|
||||
} // namespace Interface
|
||||
} // namespace AlarmManagement
|
||||
|
||||
#endif // ALM_FTC_H
|
||||
Reference in new issue
Block a user