Enable and fix Qt6 build CI test

qgis · Jul 18, 2021 · 6639d73 · 6639d73
1 parent 0a4c5ba
commit 6639d73
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/.docker/docker-qgis-build-qt6.sh b/.docker/docker-qgis-build-qt6.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-mkdir /usr/src/qgis/build
-cd /usr/src/qgis/build || exit 1
+mkdir -p /usr/src/qgis/build-qt6
+cd /usr/src/qgis/build-qt6 || exit 1
 
 CLANG_WARNINGS="-Wrange-loop-construct"
 
@@ -20,6 +20,7 @@ cmake -GNinja \
  -DWITH_QTWEBKIT=OFF \
  -DWITH_QT5SERIALPORT=OFF \
  -DSUPPRESS_QT_WARNINGS=ON \
+ -DENABLE_TESTS=OFF \
  -DENABLE_MODELTEST=ON \
  -DENABLE_PGTEST=OFF \
  -DENABLE_SAGA_TESTS=OFF \
@@ -33,6 +34,7 @@ cmake -GNinja \
  -DWITH_BINDINGS=OFF \
  -DWITH_SERVER=OFF \
  -DWITH_ORACLE=OFF \
+ -DWITH_OAUTH2_PLUGIN=OFF \
  -DDISABLE_DEPRECATED=ON \
  -DCXX_EXTRA_FLAGS="${CLANG_WARNINGS}" \
  -DCMAKE_C_COMPILER=/bin/clang \

diff --git a/.docker/qgis3-qt6-build-deps.dockerfile b/.docker/qgis3-qt6-build-deps.dockerfile
@@ -6,6 +6,7 @@ RUN dnf -y install \
     clang \
     clazy \
     exiv2-devel \
+    expat-devel \
     fcgi-devel \
     flex \
     gdal-devel \
@@ -19,6 +20,7 @@ RUN dnf -y install \
     proj-devel \
     protobuf-devel \
     protobuf-lite-devel \
+    python3-devel \
     qt6-qt3d-devel \
     qt6-qtbase-devel \
     qt6-qttools-static \
@@ -30,10 +32,10 @@ RUN dnf -y install \
 
 
 RUN dnf -y install wget openssl-devel && cd /usr/src \
-  && wget https://github.com/KDE/qca/archive/refs/heads/qt6.zip \
-  && unzip qt6.zip \
-  && cd qca-qt6 \
-  && cmake -DCMAKE_INSTALL_PREFIX=/usr -GNinja \
+  && wget https://github.com/KDE/qca/archive/refs/tags/v2.3.3.zip \
+  && unzip v2.3.3.zip \
+  && cd qca-2.3.3 \
+  && cmake -DCMAKE_INSTALL_PREFIX=/usr -DQT6=ON -GNinja \
   && ninja install
 
 RUN dnf -y install libsecret-devel && cd /usr/src \

diff --git a/.github/workflows/qt6.disabled → .github/workflows/qt6.yml b/.github/workflows/qt6.disabled → .github/workflows/qt6.yml