Qt 6.8.4

Author: selsta

.dockerignore

@@ -1,3 +1 @@
 *
-!.github/
-!.github/qt_helper.py

.github/workflows/build.yml

@@ -90,13 +90,13 @@ jobs:
       - name: install dependencies
         run: HOMEBREW_NO_AUTO_UPDATE=1 brew install boost hidapi libsodium ninja openssl pkg-config protobuf unbound zeromq aria2
       - name: download Qt
-        run: mkdir qt6.8.3 && cd qt6.8.3 && python3 ../monero-gui/.github/qt_helper.py mac_x64 desktop 6.8.3 clang_64 c9cdbe2ad3d34cf6e675a7e6eaf5a16560a51305dd06aed97b8d93359b1b90fa
+        run: mkdir qt6.11.1 && cd qt6.11.1 && python3 ../monero-gui/.github/qt_helper.py mac_x64 desktop 6.11.1 clang_64 4a88665d61643410399e15d2cc7625cca62d7f5a005d88c02a1e17dde7d9f62c
         working-directory: ../
       - name: configure
         run: >
           cmake -S . -B build -G Ninja
-          -D CMAKE_PREFIX_PATH="/Users/runner/work/monero-gui/qt6.8.3/"
-          -D CMAKE_OSX_DEPLOYMENT_TARGET="12.0"
+          -D CMAKE_PREFIX_PATH="/Users/runner/work/monero-gui/qt6.11.1/"
+          -D CMAKE_OSX_DEPLOYMENT_TARGET="13.0"
           -D ARCH=default
       - name: build
         run: cmake --build build

Dockerfile.android

@@ -1,14 +1,12 @@
 FROM debian:bookworm
 
 ARG THREADS=1
-ARG QT_VERSION=v6.8.3
-ARG QT_COMMIT=bab1fecd556ea561c4a89686293116741acfa1b4
+ARG QT_VERSION=v6.8.4-lts-lgpl
+ARG QT_COMMIT=487fcaa501534f0906dd2c19714f9052164142fc
 ARG ANDROID_NDK_REVISION=26d
 ARG ANDROID_NDK_HASH=eefeafe7ccf177de7cc57158da585e7af119bb7504a63604ad719e4b2a328b54
 ARG ANDROID_SDK_REVISION=11076708_latest
 ARG ANDROID_SDK_HASH=2d2d50857e4eb553af5a6dc3ad507a17adf43d115264b1afc116f95c92e5e258
-ARG QT_HOST_VERSION=6.8.3
-ARG QT_HOST_SHA256=8bbea76f5298021048f54c3e2934d7a73e2e6498ebc5a0cb30de16e24a66d847
 
 WORKDIR /opt/android
 ENV WORKDIR=/opt/android
@@ -28,9 +26,9 @@ ENV TOOLCHAIN_DIR=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update \
-    && apt-get install -y ant aria2 automake build-essential ca-certificates-java file gettext git libc6 libncurses5 \
+    && apt-get install -y ant automake build-essential ca-certificates-java file gettext git libc6 libncurses5 \
     libdbus-1-3 libegl1 libfontconfig1 libfreetype6 libgl1 libglib2.0-0 libgssapi-krb5-2 libssl-dev \
