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
+7
@@ -0,0 +1,7 @@
|
||||
#ifndef _STUB_DTC_H
|
||||
#define _STUB_DTC_H
|
||||
// Stub file for BUILD_GRANTLEE=OFF
|
||||
namespace NOM {
|
||||
class Dtc {};
|
||||
}
|
||||
#endif
|
||||
+7
@@ -0,0 +1,7 @@
|
||||
#ifndef _STUB_FTC_H
|
||||
#define _STUB_FTC_H
|
||||
// Stub file for BUILD_GRANTLEE=OFF
|
||||
namespace NOM {
|
||||
class Ftc {};
|
||||
}
|
||||
#endif
|
||||
Reference in new issue
Block a user