- Lts/CMakeLists.txt: restore the cleanup scope (Tools, DDS, Common,
Services, Proxies, Plugins) - the validation version configured only
Lts/Common and TrainingAreaBase, silently dropping the GROUP1 DDS
targets, the GROUP5 tools and the service libraries.
- 11 further scope CMakeLists from cleanup: the validation versions had
removed the per-module unit-test subdirectories (ctest baseline
targets), LtsUtilsGui, and used a stale GeographicLib link style.
- PrtCnv: keep the validation CMAKE_CURRENT_BINARY_DIR include
(generated prtcnvlib_export.h).
- sPDM executable: guard on Lts/Common/LtsWebSocket (pruned, link
orphan) like the sTAB executable.
The merge from story/release-validation-scope only carried files that
existed at the common base or on that branch. In-scope files added on
story/release-2-cleanup after the base (per-module unit-test dirs, the
Release 2 driver and rpmbuild script) were missing, breaking
ADD_SUBDIRECTORY(unit-test) references.
- Restore the 33 missing in-scope files from story/release-2-cleanup.
- Lts/Common/CMakeLists.txt and LtsUtilsGui/CMakeLists.txt: take the
story/release-2-cleanup versions (the validation versions still
reference out-of-scope subdirectories: httq, LtsRestClient,
LtsWebSocket, ConnectDialog, StyleManager).
Bring the validation-scope line (in-tree Jenkins CI copy, lcov coverage
wiring, step-by-step release-scope README, TetraIF unit tests, the
LogView runtime icon/resource fix, Dockerfile, rpmbuild and the
new_docker_build.sh driver with the DEB output path) on top of the
XmlPatterns branch pruned to the Release 2 scope.
Conflict policy:
- Out-of-scope targets/modules: keep the prune (deletion wins).
- In-scope files that validation had deleted: restored from
story/release-2-cleanup (the Release 2 closure, with the
pruned-module guards).
- In-scope sources carrying migration work: XmlPatterns versions
(Qt XmlPatterns rework on QDomDocument, DDS member and logger
fixes, first-build fixes).
- Scope-aware CMakeLists (top level, PluginInterfaces, LtsWidgets)
and .envrc: story/release-2-cleanup / ours versions.
Delete everything that is not part of the Release 2 build closure
defined by the story/release-2-cleanup README (46 targets,
GROUP1/3/5/6): out-of-scope Lts modules (Viewer, OSG/BuildingViewer
floor, Schusstafel, MSDL/SAAB import tools, ...), the include/ stub
surplus, tests/, specs/, translations/, the migration report files,
cmake/FindOpenSceneGraph.cmake, external/Schusstafel and the legacy
new_docker_build.sh driver.
In-scope files keep the XmlPatterns-branch versions (Qt XmlPatterns
rework on QDomDocument, BZip2 nglcompression, first-build fixes).
Tracked file count: 16140 -> 2166.
- QT5_ADD_RESOURCES was a no-op stub under Qt6, silently dropping .qrc
files: LogView's :/image/* icons were never compiled into the binary.
Map the stub onto qt6_add_resources() (outfiles-variable form, which
appends the generated qrc_*.cpp to the source list). LogView is the
only caller of the stub.
- nglwidgets' Qt6 branch only processed rme_light_style.qrc;
nglresources.qrc (which provides :icons/16x16/* toolbar/window icons)
was left as a raw file in the source list and never compiled
(CMAKE_AUTORCC is off). Process both qrcs.
- LogView never loads libnglwidgets.so at runtime (--as-needed drops it:
the code uses no nglwidgets symbols), so its :icons/16x16 resources
were never registered for the app. Embed the 20 icons LogView actually
uses directly into LogViewResources.qrc with explicit aliases (rcc
rejects XML comments in .qrc and, without an alias, registers the full
relative path as the resource name).
- Guard the Lts/Viewer include paths with if(EXISTS): the module is
outside the release scope, and the unguarded include_directories
emitted -Wmissing-include-dirs for every translation unit
- nglpdfpage: initialize m_rotation before m_scaleFactor to match the
member declaration order (-Wreorder)
- Z/src/qsql_informix/qsql_informix.cpp: Fixed QTextCodec include path
(QtCore → QtGui) as QTextCodec moved to QtGui module in Qt6
- Z/src/qsql_informix/CMakeLists.txt: Added Qt6::Gui dependency required
for QTextCodec
- Lts/Tools/TextEditorTest/textedit.cpp: Fixed Qt::codecForHtml →
QTextCodec::codecForHtml (static method on QTextCodec class in Qt6)
These are minimal fixes required for Qt6 compatibility. QTextCodec is now
part of QtGui module and codecForHtml is a static method on QTextCodec
class rather than Qt namespace function.
Co-authored-by: Copilot <2235566219+Copilot@users.noreply.github.com>
- cmake/FindRTI.cmake: Add INTERFACE placeholder targets when RTI not found
- cmake/FindRTI.cmake: Force BUILD_RTI=OFF when RTI not installed
- Lts/Common/LtsSession/CMakeLists.txt: Make LtsSessionDataDds conditional on BUILD_RTI
- Lts/Viewer/CMakeLists.txt: Make LtsDataView conditional on BUILD_RTI
- Lts/Plugins/*/CMakeLists.txt: 97 plugin files wrapped in BUILD_RTI conditionals
- cmake/NGLMacros.cmake: Fix NGL_ADD_BIG_RESOURCES macro (removed premature return())
- Multiple Qt6 API fixes: QLinkedList→std::list, QStringRef→QStringView, etc.
- BUILD_RTI_FIXES_SUMMARY.md: Comprehensive documentation of all fixes
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>