Skip to content
This repository was archived by the owner on Nov 11, 2025. It is now read-only.

Commit 7592308

Browse files
authored
qt683 (#118)
qt683
1 parent 91eb327 commit 7592308

File tree

11 files changed

+18
-17
lines changed

11 files changed

+18
-17
lines changed

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
runs-on: macos-15
3838
env: # update README for devs if you modify these env. variables
39-
QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
39+
QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change
4040
ANDROIDAPI: 24
4141
NDK_VERSION: '26.1.10909125'
4242
NDK_VERSION_FULL: r26b

.github/workflows/ios.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
ios_build:
2727
runs-on: macos-15
2828
env: # update README for devs if you modify these env. variables
29-
QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
29+
QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change
3030
TRIPLET: "arm64-ios"
3131
DEPLOYMENT_TARGET: '13.0' # iOS Deployment target
3232
XC_VERSION: ${{ '16.2' }}

.github/workflows/linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ubuntu-22.04
2828

2929
env: # update README for devs if you modify these env. variables
30-
QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
30+
QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change
3131
TRIPLET: "x64-linux"
3232
QT_ARCH: "desktop"
3333
CMAKE_VERSION: '3.29.0'

.github/workflows/mac.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: macos-13
2727

2828
env: # update README for devs if you modify these env. variables
29-
QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
29+
QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change
3030
TRIPLET: "x64-osx"
3131
DEPLOYMENT_TARGET: "10.15.0"
3232
XC_VERSION: ${{ '15.2' }}

.github/workflows/mac_arm64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: macos-15
2727

2828
env: # update README for devs if you modify these env. variables
29-
QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
29+
QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change
3030
TRIPLET: "arm64-osx"
3131
DEPLOYMENT_TARGET: "12.0" # arm64 only
3232
XC_VERSION: ${{ '16.2' }}

.github/workflows/win.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: windows-2022
2828

2929
env: # update README for devs if you modify these env. variables
30-
QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
30+
QT_VERSION: '6.8.3' # use scripts/update_qt_version.bash to change
3131
TRIPLET: "x64-windows"
3232
VS_VERSION: "2022"
3333
CMAKE_GENERATOR: "Visual Studio 17 2022" # see https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ The release is automatically created for each commit on master for each triplet
8383
8484
export PATH=$(brew --prefix flex):$(brew --prefix bison)/bin:$(brew --prefix gettext)/bin:$PATH;\
8585
export PATH=`pwd`/../vcpkg:$PATH;\
86-
export Qt6_DIR=/opt/Qt/6.8.2/android_arm64_v8a;export QT_HOST_PATH=/opt/Qt/6.8.2/macos;\
86+
export Qt6_DIR=/opt/Qt/6.8.3/android_arm64_v8a;export QT_HOST_PATH=/opt/Qt/6.8.3/macos;\
8787
export ANDROIDAPI=24;\
8888
export ANDROID_NDK_HOME='/opt/Android/android-sdk/ndk/25.1.8937393';\
8989
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
127127
128128
export PATH=$(brew --prefix flex):$(brew --prefix bison)/bin:$(brew --prefix gettext)/bin:$PATH;\
129129
export PATH=`pwd`/../vcpkg:$PATH;\
130-
export Qt6_DIR=/opt/Qt/6.8.2/android_armv7;\
131-
export QT_HOST_PATH=/opt/Qt/6.8.2/macos;\
130+
export Qt6_DIR=/opt/Qt/6.8.3/android_armv7;\
131+
export QT_HOST_PATH=/opt/Qt/6.8.3/macos;\
132132
export ANDROIDAPI=24;\
133133
export ANDROID_NDK_HOME='/opt/Android/android-sdk/ndk/25.1.8937393';\
134134
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
172172
173173
export PATH=$(brew --prefix flex)/bin:$(brew --prefix bison)/bin:$(brew --prefix gettext)/bin:$PATH;\
174174
export PATH=${PWD}/../vcpkg:$PATH;\
175-
export Qt6_DIR=/opt/Qt/6.8.2/ios;\
176-
export QT_HOST_PATH=/opt/Qt/6.8.2/macos;\
175+
export Qt6_DIR=/opt/Qt/6.8.3/ios;\
176+
export QT_HOST_PATH=/opt/Qt/6.8.3/macos;\
177177
export DEPLOYMENT_TARGET=14.0;
178178
179179
cmake -B . -S ../../mobile-sdk/ \
@@ -206,7 +206,7 @@ set ROOT_DIR=C:\Users\Peter\repo
206206
set BUILD_DIR=%ROOT_DIR%\build-sdk\win64
207207
set SOURCE_DIR=%ROOT_DIR%\mobile-sdk
208208
set VCPKG_ROOT=%ROOT_DIR%\vcpkg
209-
set Qt6_DIR=C:\Qt\6.8.2\msvc2019_64
209+
set Qt6_DIR=C:\Qt\6.8.3\msvc2019_64
210210
set PATH=%VCPKG_ROOT%;%QT_ROOT%\bin;C:\Program Files\CMake\bin\;%PATH%
211211
"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd.bat" -arch=x64
212212
```
@@ -238,7 +238,7 @@ cmake --build %BUILD_DIR% --config Release --verbose
238238
239239
export PATH=$(brew --prefix flex)/bin:$(brew --prefix bison)/bin:$(brew --prefix gettext)/bin:$PATH;\
240240
export PATH=${PWD}/../vcpkg:$PATH;\
241-
export Qt6_DIR=/opt/Qt/6.8.2/macos;\
241+
export Qt6_DIR=/opt/Qt/6.8.3/macos;\
242242
export DEPLOYMENT_TARGET=10.15.0
243243
244244
cmake -B . -S ../../mobile-sdk/ \
@@ -265,7 +265,7 @@ cmake --build %BUILD_DIR% --config Release --verbose
265265
cd build/x64-linux
266266
267267
export PATH=${PWD}/../vcpkg:$PATH
268-
export Qt6_DIR=~/Qt/6.8.2/gcc_64
268+
export Qt6_DIR=~/Qt/6.8.3/gcc_64
269269
270270
cmake -B . -S ../../mobile-sdk/ \
271271
-DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake \

vcpkg-overlay/ports/qt6-poly2tri/portfile.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ else()
55
vcpkg_download_distfile(ARCHIVE
66
URLS "https://download.qt.io/archive/qt/6.8/${VERSION}/submodules/qtpositioning-everywhere-src-${VERSION}.zip"
77
FILENAME "qtpositioning-${VERSION}.zip"
8-
SHA512 647484035722ed015a6ec92a6d2ca966d507dd5e63c29676b36d6250611f7c228907e0acb5d1c195f7e1164d4092c1536c98c073cc81d28c3b868b1383defd4d
8+
SHA512 cd216c94ef2d35e48bd9b8d7cf3d5c71f8afba379044601737e062f0de88c10a5c931a63b0f05436355ab464918400f7704908ec9c46c79eee74d790e678ae47
99
)
1010

1111
vcpkg_extract_source_archive(

vcpkg-overlay/ports/qt6-poly2tri/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "qt6-poly2tri",
3-
"version": "6.8.2",
3+
"version": "6.8.3",
44
"port-version": 0,
55
"description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
66
"homepage": "https://www.qt.io/",

vcpkg-overlay/ports/qt6/vcpkg-cmake-wrapper.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ set(QT_MODULES
6262
Qt6EntryPointPrivate
6363
Qt6EventDispatcherSupport
6464
Qt6FbSupport
65+
Qt6FFmpegMediaPluginImplPrivate
6566
Qt6FontDatabaseSupport
6667
Qt6Gamepad
6768
Qt6Gui

0 commit comments

Comments
 (0)