qt660

MerginMaps · Nov 1, 2023 · 8c985f4 · 8c985f4
1 parent 0f90c96
commit 8c985f4
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -35,7 +35,7 @@ jobs:
 
     runs-on: macos-12
     env: # update README for devs if you modify these env. variables
-      QT_VERSION: '6.5.3' # use scripts/update_qt_version.bash to change
+      QT_VERSION: '6.6.0' # use scripts/update_qt_version.bash to change
       ANDROIDAPI: 24
       NDK_VERSION: '25.1.8937393'
       NDK_VERSION_FULL: r25b

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -25,7 +25,7 @@ jobs:
   ios_build:
     runs-on: macos-12
     env: # update README for devs if you modify these env. variables
-      QT_VERSION: '6.5.3' # use scripts/update_qt_version.bash to change
+      QT_VERSION: '6.6.0' # use scripts/update_qt_version.bash to change
       TRIPLET: "arm64-ios"
       DEPLOYMENT_TARGET: '14.0' # iOS Deployment target 
       XC_VERSION: ${{ '14.2' }}

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -27,7 +27,7 @@ jobs:
     if: github.repository == 'merginmaps/input-sdk'
 
     env: # update README for devs if you modify these env. variables
-      QT_VERSION: '6.5.3' # use scripts/update_qt_version.bash to change
+      QT_VERSION: '6.6.0' # use scripts/update_qt_version.bash to change
       TRIPLET: "x64-linux"
       QT_ARCH: "desktop"
       VCPKG_ROOT: "${{ github.workspace }}/vcpkg"

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -26,7 +26,7 @@ jobs:
     if: github.repository == 'merginmaps/input-sdk'
 
     env: # update README for devs if you modify these env. variables
-      QT_VERSION: '6.5.3' # use scripts/update_qt_version.bash to change
+      QT_VERSION: '6.6.0' # use scripts/update_qt_version.bash to change
       TRIPLET: "x64-osx"
       DEPLOYMENT_TARGET: "10.15.0"
       XC_VERSION: ${{ '14.2' }}

diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
@@ -27,7 +27,7 @@ jobs:
     runs-on: windows-2019
 
     env: # update README for devs if you modify these env. variables
-      QT_VERSION: '6.5.3' # use scripts/update_qt_version.bash to change
+      QT_VERSION: '6.6.0' # use scripts/update_qt_version.bash to change
       TRIPLET: "x64-windows"
       VS_VERSION: "2019"
       CMAKE_GENERATOR: "Visual Studio 16 2019" # see https://github.com/actions/runner-images/blob/main/images/win/Windows2019-Readme.md

diff --git a/README.md b/README.md
@@ -82,7 +82,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.5.3/android_arm64_v8a;export QT_HOST_PATH=/opt/Qt/6.5.3/macos;\
+  export Qt6_DIR=/opt/Qt/6.6.0/android_arm64_v8a;export QT_HOST_PATH=/opt/Qt/6.6.0/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';\
@@ -126,8 +126,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.5.3/android_armv7;\
-  export QT_HOST_PATH=/opt/Qt/6.5.3/macos;\
+  export Qt6_DIR=/opt/Qt/6.6.0/android_armv7;\
+  export QT_HOST_PATH=/opt/Qt/6.6.0/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';\
@@ -171,8 +171,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.5.3/ios;\
-  export QT_HOST_PATH=/opt/Qt/6.5.3/macos;\
+  export Qt6_DIR=/opt/Qt/6.6.0/ios;\
+  export QT_HOST_PATH=/opt/Qt/6.6.0/macos;\
   export DEPLOYMENT_TARGET=14.0;
 
   cmake -B . -S ../../input-sdk/ \
@@ -205,7 +205,7 @@ set ROOT_DIR=C:\Users\Peter\repo
 set BUILD_DIR=%ROOT_DIR%\build-sdk\win64
 set SOURCE_DIR=%ROOT_DIR%\input-sdk
 set VCPKG_ROOT=%ROOT_DIR%\vcpkg
-set Qt6_DIR=C:\Qt\6.5.3\msvc2019_64
+set Qt6_DIR=C:\Qt\6.6.0\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
 ```
@@ -237,7 +237,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.5.3/macos;\
+  export Qt6_DIR=/opt/Qt/6.6.0/macos;\
   export DEPLOYMENT_TARGET=10.15.0
   
   cmake -B . -S ../../input-sdk/ \
@@ -265,7 +265,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.5.3/macos
+  export Qt6_DIR=/opt/Qt/6.6.0/macos
   
   cmake -B . -S ../../input-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
@@ -3,9 +3,9 @@ if(NOT VCPKG_TARGET_IS_IOS)
     message(FATAL_ERROR "qt poly2tri only needed on iOS")
 else()
     vcpkg_download_distfile(ARCHIVE
-        URLS "https://download.qt.io/archive/qt/6.5/${VERSION}/submodules/qtpositioning-everywhere-src-${VERSION}.zip"
+        URLS "https://download.qt.io/archive/qt/6.6/${VERSION}/submodules/qtpositioning-everywhere-src-${VERSION}.zip"
         FILENAME "qtpositioning-${VERSION}.zip"
-        SHA512 881b13513b5db84c1c5324e0f42b0ab5d6a7e60aa5b6958ff379213c8567b1732144488cca21894a6e3980094147e15ba5db31c47027bdec19dc6fe9bab13ee0
+        SHA512 927926c2efbc2f0fa94a4a33174a88c2c121f4e7ffa1f67370a9b88f4d0e1f22932c9c416cacd10562713daba8f1530688b81697bedebae84d727e0657dc052d
     )
 
     vcpkg_extract_source_archive(

diff --git 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.5.3",
+    "version": "6.6.0",
     "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/",