lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt6 migration fixes: RTI DDS alias targets, ErrorMessage namespace, DDS header include path

Browse Source
This commit is contained in:
torsten committed 2026-08-27 09:02:26 +02:00
1 parent 8050bca545
commit bb1447c858
18635 files changed
+2466913 -906310
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

build-rti-off/Lts/Plugins/AssetManagement/Data/CMakeFiles/AsmDataPlugin_autogen.dir/AutogenInfo.json
+6
View File
@@ -83,8 +83,14 @@
"/repo/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase",
"/repo/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement",
"/repo/build-rti-off/Lts/Services/ProjectDataManagement",
"/repo/qt6-after/qt6-migrated-legatus/include/InfrastructureManagement",
"/repo/build-rti-off/Lts/Services/InfrastructureManagement",
"/repo/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat",
"/repo/qt6-after/qt6-migrated-legatus/Lts/DDS",
"/repo/qt6-after/qt6-migrated-legatus/Lts/Common",
"/repo/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils",
"/repo/build-rti-off/Lts/Common/LtsUtils/LtsUtilsCore",
"/repo/qt6-after/qt6-migrated-legatus/include/Viewer/SituationMap",
"/repo/qt6-after/qt6-migrated-legatus/Lts/Services",
"/repo/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement",
"/repo/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView",
build-rti-off/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/CMakeFiles/AsmGuiPlugin_autogen.dir/AutogenInfo.json
+6 -11
View File
@@ -175,7 +175,6 @@
"QT_NO_CAST_TO_ASCII",
"QT_NO_FOREACH",
"QT_NO_URL_CAST_FROM_STRING",
"QT_SQL_LIB",
"QT_STRICT_ITERATORS",
"QT_SVG_LIB",
"QT_USE_QSTRINGBUILDER",
@@ -204,8 +203,14 @@
"/repo/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase",
"/repo/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement",
"/repo/build-rti-off/Lts/Services/ProjectDataManagement",
"/repo/qt6-after/qt6-migrated-legatus/include/InfrastructureManagement",
"/repo/build-rti-off/Lts/Services/InfrastructureManagement",
"/repo/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat",
"/repo/qt6-after/qt6-migrated-legatus/Lts/DDS",
"/repo/qt6-after/qt6-migrated-legatus/Lts/Common",
"/repo/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils",
"/repo/build-rti-off/Lts/Common/LtsUtils/LtsUtilsCore",
"/repo/qt6-after/qt6-migrated-legatus/include/Viewer/SituationMap",
"/repo/qt6-after/qt6-migrated-legatus/Lts/Services",
"/repo/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement",
"/repo/qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView",
@@ -224,7 +229,6 @@
"/repo/qt6-after/qt6-migrated-legatus/Lts/Common",
"/repo/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui",
"/repo/qt6-after/qt6-migrated-legatus/Lts/Common",
"/repo/build-rti-off/Lts/Common/LtsUtils/LtsUtilsCore",
"/repo/build-rti-off/Lts/Common/LtsUtils",
"/repo/qt6-after/qt6-migrated-legatus/Lts/Common",
"/repo/build-rti-off/Lts/Common",
@@ -238,14 +242,6 @@
"/repo/qt6-after/qt6-migrated-legatus/Lts/Common",
"/repo/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession",
"/repo/qt6-after/qt6-migrated-legatus/Lts/Plugins",
"/repo/build-rti-off/Lts/Services",
"/repo/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement",
"/repo/qt6-after/qt6-migrated-legatus/Lts/Services",
"/repo/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/stubs",
"/repo/build-rti-off/Lts/Services/ProjectDataManagement/stubs",
"/repo/build-rti-off/Z/src/ngldb",
"/repo/build-rti-off/Z/src",
"/repo/qt6-after/qt6-migrated-legatus/Z/src",
"/repo/qt6-after/qt6-migrated-legatus/Lts/Plugins",
"/repo/qt6-after/qt6-migrated-legatus/Lts",
"/repo/build-rti-off/Lts/Common/LtsCoordTrans",
@@ -264,7 +260,6 @@
"/opt/Qt/6.10.2/gcc_64/mkspecs/linux-g++",
"/opt/Qt/6.10.2/gcc_64/include/QtWidgets",
"/opt/Qt/6.10.2/gcc_64/include/QtGui",
"/opt/Qt/6.10.2/gcc_64/include/QtSql",
"/opt/Qt/6.10.2/gcc_64/include/QtSvg",
"/usr/include",
"/usr/include/c++/15",
build-rti-off/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/cmake_install.cmake
+1 -1
View File
@@ -54,7 +54,7 @@ if(CMAKE_INSTALL_COMPONENT STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT
NOT IS_SYMLINK "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/WS/lib/libAsmGuiPlugin.so")
file(RPATH_CHANGE
FILE "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/WS/lib/libAsmGuiPlugin.so"
OLD_RPATH "/repo/build-rti-off/lib:/opt/Qt/6.10.2/gcc_64/lib:/repo/qt6-after/qt6-migrated-legatus/include/GeographicLib/lib:/usr/local/lib:"
OLD_RPATH "/repo/build-rti-off/lib:/repo/qt6-after/qt6-migrated-legatus/include/GeographicLib/lib:/usr/local/lib:/opt/Qt/6.10.2/gcc_64/lib:"
NEW_RPATH "")
if(CMAKE_INSTALL_DO_STRIP)
execute_process(COMMAND "/usr/bin/strip" "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/WS/lib/libAsmGuiPlugin.so")