Qt6 migration: LtsWidgets API fixes, LtsWebSocket logger init, RTI Docker install
- LtsWidgets: Fixed Qt6 API compatibility issues - QWheelEvent::delta() → angleDelta().y() - QStyleOption::init() → initFrom() - QComboBox activated signal signature change - QTextCodec removal (UTF-8 default in Qt6) - Missing widget includes added - LtsWebSocket: Fixed m_logger reference initialization - Added NGLLoggerBootstrap includes - Proper initialization in constructor initializer lists - CMake: Added BUILD_LTSWEBSOCKET option for temporary exclusion - Docker: RTI Connext permanent installation script added - ci/install-rti-in-docker.sh for persistent RTI setup - Removes need for volume mounting RTI into container - BUILD options: FilterManagement, RTI, Codification, Grantlee, LtsWebSocket can be disabled for partial builds during migration Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
69 files changed
+12765
-14202
No files matched your search
+42
-1
@@ -18,9 +18,50 @@ RUN apt-get update && \
|
||||
qt6-base-dev \
|
||||
qt6-base-dev-tools \
|
||||
qt6-tools-dev \
|
||||
qt6-tools-dev-tools && \
|
||||
qt6-tools-dev-tools \
|
||||
qt6-svg-dev \
|
||||
qt6-websockets-dev \
|
||||
qt6-serialport-dev \
|
||||
qt6-multimedia-dev \
|
||||
qt6-declarative-dev \
|
||||
libpoppler-qt6-dev \
|
||||
libpq-dev \
|
||||
libbz2-dev \
|
||||
libboost-all-dev \
|
||||
libxml2-dev \
|
||||
libssl-dev \
|
||||
libcurl4-openssl-dev && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install Log4Qt for Qt6
|
||||
RUN git clone --depth 1 https://github.com/MEONMedical/Log4Qt.git /tmp/log4qt && \
|
||||
cd /tmp/log4qt && \
|
||||
mkdir -p build && cd build && \
|
||||
cmake -DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_CXX_STANDARD=20 \
|
||||
-DCMAKE_CXX_EXTENSIONS=OFF \
|
||||
-DCMAKE_PREFIX_PATH="/usr" \
|
||||
-DCMAKE_INSTALL_PREFIX="/usr/local" \
|
||||
-DBUILD_SHARED_LIBS=ON .. && \
|
||||
cmake --build . -- -j$(nproc) && \
|
||||
cmake --install . && \
|
||||
rm -rf /tmp/log4qt
|
||||
|
||||
# Create minimal CMake config for Log4Qt
|
||||
RUN mkdir -p /usr/local/lib/cmake/Log4Qt && \
|
||||
cat > /usr/local/lib/cmake/Log4Qt/Log4QtConfig.cmake << 'EOF'
|
||||
if (NOT TARGET Log4Qt::log4qt)
|
||||
add_library(Log4Qt::log4qt UNKNOWN IMPORTED)
|
||||
set_target_properties(Log4Qt::log4qt PROPERTIES
|
||||
IMPORTED_LOCATION "/usr/local/lib/liblog4qt.so"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "/usr/local/include"
|
||||
)
|
||||
endif()
|
||||
set(Log4Qt_FOUND TRUE CACHE INTERNAL "Log4Qt found by package config")
|
||||
set(Log4Qt_INCLUDE_DIRS "/usr/local/include" CACHE INTERNAL "Log4Qt include dir")
|
||||
set(Log4Qt_LIBRARIES "/usr/local/lib/liblog4qt.so" CACHE INTERNAL "Log4Qt library")
|
||||
EOF
|
||||
|
||||
# Set Qt platform for headless testing
|
||||
ENV QT_QPA_PLATFORM=offscreen
|
||||
|
||||
|
||||
Executable
+36
@@ -0,0 +1,36 @@
|
||||
#!/bin/bash
|
||||
# Install RTI Connext into existing Docker image
|
||||
|
||||
set -e
|
||||
|
||||
RTI_SOURCE="/home/torsten/swy/sandbox/external/rti_connext_dds-7.7.0"
|
||||
BASE_IMAGE="lifemaps/ci-cpp:latest"
|
||||
TARGET_IMAGE="lifemaps/ci-cpp:rti"
|
||||
|
||||
echo "Step 1: Create container from base image..."
|
||||
CONTAINER_ID=$(docker create --name rti-install-temp $BASE_IMAGE /bin/bash)
|
||||
|
||||
echo "Step 2: Copy RTI Connext into container..."
|
||||
docker cp "$RTI_SOURCE" "$CONTAINER_ID:/opt/rti_connext_dds-7.7.0"
|
||||
|
||||
echo "Step 3: Commit container as new image..."
|
||||
docker commit $CONTAINER_ID $TARGET_IMAGE
|
||||
|
||||
echo "Step 4: Remove temporary container..."
|
||||
docker rm $CONTAINER_ID
|
||||
|
||||
echo "Step 5: Set environment variables in image..."
|
||||
docker run --rm $TARGET_IMAGE /bin/bash -c '
|
||||
echo "RTI Connext installed successfully"
|
||||
ls -la /opt/rti_connext_dds-7.7.0 | head -10
|
||||
'
|
||||
|
||||
echo ""
|
||||
echo "RTI Connext installed in image: $TARGET_IMAGE"
|
||||
echo "To use this image, set environment variables:"
|
||||
echo " docker run -e RTI_CONNEXT_HOME=/opt/rti_connext_dds-7.7.0 \\"
|
||||
echo " -e NDDSHOME=/opt/rti_connext_dds-7.7.0 \\"
|
||||
echo " -e PATH=/opt/rti_connext_dds-7.7.0/bin:\$PATH \\"
|
||||
echo " -e LD_LIBRARY_PATH=/opt/rti_connext_dds-7.7.0/lib/x64Linux4gcc7.3.0:\$LD_LIBRARY_PATH \\"
|
||||
echo " -e CMAKE_PREFIX_PATH=/opt/rti_connext_dds-7.7.0/lib/cmake:\$CMAKE_PREFIX_PATH \\"
|
||||
echo " $TARGET_IMAGE"
|
||||
Reference in new issue
Block a user