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
+2
@@ -0,0 +1,2 @@
|
||||
#pragma once
|
||||
namespace AudioVideoManagement { namespace Interface { class Dtc; class Ftc; } }
|
||||
+2
@@ -0,0 +1,2 @@
|
||||
#pragma once
|
||||
namespace AudioVideoManagement { namespace Interface { class Dtc; class Ftc; } }
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
// Stub export header for non-RTI builds
|
||||
// When BUILD_RTI=OFF, svcAvmCommon library is not built
|
||||
// This stub allows dependent code to compile
|
||||
#ifndef SVCAVMCOMMON_EXPORT_H
|
||||
#define SVCAVMCOMMON_EXPORT_H
|
||||
|
||||
// Map to the actual macro names used in the code
|
||||
#define SVCAVMCOMMON_EXPORT
|
||||
#define SVCAVMCOMMON_NO_EXPORT
|
||||
#define AVM_COMMON_EXPORT
|
||||
#define AVM_CLIENT_EXPORT
|
||||
#define AVM_SERVER_EXPORT
|
||||
|
||||
#endif
|
||||
Reference in new issue
Block a user