Build on Qt 6

openscad · Jan 8, 2024 · 8757a0d · 8757a0d
1 parent 3898004
commit 8757a0d
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 27 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -12,14 +12,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-20.04, ubuntu-22.04 ]
+        os: [ ubuntu-22.04 ]
         include:
-          - os: ubuntu-20.04
-            distro: focal
-            qt5default: true
           - os: ubuntu-22.04
             distro: kinetic
-            qt5default: false
 
     runs-on: ${{ matrix.os }}
 
@@ -33,9 +29,6 @@ jobs:
       run: ./scripts/github-ci-linux-get-dependencies.sh ${{ matrix.distro }}
     - name: Dependency fixup
       run: sudo apt-get install gettext gcovr
-    - name: Make Qt5 the default
-      if: ${{ matrix.qt5default }}
-      run: sudo apt-get install qt5-default
     - uses: actions/setup-python@v4
       with:
         python-version: '3.11'

diff --git a/.github/workflows/macos-tests.yml b/.github/workflows/macos-tests.yml
@@ -32,7 +32,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_UNITY_BUILD=ON -DEXPERIMENTAL=ON -DSNAPSHOT=ON
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_UNITY_BUILD=ON -DEXPERIMENTAL=ON -DSNAPSHOT=ON -DUSE_QT6=ON
         export NUMCPU=$(($(sysctl -n hw.ncpu) * 3 / 2))
         make -j$NUMCPU
     - name: Run Test Suite

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -34,7 +34,7 @@ jobs:
         run: |
           git submodule update --init --recursive
           mkdir build && cd build
-          cmake .. -G"Ninja" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DEXPERIMENTAL=ON -DSNAPSHOT=ON
+          cmake .. -G"Ninja" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DEXPERIMENTAL=ON -DSNAPSHOT=ON -DUSE_QT6=ON
           cmake --build . -j2
           cmake --install . --prefix=.
       - name: Run Test Suite

diff --git a/scripts/github-ci-linux-get-dependencies.sh b/scripts/github-ci-linux-get-dependencies.sh
@@ -4,7 +4,7 @@ DIST="$1"
 
 PACKAGES1="build-essential bison cmake curl flex git-core imagemagick ghostscript"
 PACKAGES2="libboost-all-dev libboost-dev libeigen3-dev libzip-dev libcrypto++-dev"
-PACKAGES3="libxi-dev libxmu-dev qtbase5-dev qtmultimedia5-dev libqt5opengl5-dev libqt5svg5-dev libqt5scintilla2-dev"
+PACKAGES3="libxi-dev libxmu-dev qt6-base-dev qt6-multimedia-dev libqt6core5compat6-dev libqt6svg6-dev libqscintilla2-qt6-dev"
 PACKAGES4="libcgal-dev libglew-dev libgmp3-dev libgmp-dev libmpfr-dev libegl-dev libegl1-mesa-dev"
 PACKAGES5="libdouble-conversion-dev libfontconfig-dev libharfbuzz-dev libopencsg-dev lib3mf-dev libtbb-dev"
 
@@ -13,16 +13,6 @@ if [[ "$DIST" == "xenial" ]]; then
     LIB3MF_REPO="http://download.opensuse.org/repositories/home:/t-paul:/lib3mf/xUbuntu_16.04/"
     LIBCGAL_REPO="http://download.opensuse.org/repositories/home:/t-paul:/cgal/xUbuntu_16.04/"
 
-elif [[ "$DIST" == "bionic" ]]; then
-
-    LIB3MF_REPO="https://download.opensuse.org/repositories/home:/t-paul:/lib3mf/xUbuntu_18.04/"
-    LIBCGAL_REPO="https://download.opensuse.org/repositories/home:/t-paul:/cgal/xUbuntu_18.04/"
-
-elif [[ "$DIST" == "focal" ]]; then
-
-    LIB3MF_REPO="https://download.opensuse.org/repositories/home:/t-paul:/lib3mf/xUbuntu_20.04/"
-    LIBCGAL_REPO="https://download.opensuse.org/repositories/home:/t-paul:/cgal/xUbuntu_20.04/"
-
 elif [[ "$DIST" == "kinetic" ]]; then
 
     LIB3MF_REPO="https://download.opensuse.org/repositories/home:/t-paul:/lib3mf/xUbuntu_22.04/"

diff --git a/scripts/github-ci.sh b/scripts/github-ci.sh
@@ -20,7 +20,7 @@ do_build() {
 	mkdir "$BUILDDIR"
 	(
 		cd "$BUILDDIR"
-		cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_UNITY_BUILD=ON -DEXPERIMENTAL=ON -DPROFILE=ON -DUSE_BUILTIN_OPENCSG=1 ${PYTHON_DEFINE} .. && make $PARALLEL_MAKE
+		cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_UNITY_BUILD=ON -DEXPERIMENTAL=ON -DPROFILE=ON -DUSE_BUILTIN_OPENCSG=1 -DUSE_QT6=ON ${PYTHON_DEFINE} .. && make $PARALLEL_MAKE
 	)
 	if [[ $? != 0 ]]; then
 		echo "Build failure"

diff --git a/scripts/macosx-build-homebrew.sh b/scripts/macosx-build-homebrew.sh
@@ -58,7 +58,7 @@ for formula in boost; do
   fi
 done
 
-for formula in pkg-config eigen cgal glew glib opencsg freetype libzip libxml2 fontconfig harfbuzz qt5 qscintilla2 lib3mf double-conversion imagemagick ccache ghostscript tbb; do
+for formula in pkg-config eigen cgal glew glib opencsg freetype libzip libxml2 fontconfig harfbuzz qt6 qscintilla2 lib3mf double-conversion imagemagick ccache ghostscript tbb; do
   log "Installing formula $formula"
   brew ls --versions $formula
   time brew install $formula
@@ -70,7 +70,7 @@ for formula in libzip opencsg; do
   time brew link $formula
 done
 
-for formula in gettext qt5 qscintilla2; do
+for formula in gettext qt6 qscintilla2; do
   log "Linking formula $formula"
   time brew link --force $formula
 done

diff --git a/scripts/msys2-install-dependencies.sh b/scripts/msys2-install-dependencies.sh
@@ -33,7 +33,7 @@ pacboy --noconfirm --sync --needed \
     cgal:p \
     eigen3:p \
     glew:p \
-    qscintilla:p \
+    qscintilla-qt6:p \
     opencsg:p \
     lib3mf:p \
     libzip:p \
@@ -42,8 +42,9 @@ pacboy --noconfirm --sync --needed \
     cairo:p \
     ghostscript:p \
     imagemagick:p \
-    qt5-svg:p \
-    qt5-multimedia:p \
+    qt6-5compat:p \
+    qt6-svg:p \
+    qt6-multimedia:p \
     tbb:p \
     python:p \
     python-pip:p \