upgrade Qt to version 6.7.1 on macOS and Windows

mltframework · May 20, 2024 · 34d895c · 34d895c
1 parent 8a4b72a
commit 34d895c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/build-sdk-windows.yml b/.github/workflows/build-sdk-windows.yml
@@ -64,10 +64,10 @@ jobs:
           echo Downloading Qt
           mkdir Qt
           cd Qt
-          curl -kLO --no-progress-meter https://s3.amazonaws.com/misc.meltymedia/shotcut-build/qt-6.7.0-x64-mingw.txz
+          curl -kLO --no-progress-meter https://s3.amazonaws.com/misc.meltymedia/shotcut-build/qt-6.7.1-x64-mingw.txz
           echo Extracting Qt
-          tar -xJf qt-6.7.0-x64-mingw.txz
-          rm qt-6.7.0-x64-mingw.txz
+          tar -xJf qt-6.7.1-x64-mingw.txz
+          rm qt-6.7.1-x64-mingw.txz
           cd ..
           echo Downloading prebuilt SWH LADSPA plugins
           curl -LO --no-progress-meter https://s3.amazonaws.com/misc.meltymedia/shotcut-build/swh-plugins-win64-0.4.15.tar.xz

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -68,10 +68,10 @@ jobs:
           mkdir Qt
           cd Qt
           echo Downloading Qt
-          curl -kLO --no-progress-meter https://s3.amazonaws.com/misc.meltymedia/shotcut-build/qt-6.7.0-x64-mingw.txz
+          curl -kLO --no-progress-meter https://s3.amazonaws.com/misc.meltymedia/shotcut-build/qt-6.7.1-x64-mingw.txz
           echo Extracting Qt
-          tar -xJf qt-6.7.0-x64-mingw.txz
-          rm qt-6.7.0-x64-mingw.txz
+          tar -xJf qt-6.7.1-x64-mingw.txz
+          rm qt-6.7.1-x64-mingw.txz
           cd ..
           echo Downloading prebuilt SWH LADSPA plugins
           curl -kLO --no-progress-meter https://s3.amazonaws.com/misc.meltymedia/shotcut-build/swh-plugins-win64-0.4.15.tar.xz

diff --git a/scripts/build-shotcut-msys2.sh b/scripts/build-shotcut-msys2.sh
@@ -535,7 +535,7 @@ function set_globals {
 
   # set global environment for all jobs
   alias make=mingw32-make
-  export QTDIR="$HOME/Qt/6.7.0/mingw_64"
+  export QTDIR="$HOME/Qt/6.7.1/mingw_64"
   export PKG_CONFIG_PATH="$HOME/lib/pkgconfig:$PKG_CONFIG_PATH"
   export PATH="$FINAL_INSTALL_DIR/bin:$PATH"
   export LD_RUN_PATH="$FINAL_INSTALL_DIR/lib"

diff --git a/scripts/build-shotcut.sh b/scripts/build-shotcut.sh
@@ -106,7 +106,7 @@ PYTHON_VERSION_DEFAULT=3.8
 PYTHON_VERSION_DARWIN=3.11
 
 QT_VERSION_DEFAULT=6.4.3
-QT_VERSION_DARWIN=6.7.0
+QT_VERSION_DARWIN=6.7.1
 
 # QT_INCLUDE_DIR="$(pkg-config --variable=prefix QtCore)/include"
 QT_INCLUDE_DIR=${QTDIR:+${QTDIR}/include}

diff --git a/src/main.cpp b/src/main.cpp
@@ -35,6 +35,7 @@
 #endif
 
 #ifdef Q_OS_WIN
+#include <windows.h>
 #ifdef QT_DEBUG
 #   include <exchndl.h>
 #endif