diff --git a/package-system/Qt/build-darwin-arm64.sh b/package-system/Qt/build-darwin-arm64.sh index b0cc1a25..85c371b1 100755 --- a/package-system/Qt/build-darwin-arm64.sh +++ b/package-system/Qt/build-darwin-arm64.sh @@ -28,6 +28,9 @@ _OPTS="-prefix ${TARGET_INSTALL_ROOT} \ -opensource \ -qt-tiff \ -qt-zlib \ + -no-icu \ + -dbus-linked \ + -framework \ -confirm-license " echo Configuring Qt... @@ -47,4 +50,18 @@ then exit 1 fi +# The installation target on darwin is not installing the framework's header paths in the main +# include folder. Create a symlink to the headers there for backwards compatibility +qtframeworks=(QtConcurrent QtCore QtDBus QtDesigner QtDesignerComponents QtGui QtHelp QtMacExtras QtNetwork QtOpenGL QtPrintSupport QtQml QtQmlModels QtQmlWorkerScript QtQuick QtQuickParticles QtQuickShapes QtQuickTest QtQuickWidgets QtSql QtSvg QtTest QtUiPlugin QtWidgets QtXml QtZlib) + +cd $TARGET_INSTALL_ROOT/include +for qtframework in "${qtframeworks[@]}"; do + if [ -d $TARGET_INSTALL_ROOT/lib/$qtframework.framework/Headers ]; then + echo "Linking ${TARGET_INSTALL_ROOT}/lib/${qtframework}.framework/Headers/ to ${TARGET_INSTALL_ROOT}/include/${qtframework}" + ln -s ../lib/$qtframework.framework/Headers/ $qtframework + else + echo "Unable to find $TARGET_INSTALL_ROOT/lib/${qtframework}.framework/Headers (${qtframework}) Skipping.." + fi +done + echo Qt installed successfully! diff --git a/package-system/Qt/build-linux.sh b/package-system/Qt/build-linux.sh index 0cd31ef2..ed51375c 100755 --- a/package-system/Qt/build-linux.sh +++ b/package-system/Qt/build-linux.sh @@ -74,7 +74,8 @@ _OPTS="-prefix ${TARGET_INSTALL_ROOT} \ -c++std c++20 \ -opensource \ -xcb \ - -confirm-license " + -confirm-license \ + -no-icu" ${BUILD_ROOT}/configure ${_OPTS} if [ $? -ne 0 ] diff --git a/package-system/Qt/build_config.json b/package-system/Qt/build_config.json index 956826af..992e0a83 100644 --- a/package-system/Qt/build_config.json +++ b/package-system/Qt/build_config.json @@ -43,7 +43,7 @@ }, "Mac-arm64": { "cmake_find_source": "FindQt.cmake", - "package_version": "6.10.2-rev1", + "package_version": "6.10.2-rev2", "custom_build_cmd": [ "./build-darwin-arm64.sh" ], @@ -54,7 +54,7 @@ }, "Linux": { "Linux": { - "package_version": "6.10.2-rev2", + "package_version": "6.10.2-rev3", "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 f8f66f83..4d01fc84 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-rev1-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-rev1-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", diff --git a/package_build_list_host_linux.json b/package_build_list_host_linux.json index 9a7dc66c..e2d189ae 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-rev2-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-rev3-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-rev2-linux": "package-system/Qt/temp/qt-linux", + "qt-6.10.2-rev3-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",