-    libstdc++6 libtinfo5 libtool libx11-6 libxkbcommon0 libz1 libzstd1 libarchive-tools ninja-build openjdk-17-jdk-headless \
+    libstdc++6 libtinfo5 libtool libx11-6 libxkbcommon0 libz1 libzstd1 ninja-build openjdk-17-jdk-headless \
     openjdk-17-jre-headless pkg-config python3 unzip wget \
     && rm -rf /var/lib/apt/lists/*
 
@@ -63,20 +61,19 @@ RUN git clone -b v4.3.3 --depth 1 https://github.com/Kitware/CMake \
 ENV HOST_PATH=${PATH}
 ENV PATH=${TOOLCHAIN_DIR}/aarch64-linux-android/bin:${TOOLCHAIN_DIR}/bin:${PATH}
 
-COPY .github/qt_helper.py /tmp/qt_helper.py
-
-RUN mkdir -p "${QT_HOST_PREFIX}" \
+RUN git clone https://github.com/qt/qt5.git -b ${QT_VERSION} --depth 1 qt-sources \
+    && git -C qt-sources reset --hard ${QT_COMMIT} \
+    && mkdir -p "${QT_HOST_PREFIX}" \
     && cd "${QT_HOST_PREFIX}" \
-    && python3 /tmp/qt_helper.py linux_x64 desktop "${QT_HOST_VERSION}" linux_gcc_64 "${QT_HOST_SHA256}" \
-        --add-package addons.qtshadertools \
-        --archive 'qtbase-*.7z' \
-        --archive 'qtdeclarative-*.7z' \
-        --archive 'qttools-*.7z' \
-        --archive 'icu-*.7z' \
-        --archive 'qtshadertools-*.7z' \
-    && rm /tmp/qt_helper.py \
-    && printf '%s\n%s\n' "${QT_HOST_PREFIX}/lib" "${QT_HOST_PREFIX}" > /etc/ld.so.conf.d/qt-host.conf \
-    && ldconfig
+    && PATH=${HOST_PATH} ../qt-sources/configure -init-submodules \
+        -submodules qtbase,qtdeclarative,qtshadertools,qtsvg,qttools \
+        -developer-build \
+        -opensource \
+        -confirm-license \
+        -release \
+        -nomake examples \
+        -nomake tests \
+    && PATH=${HOST_PATH} cmake --build . --parallel ${THREADS} --target host_tools
 
 ARG ZLIB_VERSION=1.3.1
 ARG ZLIB_HASH=9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
@@ -90,9 +87,7 @@ RUN wget -q https://github.com/madler/zlib/releases/download/v${ZLIB_VERSION}/zl
     && make -j${THREADS} install \
     && rm -rf $(pwd)
 
-RUN git clone https://github.com/qt/qt5.git -b ${QT_VERSION} --depth 1 qt-sources \
-    && git -C qt-sources reset --hard ${QT_COMMIT} \
-    && mkdir qt-build-android \
+RUN mkdir qt-build-android \
     && cd qt-build-android \
     && PATH=${HOST_PATH} ../qt-sources/configure -init-submodules \
         -submodules qtbase,qtdeclarative,qtshadertools,qtsvg,qttools \

Dockerfile.linux

@@ -1,8 +1,8 @@
 FROM ubuntu:20.04
 
 ARG THREADS=1
-ARG QT_VERSION=v6.8.3
-ARG QT_COMMIT=bab1fecd556ea561c4a89686293116741acfa1b4
+ARG QT_VERSION=v6.8.4-lts-lgpl
+ARG QT_COMMIT=487fcaa501534f0906dd2c19714f9052164142fc
 
 ENV CFLAGS="-fPIC"
 ENV CPPFLAGS="-fPIC"

Dockerfile.windows

@@ -1,9 +1,8 @@
 FROM ubuntu:24.04
 
 ARG THREADS=1
-ARG QT_VERSION=6.8.3
-ARG QT_COMMIT=bab1fecd556ea561c4a89686293116741acfa1b4
-ARG QT_HOST_SHA256=8bbea76f5298021048f54c3e2934d7a73e2e6498ebc5a0cb30de16e24a66d847
+ARG QT_VERSION=v6.8.4-lts-lgpl
+ARG QT_COMMIT=487fcaa501534f0906dd2c19714f9052164142fc
 
 ENV SOURCE_DATE_EPOCH=1397818193
 ENV QT_HOST_PATH=/opt/qt-host
@@ -15,7 +14,6 @@ RUN apt update && \
     DEBIAN_FRONTEND=noninteractive apt install -y \
     autoconf \
     automake \
-    aria2 \
     autopoint \
     bison \
     build-essential \
@@ -27,7 +25,6 @@ RUN apt update && \
     gettext \
     git \
     gperf \
-    libarchive-tools \
     libdbus-1-3 \
     libfontconfig1-dev \
     libglib2.0-0 \
@@ -55,24 +52,19 @@ RUN git clone -b v0.18.5.1 --depth 1 https://github.com/monero-project/monero &&
 
 RUN make -j"$THREADS" -C /depends HOST=x86_64-w64-mingw32
 
-COPY .github/qt_helper.py /tmp/qt_helper.py
-
-# Reuse Qt's matching Linux host tools instead of compiling them from source.
-RUN mkdir -p "${QT_HOST_PATH}" \
-    && cd "${QT_HOST_PATH}" \
-    && python3 /tmp/qt_helper.py linux_x64 desktop "${QT_VERSION}" linux_gcc_64 "${QT_HOST_SHA256}" \
-        --add-package addons.qtshadertools \
-        --archive 'qtbase-*.7z' \
-        --archive 'qtdeclarative-*.7z' \
-        --archive 'qttools-*.7z' \
-        --archive 'icu-*.7z' \
-        --archive 'qtshadertools-*.7z' \
-    && rm /tmp/qt_helper.py \
-    && printf '%s\n%s\n' "${QT_HOST_PATH}/lib" "${QT_HOST_PATH}" > /etc/ld.so.conf.d/qt-host.conf \
-    && ldconfig
-
-RUN git clone https://github.com/qt/qt5.git -b "v${QT_VERSION}" --depth 1 qt-sources && \
+RUN git clone https://github.com/qt/qt5.git -b "${QT_VERSION}" --depth 1 qt-sources && \
     git -C qt-sources reset --hard "${QT_COMMIT}" && \
+    mkdir -p "${QT_HOST_PATH}" && \
+    cd "${QT_HOST_PATH}" && \
+    /qt-sources/configure -init-submodules \
+    -submodules qtbase,qtdeclarative,qtshadertools,qtsvg,qttools \
+    -developer-build \
+    -opensource \
+    -confirm-license \
+    -release \
+    -nomake examples \
+    -nomake tests && \
+    cmake --build . --parallel "$THREADS" --target host_tools && \
     mkdir /qt-target-build && \
     cd /qt-target-build && \
     /qt-sources/configure -init-submodules \