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
@@ -53,7 +53,6 @@ endif()
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsFileDialog
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_SOURCE_DIR}/include/FileManagement/
|
||||
${CMAKE_SOURCE_DIR}/include/OperatorManagement/
|
||||
)
|
||||
|
||||
|
||||
Reference in new issue
Block a user