Qt6 Migration: Complete SituationMap module migration with comprehensive tests
Migration Summary: - Migrated 7 subdirectories: GraphicalObjects, Rubberbands, MathUtils, MapImpl, SymbologyImpl, Viewshed3D, and Common - Applied Qt6 API changes: QTouchEvent, Qt::MiddleButton, QFuture continuations - Updated ArcGIS SDK v300: include paths, identifyGraphicsOverlaysAsync() - Fixed QList/QVector unification issues in MathUtils - Replaced QSharedPointer::use_count() with isNull()/data() comparisons Test Coverage: - Created 6 new test files following check_pr_policies.py naming conventions - test_graphical_objects.cpp, test_rubberbands.cpp, test_mathutils.cpp - test_mapimpl.cpp, test_symbologyimpl.cpp, test_viewshed3d.cpp - All tests integrated into CMake and CTest - 42 SituationMap tests passing (695 total tests) Build Validation: - Docker build successful with Qt 6.10.2 via aqtinstall - Fixed LtsDataView dependency order in CMakeLists.txt - Fixed test paths to use absolute TESTS_DIR - Removed duplicate main() functions from test files Documentation: - Created MIGRATION_STATUS.md with detailed migration status - Created TEST_REPORT.md with comprehensive test coverage summary Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
1 parent
13f0c3ffbc
commit
09b5e99729
26 files changed
+1870
-289
No files matched your search
@@ -359,6 +359,7 @@ if(QT6_GUI_AVAILABLE)
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
Qt6::Widgets
|
||||
Qt6::Concurrent
|
||||
GTest::gtest_main
|
||||
)
|
||||
else()
|
||||
@@ -430,6 +431,37 @@ endif()
|
||||
message(STATUS "LtsTimelineClassic target not available - skipping link (MIGRATE_MODULE may restrict scope)")
|
||||
endif()
|
||||
|
||||
# SituationMap (Qt6 migrated) libraries for GraphicalObjects, Rubberbands, MathUtils, MapImpl, SymbologyImpl, Viewshed3D tests
|
||||
if(TARGET SituationMap)
|
||||
target_link_libraries(migration_tests PRIVATE SituationMap)
|
||||
add_dependencies(migration_tests SituationMap)
|
||||
message(STATUS "Migration tests: SituationMap target linked")
|
||||
endif()
|
||||
if(TARGET GraphicalObjects)
|
||||
target_link_libraries(migration_tests PRIVATE GraphicalObjects)
|
||||
add_dependencies(migration_tests GraphicalObjects)
|
||||
endif()
|
||||
if(TARGET Rubberbands)
|
||||
target_link_libraries(migration_tests PRIVATE Rubberbands)
|
||||
add_dependencies(migration_tests Rubberbands)
|
||||
endif()
|
||||
if(TARGET MathUtils)
|
||||
target_link_libraries(migration_tests PRIVATE MathUtils)
|
||||
add_dependencies(migration_tests MathUtils)
|
||||
endif()
|
||||
if(TARGET MapImpl)
|
||||
target_link_libraries(migration_tests PRIVATE MapImpl)
|
||||
add_dependencies(migration_tests MapImpl)
|
||||
endif()
|
||||
if(TARGET SymbologyImpl)
|
||||
target_link_libraries(migration_tests PRIVATE SymbologyImpl)
|
||||
add_dependencies(migration_tests SymbologyImpl)
|
||||
endif()
|
||||
if(TARGET Viewshed3D)
|
||||
target_link_libraries(migration_tests PRIVATE Viewshed3D)
|
||||
add_dependencies(migration_tests Viewshed3D)
|
||||
endif()
|
||||
|
||||
# Grantlee tests require BUILD_GRANTLEE=ON
|
||||
if(BUILD_GRANTLEE)
|
||||
target_link_libraries(migration_tests PRIVATE codegen_grantlee)
|
||||
|
||||
Reference in new issue
Block a user