From c036b8bff5bae9cb6dce80812abbf91158219be3 Mon Sep 17 00:00:00 2001 From: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Date: Sun, 8 Mar 2026 13:40:11 -0700 Subject: [PATCH 1/3] Qt6 updates * Bump Rev number for Windows, Linux, Mac arm64 to rebuild pacakge after fix for package scripts (https://github.com/o3de/3p-package-scripts/commit/ef24b789caadd55d529a7c417fa206b5ae995ef0) * Add setup arguments to -nomake for examples and tests Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> --- package-system/Qt/build-darwin-arm64.sh | 2 ++ package-system/Qt/build-linux.sh | 2 ++ package-system/Qt/build-windows.bat | 2 ++ package-system/Qt/build_config.json | 6 +++--- package_build_list_host_darwin-arm64.json | 4 ++-- package_build_list_host_linux.json | 4 ++-- package_build_list_host_windows.json | 4 ++-- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/package-system/Qt/build-darwin-arm64.sh b/package-system/Qt/build-darwin-arm64.sh index 85c371b1..0bca8f5f 100755 --- a/package-system/Qt/build-darwin-arm64.sh +++ b/package-system/Qt/build-darwin-arm64.sh @@ -23,6 +23,8 @@ cd $BUILD_PATH _OPTS="-prefix ${TARGET_INSTALL_ROOT} \ -submodules ${QTARRAY} \ -platform macx-clang \ + -nomake examples \ + -nomake tests \ -release \ -c++std c++20 \ -opensource \ diff --git a/package-system/Qt/build-linux.sh b/package-system/Qt/build-linux.sh index ed51375c..63d4b89a 100755 --- a/package-system/Qt/build-linux.sh +++ b/package-system/Qt/build-linux.sh @@ -70,6 +70,8 @@ cd ${BUILD_PATH} _OPTS="-prefix ${TARGET_INSTALL_ROOT} \ -submodules ${QTARRAY} \ -platform linux-clang \ + -nomake examples \ + -nomake tests \ -release \ -c++std c++20 \ -opensource \ diff --git a/package-system/Qt/build-windows.bat b/package-system/Qt/build-windows.bat index 478a728c..47219b92 100644 --- a/package-system/Qt/build-windows.bat +++ b/package-system/Qt/build-windows.bat @@ -43,6 +43,8 @@ cd b set _OPTS=-prefix %TARGET_INSTALL_ROOT% ^ -submodules %QTARRAY% ^ -platform win32-msvc ^ + -nomake examples ^ + -nomake tests ^ -debug-and-release ^ -c++std c++20 ^ -force-debug-info ^ diff --git a/package-system/Qt/build_config.json b/package-system/Qt/build_config.json index 992e0a83..2a7b6f79 100644 --- a/package-system/Qt/build_config.json +++ b/package-system/Qt/build_config.json @@ -11,7 +11,7 @@ "Platforms": { "Windows": { "Windows": { - "package_version": "6.10.2-rev1", + "package_version": "6.10.2-rev4", "depends_on_packages": [ ["OpenSSL-1.1.1o-rev1-windows", "52b9d2bc5f3e0c6e405a0f290d1904bf545acc0c73d6a52351247d917c4a06d2", ""], ["tiff-4.2.0.15-rev3-windows", "c6000a906e6d2a0816b652e93dfbeab41c9ed73cdd5a613acd53e553d0510b60", ""], @@ -43,7 +43,7 @@ }, "Mac-arm64": { "cmake_find_source": "FindQt.cmake", - "package_version": "6.10.2-rev2", + "package_version": "6.10.2-rev4", "custom_build_cmd": [ "./build-darwin-arm64.sh" ], @@ -54,7 +54,7 @@ }, "Linux": { "Linux": { - "package_version": "6.10.2-rev3", + "package_version": "6.10.2-rev4", "depends_on_packages": [ ["OpenSSL-1.1.1t-rev1-linux", "63aea898b7afe8faccd0c7261e62d2f8b7b870f678a4520d5be81e5815542b39", ""], ["tiff-4.2.0.15-rev3-linux", "2377f48b2ebc2d1628d9f65186c881544c92891312abe478a20d10b85877409a", ""], diff --git a/package_build_list_host_darwin-arm64.json b/package_build_list_host_darwin-arm64.json index 8788d98c..0ba79f0a 100644 --- a/package_build_list_host_darwin-arm64.json +++ b/package_build_list_host_darwin-arm64.json @@ -28,7 +28,7 @@ "png-1.6.53-rev2-mac-arm64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libpng --platform-name Mac-arm64 --clean", "poly2tri-7f0487a-rev1-mac-arm64": "package-system/poly2tri/build_package_image.py --platform-name mac-arm64", "python-3.10.13-rev1-mac-arm64": "package-system/python/build_package_image.py", - "qt-6.10.2-rev2-mac-arm64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Mac-arm64 --clean", + "qt-6.10.2-rev4-mac-arm64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Mac-arm64 --clean", "SPIRVCross-1.3.275.0-rev2-mac-arm64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Mac-arm64 --clean", "squish-ccr-deb557d-rev1-mac-arm64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Mac-arm64 --clean", "SQLite-3.37.2-rev2-mac-arm64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sqlite --platform-name Mac-arm64 --clean", @@ -61,7 +61,7 @@ "png-1.6.53-rev2-mac-arm64": "package-system/libpng/temp/png-mac-arm64", "poly2tri-7f0487a-rev1-mac-arm64": "package-system/poly2tri-mac-arm64", "python-3.10.13-rev1-mac-arm64": "package-system/python/darwin_arm64/package", - "qt-6.10.2-rev2-mac-arm64": "package-system/Qt/temp/qt-mac-arm64", + "qt-6.10.2-rev4-mac-arm64": "package-system/Qt/temp/qt-mac-arm64", "SPIRVCross-1.3.275.0-rev2-mac-arm64": "package-system/SPIRVCross/temp/SPIRVCross-mac-arm64", "squish-ccr-deb557d-rev1-mac-arm64": "package-system/squish-ccr/temp/squish-ccr-mac-arm64", "SQLite-3.37.2-rev2-mac-arm64": "package-system/sqlite/temp/SQLite-mac-arm64", diff --git a/package_build_list_host_linux.json b/package_build_list_host_linux.json index e2d189ae..62c0bb8a 100644 --- a/package_build_list_host_linux.json +++ b/package_build_list_host_linux.json @@ -45,7 +45,7 @@ "python-3.10.13-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux --clean", "python-3.10.13-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux-aarch64 --clean", "mikkelsen-1.0.0.4-linux": "package-system/mikkelsen/build_package_image.py", - "qt-6.10.2-rev3-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux --package-root ../../package-system/Qt/temp --clean", + "qt-6.10.2-rev4-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux --package-root ../../package-system/Qt/temp --clean", "qt-5.15.2-rev10-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux-aarch64 --package-root ../../package-system/Qt/temp", "zlib-1.2.11-rev5-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Linux --package-root ../../package-system --clean", "lz4-1.9.4-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/lz4 --platform-name Linux --package-root ../../package-system/lz4/temp --clean", @@ -96,7 +96,7 @@ "unwind-1.2.1-linux": "package-system/unwind-linux", "SQLite-3.37.2-rev1-linux": "package-system/SQLite-linux", "xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform", - "qt-6.10.2-rev3-linux": "package-system/Qt/temp/qt-linux", + "qt-6.10.2-rev4-linux": "package-system/Qt/temp/qt-linux", "qt-5.15.2-rev10-linux-aarch64": "package-system/Qt/temp/qt-linux-aarch64", "zlib-1.2.11-rev5-linux": "package-system/zlib-linux", "lz4-1.9.4-rev2-linux": "package-system/lz4/temp/lz4-linux", diff --git a/package_build_list_host_windows.json b/package_build_list_host_windows.json index 21d5e389..f43626d6 100644 --- a/package_build_list_host_windows.json +++ b/package_build_list_host_windows.json @@ -51,7 +51,7 @@ "pybind11-2.10.0-rev1-multiplatform": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pybind11 --platform-name multiplatform --package-root ../../package-system/pybind11/temp --clean", "pyside2-5.15.2.1-py3.10-rev3-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside2 --platform-name Windows --package-root ../../package-system/pyside2/temp --clean", "python-3.10.13-rev1-windows": "package-system/python/build_package_image.py", - "qt-6.10.2-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Windows --package-root ../../package-system/Qt/temp --clean", + "qt-6.10.2-rev4-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Windows --package-root ../../package-system/Qt/temp --clean", "RapidJSON-1.1.0-rev1-multiplatform": "Scripts/extras/pull_and_build_from_git.py ../../package-system/RapidJSON --platform-name multiplatform --package-root ../../package-system", "SPIRVCross-1.3.275.0-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Windows --package-root ../../package-system --clean", "SQLite-3.37.2-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sqlite --platform-name Windows --package-root ../../package-system --clean", @@ -120,7 +120,7 @@ "pybind11-2.10.0-rev1-multiplatform": "package-system/pybind11/temp/pybind11-multiplatform", "pyside2-5.15.2.1-py3.10-rev3-windows": "package-system/pyside2/temp/pyside2-windows", "python-3.10.13-rev1-windows": "package-system/python/win_x64/package", - "qt-6.10.2-rev1-windows": "package-system/Qt/temp/qt-windows", + "qt-6.10.2-rev4-windows": "package-system/Qt/temp/qt-windows", "RapidJSON-1.1.0-rev1-multiplatform": "package-system/RapidJSON-multiplatform", "RapidXML-1.13-rev1-multiplatform": "package-system/RapidXML-multiplatform", "SPIRVCross-1.3.275.0-rev1-windows": "package-system/SPIRVCross-windows", From e7704e76077c724d4aa7502e685bd85cfc28932e Mon Sep 17 00:00:00 2001 From: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Date: Sun, 8 Mar 2026 21:56:39 -0700 Subject: [PATCH 2/3] Remove nomake examples from mac arm64 Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> --- package-system/Qt/build-darwin-arm64.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/package-system/Qt/build-darwin-arm64.sh b/package-system/Qt/build-darwin-arm64.sh index 0bca8f5f..85c371b1 100755 --- a/package-system/Qt/build-darwin-arm64.sh +++ b/package-system/Qt/build-darwin-arm64.sh @@ -23,8 +23,6 @@ cd $BUILD_PATH _OPTS="-prefix ${TARGET_INSTALL_ROOT} \ -submodules ${QTARRAY} \ -platform macx-clang \ - -nomake examples \ - -nomake tests \ -release \ -c++std c++20 \ -opensource \ From 22ab42d479af5999d710c3dd3ac064024a2a536a Mon Sep 17 00:00:00 2001 From: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Date: Tue, 10 Mar 2026 07:40:44 -0700 Subject: [PATCH 3/3] Update qt version from 6.10.2-rev4 to 6.10.2-rev2 Revert mac rev Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> --- package_build_list_host_darwin-arm64.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_build_list_host_darwin-arm64.json b/package_build_list_host_darwin-arm64.json index 0ba79f0a..8788d98c 100644 --- a/package_build_list_host_darwin-arm64.json +++ b/package_build_list_host_darwin-arm64.json @@ -28,7 +28,7 @@ "png-1.6.53-rev2-mac-arm64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libpng --platform-name Mac-arm64 --clean", "poly2tri-7f0487a-rev1-mac-arm64": "package-system/poly2tri/build_package_image.py --platform-name mac-arm64", "python-3.10.13-rev1-mac-arm64": "package-system/python/build_package_image.py", - "qt-6.10.2-rev4-mac-arm64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Mac-arm64 --clean", + "qt-6.10.2-rev2-mac-arm64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Mac-arm64 --clean", "SPIRVCross-1.3.275.0-rev2-mac-arm64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Mac-arm64 --clean", "squish-ccr-deb557d-rev1-mac-arm64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Mac-arm64 --clean", "SQLite-3.37.2-rev2-mac-arm64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sqlite --platform-name Mac-arm64 --clean", @@ -61,7 +61,7 @@ "png-1.6.53-rev2-mac-arm64": "package-system/libpng/temp/png-mac-arm64", "poly2tri-7f0487a-rev1-mac-arm64": "package-system/poly2tri-mac-arm64", "python-3.10.13-rev1-mac-arm64": "package-system/python/darwin_arm64/package", - "qt-6.10.2-rev4-mac-arm64": "package-system/Qt/temp/qt-mac-arm64", + "qt-6.10.2-rev2-mac-arm64": "package-system/Qt/temp/qt-mac-arm64", "SPIRVCross-1.3.275.0-rev2-mac-arm64": "package-system/SPIRVCross/temp/SPIRVCross-mac-arm64", "squish-ccr-deb557d-rev1-mac-arm64": "package-system/squish-ccr/temp/squish-ccr-mac-arm64", "SQLite-3.37.2-rev2-mac-arm64": "package-system/sqlite/temp/SQLite-mac-arm64",