Make Qt6 the default

MRtrix3 · Feb 14, 2024 · 4aefa8f · 4aefa8f
1 parent 205dd53
commit 4aefa8f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      QT_SELECT: qt5
+      QT_SELECT: qt6
       SCCACHE_GHA_ENABLED: "true"
       SCCACHE_CACHE_SIZE: "2G"
 
@@ -25,7 +25,7 @@ jobs:
     - name: install dependencies
       run: |
          sudo apt-get update
-         sudo apt-get install clang libqt5opengl5-dev libqt5svg5-dev libglvnd-dev libeigen3-dev zlib1g-dev libfftw3-dev ninja-build
+         sudo apt-get install clang qt6-base-dev libglvnd-dev libeigen3-dev zlib1g-dev libfftw3-dev ninja-build
 
     - name: Run sccache-cache
       uses: mozilla-actions/sccache-action@v0.0.3
@@ -64,7 +64,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      QT_SELECT: qt5
+      QT_SELECT: qt6
       SCCACHE_GHA_ENABLED: "true"
       SCCACHE_CACHE_SIZE: "2G"
 
@@ -76,7 +76,7 @@ jobs:
     - name: install dependencies
       run: |
          sudo apt-get update
-         sudo apt-get install g++-9 libqt5opengl5-dev libqt5svg5-dev libglvnd-dev libeigen3-dev zlib1g-dev libfftw3-dev ninja-build
+         sudo apt-get install g++-9 qt6-base-dev libglvnd-dev libeigen3-dev zlib1g-dev libfftw3-dev ninja-build
 
     - name: Run sccache-cache
       uses: mozilla-actions/sccache-action@v0.0.3
@@ -113,7 +113,7 @@ jobs:
     runs-on: macos-latest
 
     env:
-      PACKAGES: "qt5 eigen pkg-config fftw libpng ninja cmake"
+      PACKAGES: "qt eigen pkg-config fftw libpng ninja cmake"
       SCCACHE_GHA_ENABLED: "true"
       SCCACHE_CACHE_SIZE: "2G"
 
@@ -126,7 +126,7 @@ jobs:
       run: |
          brew update || brew update     # https://github.com/Homebrew/brew/issues/2491#issuecomment-294207661
          brew install $PACKAGES || brew install $PACKAGES
-         brew link --force qt5
+         brew link --force qt
 
     - name: Run sccache-cache
       uses: mozilla-actions/sccache-action@v0.0.3
@@ -141,7 +141,7 @@ jobs:
 
     - name: configure
       run: >
-        export PATH=/usr/local/opt/qt5/bin:$PATH;
+        export PATH=/usr/local/opt/qt/bin:$PATH;
         cmake
         -B build
         -G Ninja
@@ -197,8 +197,8 @@ jobs:
             ${{env.MINGW_PACKAGE_PREFIX}}-libtiff
             ${{env.MINGW_PACKAGE_PREFIX}}-ninja
             ${{env.MINGW_PACKAGE_PREFIX}}-pkg-config
-            ${{env.MINGW_PACKAGE_PREFIX}}-qt5-base
-            ${{env.MINGW_PACKAGE_PREFIX}}-qt5-svg
+            ${{env.MINGW_PACKAGE_PREFIX}}-qt6-base
+            ${{env.MINGW_PACKAGE_PREFIX}}-qt6-svg
             ${{env.MINGW_PACKAGE_PREFIX}}-zlib
 
       - name: Run sccache-cache
@@ -233,7 +233,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      QT_SELECT: qt5
+      QT_SELECT: qt6
 
     steps:
     - uses: actions/checkout@v1

diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
@@ -11,7 +11,7 @@ jobs:
     - uses: ZedThree/clang-tidy-review@v0.17.0
       id: review
       with:
-        apt_packages: g++,libqt5opengl5-dev,libqt5svg5-dev,libglvnd-dev,libeigen3-dev,zlib1g-dev,libfftw3-dev,ninja-build
+        apt_packages: g++,qt6-base-dev,libglvnd-dev,libeigen3-dev,zlib1g-dev,libfftw3-dev,ninja-build
         cmake_command: cmake . -DCMAKE_EXPORT_COMPILE_COMMANDS=on
         config_file: .clang-tidy
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 set(MRTRIX_BASE_VERSION "${CMAKE_PROJECT_VERSION}")
 
 option(MRTRIX_BUILD_GUI "Build the MRtrix3 GUI" ON)
-option(MRTRIX_USE_QT6 "Use Qt6 to build" OFF)
+option(MRTRIX_USE_QT6 "Use Qt6 to build" ON)
 option(MRTRIX_WARNINGS_AS_ERRORS "Compiler warnings result in compilation errors" OFF)
 option(MRTRIX_STL_DEBUGGING "Enable STL debug mode" OFF)
 option(MRTRIX_BUILD_TESTS "Build tests executables" OFF)