Merge feature/Re-implement-XmlPatterns into action/merge-regress-arcgis-symbolo-with-reimplement-xmlpattern
Integrates the XmlPatterns reimplementation branch which: - Re-implements MSDL/SAAB import without Qt XmlPatterns using Qt6 QDomDocument - Adds xsdcxx and XercesC dependencies for MSDL plugin - Adds Schusstafel and KDChart resolution functions - Enables BUILD_WLS, BUILD_FILTERMANAGEMENT, BUILD_PLUGINS_SERVICEMONITOR, BUILD_WEBENGINE_PLUGINS, and BUILD_XMLPATTERNS_PLUGINS options - Updates GROUP4 to include svcWirelessLocationSystem and wlsJsonClientTest by default - Fixes Qt6 API changes (QStringRef removal, etc.) Conflict resolutions: - visitors.cpp: Kept Qt6-compatible QString code (no QStringView include needed) - new_docker_build.sh: Merged new build options and resolution functions
This commit is contained in:
53 files changed
+940
-531
No files matched your search
@@ -219,8 +219,12 @@ OPTION(BUILD_PLUGINS_PLANEDITOR "Build PlanEditor plugin (requires Qt6 WebEngine
|
||||
OPTION(BUILD_PLUGINS_ONLINEHELP "Build OnlineHelp plugin (requires Qt6 WebEngine)" OFF)
|
||||
OPTION(BUILD_PLUGINS_SERVICEMONITOR "Build ServiceMonitor plugin (requires Qt6 WebEngine)" OFF)
|
||||
OPTION(BUILD_PLUGINS_PARTICIPANT_ORG_CHART "Build ParticipantOrgChart (requires Qt6 WebEngine)" OFF)
|
||||
OPTION(BUILD_PLUGINS_MSDL "Build MSDL module (requires Qt6 XmlPatterns)" OFF)
|
||||
OPTION(BUILD_PLUGINS_SAAB "Build Saab module (requires Qt6 XmlPatterns)" OFF)
|
||||
# MSDL/Saab no longer require Qt XmlPatterns (removed in Qt 6.0): their import
|
||||
# code was re-implemented with Qt6::Xml (QDomDocument) for the schema check plus
|
||||
# the external xmllint step for real XSD validation; MSDL additionally links
|
||||
# XercesC + uses xsdc++-generated tree classes (needs libxerces-c-dev + xsdcxx).
|
||||
OPTION(BUILD_PLUGINS_MSDL "Build MSDL module (needs XercesC + xsdc++)" OFF)
|
||||
OPTION(BUILD_PLUGINS_SAAB "Build Saab module (Qt6::Xml only)" OFF)
|
||||
OPTION(BUILD_RTI "Build RTI Connext DDS dependent modules" OFF)
|
||||
OPTION(BUILD_VIEWER_ONLY "Build only Viewer module (no RTI required)" OFF)
|
||||
# Add Lts/ include path globally for QosProfile and other Lts headers
|
||||
@@ -369,6 +373,27 @@ if(NOT Qt6_FOUND)
|
||||
message(STATUS "Found Qt6 (minimal): ${Qt6Core_VERSION}")
|
||||
endif()
|
||||
|
||||
# MSDL/Saab import libs (gated by BUILD_PLUGINS_MSDL / BUILD_PLUGINS_SAAB) no
|
||||
# longer use Qt XmlPatterns (QXmlSchema/QXmlSchemaValidator), which was removed
|
||||
# in Qt 6.0. They were re-implemented with Qt6::Xml (QDomDocument) for the
|
||||
# schema well-formedness check plus the external xmllint step for real XSD
|
||||
# validation; MSDL additionally links XercesC and uses xsdc++-generated tree
|
||||
# classes. No Qt6::XmlPatterns lookup is needed any more.
|
||||
|
||||
# Qt6::WebChannel (consumed by PpmOrgChartGuiPlugin's QWebChannel page setup):
|
||||
# in Qt5 Qt5::WebEngineWidgets transitively linked Qt5::WebChannel (Qt5's
|
||||
# webengine depended on webchannel), but Qt6 dropped that dependency, so the
|
||||
# module must be found and linked explicitly. Separate QUIET find - never let
|
||||
# a missing optional component flip Qt6_FOUND off.
|
||||
if(NOT TARGET Qt6::WebChannel)
|
||||
find_package(Qt6 6.2 COMPONENTS WebChannel QUIET)
|
||||
if(Qt6WebChannel_FOUND)
|
||||
message(STATUS "Found Qt6WebChannel")
|
||||
else()
|
||||
message(STATUS "Qt6WebChannel not found (PpmOrgChartGuiPlugin requires it; keep BUILD_PLUGINS_PARTICIPANT_ORG_CHART OFF)")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# Manual Qt6 configuration - create imported targets for available libraries
|
||||
if(NOT TARGET Qt6::Core)
|
||||
find_package(Qt6 6.2 COMPONENTS Core REQUIRED)
|
||||
|
||||
Reference in new issue
Block a user