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
+17
@@ -0,0 +1,17 @@
|
||||
#ifndef PDM_DTC_H
|
||||
#define PDM_DTC_H
|
||||
|
||||
// Stub file for pdm_dtc.h - generated code placeholder
|
||||
// This file is auto-generated from pdm_service.xml when BUILD_GRANTLEE=ON
|
||||
// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed
|
||||
|
||||
namespace ProjectDataManagement {
|
||||
namespace Dds {
|
||||
|
||||
// Forward declarations - actual definitions in generated code
|
||||
class Dtc;
|
||||
|
||||
} // namespace Dds
|
||||
} // namespace ProjectDataManagement
|
||||
|
||||
#endif // PDM_DTC_H
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
#ifndef PDM_FTC_H
|
||||
#define PDM_FTC_H
|
||||
|
||||
// Stub file for pdm_ftc.h - generated code placeholder
|
||||
// This file is auto-generated from pdm_service.xml when BUILD_GRANTLEE=ON
|
||||
// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed
|
||||
|
||||
namespace ProjectDataManagement {
|
||||
namespace Dds {
|
||||
|
||||
// Forward declarations - actual definitions in generated code
|
||||
class Ftc;
|
||||
|
||||
} // namespace Dds
|
||||
} // namespace ProjectDataManagement
|
||||
|
||||
#endif // PDM_FTC_H
|
||||
Reference in new issue
Block a user