Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,60 @@
|
||||
# $Id$
|
||||
# $HeadURL$
|
||||
#
|
||||
# installieren laut wiki und make.py
|
||||
# dst_dir=/usr/src/packages/BUILDROOT/ctc_ngs_tes_uae_apache-4.3-2.x86_64/opt/NGS (opensuse < 12)
|
||||
# dst_dir=${HOME}/rpmbuild/BUILDROOT/ctc_ngs_tes_uae_apache-4.3-2.x86_64/opt/NGS (opensuse >= 12.x)
|
||||
# mkdir -p $dst_dir
|
||||
# cp -r /opt/NGS/* $dst_dir
|
||||
# rpmbuild -bb ctc_ngs_tes_uae_apache.spec
|
||||
#
|
||||
Summary: CTC Office Integration
|
||||
Name: ctc_libre_office_integration
|
||||
#Version: @VERSION@
|
||||
#Release: @RELEASE@
|
||||
Version: 1
|
||||
Release: 10
|
||||
License: proprietary
|
||||
Group: Applications/Communications
|
||||
Prefix: /
|
||||
Vendor: Rheinmetall Electronics GmbH
|
||||
URL: http://www.rheinmetall-electronics.de
|
||||
Packager: ctc
|
||||
Provides: ctc_libre_office_integration
|
||||
AutoReqProv: no
|
||||
Requires: java-1_8_0-openjdk
|
||||
Requires: libreoffice-base
|
||||
Requires: libreoffice-calc
|
||||
Requires: libreoffice-impress
|
||||
Requires: libreoffice-writer
|
||||
|
||||
|
||||
%description
|
||||
CTC Libre Office Integration
|
||||
|
||||
%changelog
|
||||
#* date +"%a %b %d %Y" text
|
||||
* Mon Aug 23 2021 PK
|
||||
- fixed missing shortcut actions
|
||||
* Wed Feb 19 2020 PK
|
||||
- update requirements and add unopkg actions
|
||||
* Mon Feb 17 2020 PK
|
||||
- initial
|
||||
|
||||
%files
|
||||
%defattr(-,ctc,ctc)
|
||||
"%{prefix}//opt/libreOfficeAddin/"
|
||||
|
||||
%pre
|
||||
%post
|
||||
# add plugin
|
||||
unopkg add --force --shared %{prefix}//opt/libreOfficeAddin/RmeOfficeInt.oxt
|
||||
|
||||
|
||||
%preun
|
||||
# nur im uninstall-Fall
|
||||
if [ $1 -eq 0 ]; then
|
||||
unopkg remove --force --shared %{prefix}//opt/libreOfficeAddin/RmeOfficeInt.oxt
|
||||
# rm -f $RPM_INSTALL_PREFIX//opt/libreOfficeAddin/
|
||||
fi
|
||||
%postun
|
||||
Reference in new issue
Block a user