Use distro packages for qt6 library versions

.docker/docker-qgis-build.sh

@@ -60,15 +60,6 @@ fi
 
 CMAKE_EXTRA_ARGS=()
 
-if [[ ${BUILD_WITH_QT6} = "ON" ]]; then
-  CMAKE_EXTRA_ARGS+=(
-   "-DQSCINTILLA_INCLUDE_DIR=/usr/include/qt6"
-   "-DQSCINTILLA_LIBRARY=/usr/lib64/libqscintilla2_qt6.so"
-   "-DQWT_INCLUDE_DIR=/usr/local/qwt-6.2.0/include/"
-   "-DQWT_LIBRARY=/usr/local/qwt-6.2.0/lib/libqwt.so.6"
-  )
-fi
-
 if [[ "${WITH_COMPILE_COMMANDS}" == "ON" ]]; then
   CMAKE_EXTRA_ARGS+=(
     "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"

.docker/qgis3-qt6-build-deps.dockerfile

@@ -36,6 +36,7 @@ RUN dnf -y --refresh install \
     protobuf-lite-devel \
     python3-devel \
     python3-termcolor \
+    qca-qt6-devel \
     qt6-qt3d-devel \
     qt6-qtbase-devel \
     qt6-qtbase-private-devel \
@@ -47,6 +48,9 @@ RUN dnf -y --refresh install \
     qt6-qtdeclarative-devel \
     qt6-qt5compat-devel \
     qt6-qtmultimedia-devel \
+    qtkeychain-qt6-devel \
+    qwt-qt6-devel \
+    qscintilla-qt6-devel \
     spatialindex-devel \
     sqlite-devel \
     unzip \
@@ -65,43 +69,6 @@ RUN dnf -y --refresh install \
     patch \
     dos2unix
 
-RUN cd /usr/src \
-  && wget https://github.com/KDE/qca/archive/refs/heads/master.zip \
-  && unzip master.zip \
-  && rm master.zip \
-  && mkdir build \
-  && cd build \
-  && cmake -DQT6=ON -DBUILD_TESTS=OFF -GNinja -DCMAKE_INSTALL_PREFIX=/usr/local ../qca-master \
-  && ninja install
-
-RUN cd /usr/src \
-  && wget https://github.com/frankosterfeld/qtkeychain/archive/841f31c7ca177e45647fd705200d7fcbeee056e5/master.zip \
-  && unzip master.zip \
-  && rm master.zip \
-  && cd qtkeychain-841f31c7ca177e45647fd705200d7fcbeee056e5 \
-  && cmake -DBUILD_WITH_QT6=ON -DBUILD_TRANSLATIONS=OFF -DCMAKE_INSTALL_PREFIX=/usr/local -GNinja \
-  && ninja install
-
-RUN cd /usr/src \
-  && wget https://sourceforge.net/projects/qwt/files/qwt/6.2.0/qwt-6.2.0.zip/download \
-  && unzip download \
-  && cd qwt-6.2.0 \
-  && dos2unix qwtconfig.pri \
-  && printf '140c140\n< QWT_CONFIG     += QwtExamples\n---\n> #QWT_CONFIG     += QwtExamples\n151c151\n< QWT_CONFIG     += QwtPlayground\n---\n> #QWT_CONFIG     += QwtPlayground\n158c158\n< QWT_CONFIG     += QwtTests\n---\n> #QWT_CONFIG     += QwtTests\n' | patch qwtconfig.pri \
-  && qmake6 qwt.pro \
-  && make -j4 \
-  && make install
-
-
-RUN cd /usr/src \
-  && wget https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.13.3/QScintilla_src-2.13.3.zip \
-  && unzip QScintilla_src-2.13.3.zip \
-  && rm QScintilla_src-2.13.3.zip \
-  && cd QScintilla_src-2.13.3 \
-  && qmake6 src/qscintilla.pro \
-  && make -j4 \
-  && make install
-
 # Oracle : client side
 RUN curl https://download.oracle.com/otn_software/linux/instantclient/199000/instantclient-basic-linux.x64-19.9.0.0.0dbru.zip > instantclient-basic-linux.x64-19.9.0.0.0dbru.zip
 RUN curl https://download.oracle.com/otn_software/linux/instantclient/199000/instantclient-sdk-linux.x64-19.9.0.0.0dbru.zip > instantclient-sdk-linux.x64-19.9.0.0.0dbru.zip