diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index cf6bb76..058f3ca 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -36,7 +36,7 @@ jobs: runs-on: macos-15 env: # update README for devs if you modify these env. variables - QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change + QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change ANDROIDAPI: 24 NDK_VERSION: '26.1.10909125' NDK_VERSION_FULL: r26b diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index e440094..5a24610 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -26,7 +26,7 @@ jobs: ios_build: runs-on: macos-15 env: # update README for devs if you modify these env. variables - QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change + QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change TRIPLET: "arm64-ios" DEPLOYMENT_TARGET: '13.0' # iOS Deployment target XC_VERSION: ${{ '16.2' }} diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 194a7c7..3459768 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-22.04 env: # update README for devs if you modify these env. variables - QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change + QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change TRIPLET: "x64-linux" QT_ARCH: "desktop" CMAKE_VERSION: '3.29.0' diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index be4095f..6195efe 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -26,7 +26,7 @@ jobs: runs-on: macos-13 env: # update README for devs if you modify these env. variables - QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change + QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change TRIPLET: "x64-osx" DEPLOYMENT_TARGET: "10.15.0" XC_VERSION: ${{ '15.2' }} diff --git a/.github/workflows/mac_arm64.yml b/.github/workflows/mac_arm64.yml index 2815baa..aa425a1 100644 --- a/.github/workflows/mac_arm64.yml +++ b/.github/workflows/mac_arm64.yml @@ -26,7 +26,7 @@ jobs: runs-on: macos-15 env: # update README for devs if you modify these env. variables - QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change + QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change TRIPLET: "arm64-osx" DEPLOYMENT_TARGET: "12.0" # arm64 only XC_VERSION: ${{ '16.2' }} diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml index da79726..45707a3 100644 --- a/.github/workflows/win.yml +++ b/.github/workflows/win.yml @@ -27,7 +27,7 @@ jobs: runs-on: windows-2022 env: # update README for devs if you modify these env. variables - QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change + QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change TRIPLET: "x64-windows" VS_VERSION: "2022" CMAKE_GENERATOR: "Visual Studio 17 2022" # see https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md diff --git a/README.md b/README.md index 806aa0e..38c2de1 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ The release is automatically created for each commit on master for each triplet export PATH=$(brew --prefix flex):$(brew --prefix bison)/bin:$(brew --prefix gettext)/bin:$PATH;\ export PATH=`pwd`/../vcpkg:$PATH;\ - export Qt6_DIR=/opt/Qt/6.8.2/android_arm64_v8a;export QT_HOST_PATH=/opt/Qt/6.8.2/macos;\ + export Qt6_DIR=/opt/Qt/6.8.3/android_arm64_v8a;export QT_HOST_PATH=/opt/Qt/6.8.3/macos;\ export ANDROIDAPI=24;\ export ANDROID_NDK_HOME='/opt/Android/android-sdk/ndk/25.1.8937393';\ export ANDROID_NDK_ROOT='/opt/Android/android-sdk/ndk/25.1.8937393';\ @@ -127,8 +127,8 @@ Note that this sdk application is dummy on this target and cannot be executed on export PATH=$(brew --prefix flex):$(brew --prefix bison)/bin:$(brew --prefix gettext)/bin:$PATH;\ export PATH=`pwd`/../vcpkg:$PATH;\ - export Qt6_DIR=/opt/Qt/6.8.2/android_armv7;\ - export QT_HOST_PATH=/opt/Qt/6.8.2/macos;\ + export Qt6_DIR=/opt/Qt/6.8.3/android_armv7;\ + export QT_HOST_PATH=/opt/Qt/6.8.3/macos;\ export ANDROIDAPI=24;\ export ANDROID_NDK_HOME='/opt/Android/android-sdk/ndk/25.1.8937393';\ export ANDROID_NDK_ROOT='/opt/Android/android-sdk/ndk/25.1.8937393';\ @@ -172,8 +172,8 @@ Note that this sdk application is dummy on this target and cannot be executed on export PATH=$(brew --prefix flex)/bin:$(brew --prefix bison)/bin:$(brew --prefix gettext)/bin:$PATH;\ export PATH=${PWD}/../vcpkg:$PATH;\ - export Qt6_DIR=/opt/Qt/6.8.2/ios;\ - export QT_HOST_PATH=/opt/Qt/6.8.2/macos;\ + export Qt6_DIR=/opt/Qt/6.8.3/ios;\ + export QT_HOST_PATH=/opt/Qt/6.8.3/macos;\ export DEPLOYMENT_TARGET=14.0; cmake -B . -S ../../mobile-sdk/ \ @@ -206,7 +206,7 @@ set ROOT_DIR=C:\Users\Peter\repo set BUILD_DIR=%ROOT_DIR%\build-sdk\win64 set SOURCE_DIR=%ROOT_DIR%\mobile-sdk set VCPKG_ROOT=%ROOT_DIR%\vcpkg -set Qt6_DIR=C:\Qt\6.8.2\msvc2019_64 +set Qt6_DIR=C:\Qt\6.8.3\msvc2019_64 set PATH=%VCPKG_ROOT%;%QT_ROOT%\bin;C:\Program Files\CMake\bin\;%PATH% "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd.bat" -arch=x64 ``` @@ -238,7 +238,7 @@ cmake --build %BUILD_DIR% --config Release --verbose export PATH=$(brew --prefix flex)/bin:$(brew --prefix bison)/bin:$(brew --prefix gettext)/bin:$PATH;\ export PATH=${PWD}/../vcpkg:$PATH;\ - export Qt6_DIR=/opt/Qt/6.8.2/macos;\ + export Qt6_DIR=/opt/Qt/6.8.3/macos;\ export DEPLOYMENT_TARGET=10.15.0 cmake -B . -S ../../mobile-sdk/ \ @@ -265,7 +265,7 @@ cmake --build %BUILD_DIR% --config Release --verbose cd build/x64-linux export PATH=${PWD}/../vcpkg:$PATH - export Qt6_DIR=~/Qt/6.8.2/gcc_64 + export Qt6_DIR=~/Qt/6.8.3/gcc_64 cmake -B . -S ../../mobile-sdk/ \ -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake \ diff --git a/vcpkg-overlay/ports/qt6-poly2tri/portfile.cmake b/vcpkg-overlay/ports/qt6-poly2tri/portfile.cmake index b0dbc72..edbaed6 100644 --- a/vcpkg-overlay/ports/qt6-poly2tri/portfile.cmake +++ b/vcpkg-overlay/ports/qt6-poly2tri/portfile.cmake @@ -5,7 +5,7 @@ else() vcpkg_download_distfile(ARCHIVE URLS "https://download.qt.io/archive/qt/6.8/${VERSION}/submodules/qtpositioning-everywhere-src-${VERSION}.zip" FILENAME "qtpositioning-${VERSION}.zip" - SHA512 647484035722ed015a6ec92a6d2ca966d507dd5e63c29676b36d6250611f7c228907e0acb5d1c195f7e1164d4092c1536c98c073cc81d28c3b868b1383defd4d + SHA512 cd216c94ef2d35e48bd9b8d7cf3d5c71f8afba379044601737e062f0de88c10a5c931a63b0f05436355ab464918400f7704908ec9c46c79eee74d790e678ae47 ) vcpkg_extract_source_archive( diff --git a/vcpkg-overlay/ports/qt6-poly2tri/vcpkg.json b/vcpkg-overlay/ports/qt6-poly2tri/vcpkg.json index e831984..ee14360 100644 --- a/vcpkg-overlay/ports/qt6-poly2tri/vcpkg.json +++ b/vcpkg-overlay/ports/qt6-poly2tri/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt6-poly2tri", - "version": "6.8.2", + "version": "6.8.3", "port-version": 0, "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", diff --git a/vcpkg-overlay/ports/qt6/vcpkg-cmake-wrapper.cmake b/vcpkg-overlay/ports/qt6/vcpkg-cmake-wrapper.cmake index 27e020a..7f30acc 100644 --- a/vcpkg-overlay/ports/qt6/vcpkg-cmake-wrapper.cmake +++ b/vcpkg-overlay/ports/qt6/vcpkg-cmake-wrapper.cmake @@ -62,6 +62,7 @@ set(QT_MODULES Qt6EntryPointPrivate Qt6EventDispatcherSupport Qt6FbSupport + Qt6FFmpegMediaPluginImplPrivate Qt6FontDatabaseSupport Qt6Gamepad Qt6Gui diff --git a/vcpkg-overlay/ports/qt6/vcpkg.json b/vcpkg-overlay/ports/qt6/vcpkg.json index d61e98e..c262383 100644 --- a/vcpkg-overlay/ports/qt6/vcpkg.json +++ b/vcpkg-overlay/ports/qt6/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt6", - "version-string": "6.8.2", + "version-string": "6.8.3", "description": "Qt6 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/" } \ No newline at end of file