From 18b5e7e39dc08c8cc67166128a3504ab59c16e3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edgar=20Andr=C3=A9s=20Margffoy=20Tuay?= <andfoy@gmail.com>
Date: Wed, 17 Nov 2021 21:06:21 -0500
Subject: [PATCH 08/13] Make qml host tools to be arm64-compatible

---
 qtdeclarative/src/qmldevtools/qmldevtools.pro             | 4 ++++
 qtdeclarative/src/qmltyperegistrar/qmltyperegistrar.pro   | 4 ++++
 qtdeclarative/tools/qmlcachegen/qmlcachegen.pro           | 4 ++++
 qtdeclarative/tools/qmlformat/qmlformat.pro               | 4 ++++
 qtdeclarative/tools/qmlimportscanner/qmlimportscanner.pro | 4 ++++
 qtdeclarative/tools/qmllint/qmllint.pro                   | 4 ++++
 qtdeclarative/tools/qmlmin/qmlmin.pro                     | 4 ++++
 7 files changed, 28 insertions(+)

diff --git a/qtdeclarative/src/qmldevtools/qmldevtools.pro b/qtdeclarative/src/qmldevtools/qmldevtools.pro
index bea3c864cd..af6e8cc828 100644
--- a/qtdeclarative/src/qmldevtools/qmldevtools.pro
+++ b/qtdeclarative/src/qmldevtools/qmldevtools.pro
@@ -6,6 +6,10 @@ CONFIG    += minimal_syncqt internal_module generated_privates
 MODULE_INCNAME = QtQml
 INCLUDEPATH += $$OUT_PWD/../qml
 
+QMAKE_CXXFLAGS += -arch x86_64 -arch arm64
+QMAKE_CFLAGS += -arch x86_64 -arch arm64
+QMAKE_LFLAGS += -arch x86_64 -arch arm64
+
 # 2415: variable "xx" of static storage duration was declared but never referenced
 # unused variable 'xx' [-Werror,-Wunused-const-variable]
 intel_icc: WERROR += -ww2415
diff --git a/qtdeclarative/src/qmltyperegistrar/qmltyperegistrar.pro b/qtdeclarative/src/qmltyperegistrar/qmltyperegistrar.pro
index dff8f00ca3..fd3d103fea 100644
--- a/qtdeclarative/src/qmltyperegistrar/qmltyperegistrar.pro
+++ b/qtdeclarative/src/qmltyperegistrar/qmltyperegistrar.pro
@@ -3,6 +3,10 @@ option(host_build)
 QT       = core-private
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 
+QMAKE_CXXFLAGS += -arch x86_64 -arch arm64
+QMAKE_CFLAGS += -arch x86_64 -arch arm64
+QMAKE_LFLAGS += -arch x86_64 -arch arm64
+
 QMAKE_TARGET_DESCRIPTION = QML Types Registrar
 
 include(../../tools/shared/shared.pri)
diff --git a/qtdeclarative/tools/qmlcachegen/qmlcachegen.pro b/qtdeclarative/tools/qmlcachegen/qmlcachegen.pro
index ec65cdb5e6..61436394e6 100644
--- a/qtdeclarative/tools/qmlcachegen/qmlcachegen.pro
+++ b/qtdeclarative/tools/qmlcachegen/qmlcachegen.pro
@@ -7,6 +7,10 @@ SOURCES = qmlcachegen.cpp \
     resourcefilter.cpp \
     generateloader.cpp
 
+QMAKE_CXXFLAGS += -arch x86_64 -arch arm64
+QMAKE_CFLAGS += -arch x86_64 -arch arm64
+QMAKE_LFLAGS += -arch x86_64 -arch arm64
+
 include(../shared/shared.pri)
 
 TARGET = qmlcachegen
diff --git a/qtdeclarative/tools/qmlformat/qmlformat.pro b/qtdeclarative/tools/qmlformat/qmlformat.pro
index c8e74a4b55..e99c0effbc 100644
--- a/qtdeclarative/tools/qmlformat/qmlformat.pro
+++ b/qtdeclarative/tools/qmlformat/qmlformat.pro
@@ -9,6 +9,10 @@ SOURCES += main.cpp \
 
 QMAKE_TARGET_DESCRIPTION = QML Formatter
 
+QMAKE_CXXFLAGS += -arch x86_64 -arch arm64
+QMAKE_CFLAGS += -arch x86_64 -arch arm64
+QMAKE_LFLAGS += -arch x86_64 -arch arm64
+
 HEADERS += \
     commentastvisitor.h \
     dumpastvisitor.h \
diff --git a/qtdeclarative/tools/qmlimportscanner/qmlimportscanner.pro b/qtdeclarative/tools/qmlimportscanner/qmlimportscanner.pro
index 33089a5c48..41a564cd59 100644
--- a/qtdeclarative/tools/qmlimportscanner/qmlimportscanner.pro
+++ b/qtdeclarative/tools/qmlimportscanner/qmlimportscanner.pro
@@ -41,6 +41,10 @@ qtConfig(debug_and_release) {
     CMAKE_DEBUG_AND_RELEASE = FALSE
 }
 
+QMAKE_CXXFLAGS += -arch x86_64 -arch arm64
+QMAKE_CFLAGS += -arch x86_64 -arch arm64
+QMAKE_LFLAGS += -arch x86_64 -arch arm64
+
 equals(QMAKE_HOST.os, Windows): CMAKE_BIN_SUFFIX = ".exe"
 cmake_config_file.input = $$PWD/Qt5QmlImportScannerConfig.cmake.in
 cmake_config_file.output = $$MODULE_BASE_OUTDIR/lib/cmake/Qt5QmlImportScanner/Qt5QmlImportScannerConfig.cmake
diff --git a/qtdeclarative/tools/qmllint/qmllint.pro b/qtdeclarative/tools/qmllint/qmllint.pro
index 4b7ca947cf..9db0db931a 100644
--- a/qtdeclarative/tools/qmllint/qmllint.pro
+++ b/qtdeclarative/tools/qmllint/qmllint.pro
@@ -2,6 +2,10 @@ option(host_build)
 
 QT = core-private qmldevtools-private
 
+QMAKE_CXXFLAGS += -arch x86_64 -arch arm64
+QMAKE_CFLAGS += -arch x86_64 -arch arm64
+QMAKE_LFLAGS += -arch x86_64 -arch arm64
+
 SOURCES += main.cpp \
     componentversion.cpp \
     findunqualified.cpp \
diff --git a/qtdeclarative/tools/qmlmin/qmlmin.pro b/qtdeclarative/tools/qmlmin/qmlmin.pro
index 32d9e3343b..5779928c1f 100644
--- a/qtdeclarative/tools/qmlmin/qmlmin.pro
+++ b/qtdeclarative/tools/qmlmin/qmlmin.pro
@@ -4,4 +4,8 @@ SOURCES += main.cpp
 
 QMAKE_TARGET_DESCRIPTION = QML/JS Minifier
 
+QMAKE_CXXFLAGS += -arch x86_64 -arch arm64
+QMAKE_CFLAGS += -arch x86_64 -arch arm64
+QMAKE_LFLAGS += -arch x86_64 -arch arm64
+
 load(qt_tool)
-- 
2.38.1.windows.1