qt6

.github/workflows/BuildPR.yml

@@ -167,14 +167,15 @@ jobs:
       - name: Install qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: 5.15.2
+          version: 6.7.1
+      - uses: seanmiddleditch/gha-setup-ninja@master
       - name: Build with CMake ${{ matrix.task }}
         run: >
           $env:WORKSPACE=$env:GITHUB_WORKSPACE;
-          $env:QTDIR=$env:Qt5_DIR.Replace('/','\');
+          $env:QTDIR=$env:Qt6_DIR.Replace('/','\');
           $env:CPACK_7Z="true";
           $env:CPACK_NSIS="true";
-          ./build_sdk_windows_qt5_MSVC_cmake.bat
+          ./build_sdk_windows_MSVC_cmake.bat
       - name: Archive artifact
         uses: actions/upload-artifact@v4
         if: ${{ success() }}

.github/workflows/Release.yml

@@ -29,8 +29,8 @@ jobs:
         run: ls -n /Applications/ | grep Xcode*
       - name: Set XCode Version
         run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app
-      - name: install qt 5
-        run: brew install qt@5
+      - name: install qt 6
+        run: brew install qt@6
       - name: install build environment
         run: scripts/darwin/install.sh
       - name: Build project
@@ -147,7 +147,7 @@ jobs:
         uses: jurplel/install-qt-action@v4
         with:
           mirror: http://ftp.fau.de/qtproject/
-          version: 5.15.2
+          version: 6.7.1
       - name: Build with CMake ${{ matrix.task }}
         run: >
           $env:WORKSPACE=$env:GITHUB_WORKSPACE;

build_config.bat

@@ -14,7 +14,7 @@ if "%QTNO%"=="" (
 
 if "%QTVER%"=="" (
    if "%QTNO%"=="5" (
-		set QTVER=5.15.2 
+		set QTVER=5.15.2
    )  else (
 		set QTVER=6.7.3
    )

scripts/darwin/build_cmake.sh

@@ -12,13 +12,13 @@ mkdir -p "${BUILD_DIR}"
 cd "${BUILD_DIR}"
 
 if [[ $(uname -m) == 'arm64' ]]; then
-  Qt5_DIR="/opt/homebrew/opt/qt@5"
-  echo "Build with cmake $(uname -m) $Qt5_DIR"
+  Qt6_DIR="/opt/homebrew/opt/qt@6"
+  echo "Build with cmake $(uname -m) $Qt6_DIR"
   qmake ../BuildDltViewer.pro
 #  cmake ..
 else
-  Qt5_DIR="/usr/local/opt/qt"
-  echo "Build with qmake $(uname -m) $Qt5_DIR"
+  Qt6_DIR="/usr/local/opt/qt"
+  echo "Build with qmake $(uname -m) $Qt6_DIR"
   qmake ../BuildDltViewer.pro
   make
 fi
@@ -36,7 +36,7 @@ echo Build with CMake
 # https://developer.apple.com/library/archive/documentation/CoreFoundation/Conceptual/CFBundles/BundleTypes/BundleTypes.html
 cmake -G Ninja \
   -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
-  -DCMAKE_PREFIX_PATH=${Qt5_DIR}/lib/cmake \
+  -DCMAKE_PREFIX_PATH=${Qt6_DIR}/lib/cmake \
   -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
   -DCMAKE_BUILD_TYPE=Release \
   -DDLT_USE_QT_RPATH=ON \

scripts/darwin/install.sh

@@ -5,34 +5,34 @@ env
 pwd
 
 brew update
-brew install qt@5
+brew install qt@6
 brew unlink qt@5 && brew link --force qt@5
-#brew link --overwrite qt@5 --force --overwrite
+#brew link --overwrite qt@6 --force --overwrite
 # https://github.com/Homebrew/homebrew-core/issues/8392
 # https://github.com/Homebrew/legacy-homebrew/issues/29938
-QT_VERSION=$(brew list --versions qt@5 | awk '{print $2}')
+QT_VERSION=$(brew list --versions qt@6 | awk '{print $2}')
 echo "QT_VERSION=$QT_VERSION"
 if [[ -z "$QT_VERSION" ]]; then
     echo "QT_VERSION is empty"
     exit 1
 fi
 
 # follow brew install suggestions
-echo 'export PATH="/opt/homebrew/opt/qt@5/bin:$PATH"' >> ~/.bash_profile
-export LDFLAGS="-L/opt/homebrew/opt/qt@5/lib"
-export CPPFLAGS="-I/opt/homebrew/opt/qt@5/include"
-export PKG_CONFIG_PATH="/opt/homebrew/opt/qt@5/lib/pkgconfig"
+echo 'export PATH="/opt/homebrew/opt/qt@6/bin:$PATH"' >> ~/.bash_profile
+export LDFLAGS="-L/opt/homebrew/opt/qt@6/lib"
+export CPPFLAGS="-I/opt/homebrew/opt/qt@6/include"
+export PKG_CONFIG_PATH="/opt/homebrew/opt/qt@6/lib/pkgconfig"
 source ~/.bash_profile
 
 uname -a
 if [[ $(uname -m) == 'arm64' ]]; then
   echo "Run on MacOS arm64"
-  sudo ln -s -F "/opt/homebrew/Cellar/qt@5/${QT_VERSION}/mkspecs" /usr/local/mkspecs
-  sudo ln -s -F "/opt/homebrew/Cellar/qt@5/${QT_VERSION}/plugins" /usr/local/plugins
+  sudo ln -s -F "/opt/homebrew/Cellar/qt@6/${QT_VERSION}/mkspecs" /usr/local/mkspecs
+  sudo ln -s -F "/opt/homebrew/Cellar/qt@6/${QT_VERSION}/plugins" /usr/local/plugins
 else
   echo "Run on MacOS x86"
-  sudo ln -s "/usr/local/Cellar/qt@5/${QT_VERSION}/mkspecs" /usr/local/mkspecs
-  sudo ln -s "/usr/local/Cellar/qt@5/${QT_VERSION}/plugins" /usr/local/plugins
+  sudo ln -s "/usr/local/Cellar/qt@6/${QT_VERSION}/mkspecs" /usr/local/mkspecs
+  sudo ln -s "/usr/local/Cellar/qt@6/${QT_VERSION}/plugins" /usr/local/plugins
 fi
 
 brew install ninja tree