Merge feature/lift-lts-viewer-module-upto-qt6 into feature/regression-arcgis300-symbology-migration
- Integrated LTS viewer module with Qt6 migration - Resolved all merge conflicts by keeping current branch versions - Preserved existing Qt6 migration fixes
This commit is contained in:
1168 files changed
+120814
-323
No files matched your search
@@ -876,6 +876,10 @@ BUILD_GROUP2="$(normalize_on_off "$BUILD_GROUP2" "BUILD_GROUP2")"
|
||||
BUILD_GROUP3="$(normalize_on_off "$BUILD_GROUP3" "BUILD_GROUP3")"
|
||||
BUILD_GROUP4="$(normalize_on_off "$BUILD_GROUP4" "BUILD_GROUP4")"
|
||||
BUILD_GROUP5="$(normalize_on_off "$BUILD_GROUP5" "BUILD_GROUP5")"
|
||||
# Auto-enable BUILD_ARCGIS when BUILD_GROUP5=ON (situationMap depends on advancedSymbology)
|
||||
if [[ "${BUILD_GROUP5}" == "ON" ]]; then
|
||||
BUILD_ARCGIS=ON
|
||||
fi
|
||||
BUILD_GROUP6="$(normalize_on_off "$BUILD_GROUP6" "BUILD_GROUP6")"
|
||||
BUILD_GROUP7="$(normalize_on_off "$BUILD_GROUP7" "BUILD_GROUP7")"
|
||||
BUILD_GROUP8="$(normalize_on_off "$BUILD_GROUP8" "BUILD_GROUP8")"
|
||||
@@ -911,21 +915,47 @@ if [[ "${BUILD_ARCGIS}" == "ON" ]]; then
|
||||
GROUP5_TARGETS=(
|
||||
# Viewer module with ArcGIS (viewer-only subset)
|
||||
situationMapCommon
|
||||
ArcGISQt5Hack
|
||||
situationMapElevationMap
|
||||
situationMapGeometryModel
|
||||
situationMapSideBar
|
||||
advancedSymbology
|
||||
advancedSymbologyXML
|
||||
situationMap
|
||||
LtsDataView
|
||||
LtsDataViewTest
|
||||
# Qt6 Migration Unit Tests
|
||||
test_qt6_api_migrations
|
||||
test_graphical_objects
|
||||
test_rubberbands
|
||||
test_mathutils
|
||||
test_mapimpl
|
||||
test_symbologyimpl
|
||||
test_viewshed3d
|
||||
)
|
||||
else
|
||||
GROUP5_TARGETS=(
|
||||
# Viewer module with ArcGIS (full build)
|
||||
situationMapCommon
|
||||
ArcGISQt5Hack
|
||||
situationMapElevationMap
|
||||
situationMapGeometryModel
|
||||
situationMapSideBar
|
||||
advancedSymbology
|
||||
advancedSymbologyXML
|
||||
situationMap
|
||||
LtsDataView
|
||||
LtsDataViewTest
|
||||
LtsFileDialog
|
||||
LtsFileDialogTest
|
||||
# Qt6 Migration Unit Tests
|
||||
test_qt6_api_migrations
|
||||
test_graphical_objects
|
||||
test_rubberbands
|
||||
test_mathutils
|
||||
test_mapimpl
|
||||
test_symbologyimpl
|
||||
test_viewshed3d
|
||||
)
|
||||
fi
|
||||
else
|
||||
@@ -934,19 +964,43 @@ else
|
||||
GROUP5_TARGETS=(
|
||||
# Viewer module without ArcGIS (viewer-only subset, advancedSymbology requires ArcGIS)
|
||||
situationMapCommon
|
||||
situationMapElevationMap
|
||||
situationMapGeometryModel
|
||||
situationMapSideBar
|
||||
advancedSymbologyXML
|
||||
situationMap
|
||||
LtsDataView
|
||||
LtsDataViewTest
|
||||
# Qt6 Migration Unit Tests
|
||||
test_qt6_api_migrations
|
||||
test_graphical_objects
|
||||
test_rubberbands
|
||||
test_mathutils
|
||||
test_mapimpl
|
||||
test_symbologyimpl
|
||||
test_viewshed3d
|
||||
)
|
||||
else
|
||||
GROUP5_TARGETS=(
|
||||
# Viewer module without ArcGIS (full build)
|
||||
situationMapCommon
|
||||
situationMapElevationMap
|
||||
situationMapGeometryModel
|
||||
situationMapSideBar
|
||||
advancedSymbologyXML
|
||||
situationMap
|
||||
LtsDataView
|
||||
LtsDataViewTest
|
||||
LtsFileDialog
|
||||
LtsFileDialogTest
|
||||
# Qt6 Migration Unit Tests
|
||||
test_qt6_api_migrations
|
||||
test_graphical_objects
|
||||
test_rubberbands
|
||||
test_mathutils
|
||||
test_mapimpl
|
||||
test_symbologyimpl
|
||||
test_viewshed3d
|
||||
)
|
||||
fi
|
||||
fi
|
||||
@@ -1533,6 +1587,7 @@ cd build4
|
||||
|
||||
cmake .. \
|
||||
-DBUILD_TESTING=ON \
|
||||
-DBUILD_SITMAP_UNIT_TESTS=ON \
|
||||
-DBUILD_ALL="${BUILD_ALL}" \
|
||||
-DBUILD_SV="${BUILD_SV}" \
|
||||
-DBUILD_WS="${BUILD_WS}" \
|
||||
|
||||
Reference in new issue
Block a user