Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Q/Qt6Base/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = v"6.10.2"
# Set this to true first when updating the version. It will build only for the host (linux musl).
# After that JLL is in the registry, set this to false to build for the other platforms, using
# this same package as host build dependency.
const host_build = true
const host_build = false

# Collection of sources required to build qt6
sources = [
Expand Down Expand Up @@ -37,7 +37,7 @@ commonoptions=" \
-openssl-linked -nomake examples -release \
"

commoncmakeoptions="-DCMAKE_PREFIX_PATH=${prefix} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} -DQT_HOST_PATH=$host_prefix -DQT_FEATURE_openssl_linked=ON"
commoncmakeoptions="-DCMAKE_PREFIX_PATH=${prefix} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} -DQT_HOST_PATH=$host_prefix -DQT_FEATURE_openssl_linked=ON -DWaylandScanner_EXECUTABLE=$host_bindir/wayland-scanner"

export LD_LIBRARY_PATH=$host_libdir:$host_prefix/lib64:$LD_LIBRARY_PATH
export OPENSSL_LIBS="-L${libdir} -lssl -lcrypto"
Expand Down
14 changes: 14 additions & 0 deletions Q/Qt6Base/bundled/patches/mingw-mac.patch
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,17 @@ diff --color -ur a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging
static bool qt_append_thread_name_to(QString &message)
{
std::array<char, 16> name{};
diff --color -ur a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h
--- a/src/corelib/global/qsimd_p.h 2026-01-13 11:18:17.000000000 +0100
+++ b/src/corelib/global/qsimd_p.h 2026-02-19 21:58:05.412506514 +0100
@@ -353,6 +353,10 @@
#define __ARM_FEATURE_CRC32 1
#endif

+#if defined(Q_OS_MACOS) && defined(Q_PROCESSOR_ARM)
+#define __ARM_FEATURE_CRYPTO 1
+#endif
+
#if defined(Q_PROCESSOR_ARM_64)
#if defined(Q_CC_CLANG)
#define QT_FUNCTION_TARGET_STRING_AES "aes"