From 1190ae8d4ffeed78ee6671d03f8da1ba04b2a874 Mon Sep 17 00:00:00 2001
From: kleuter <support@crystalidea.com>
Date: Tue, 24 Nov 2020 14:40:53 +0100
Subject: [PATCH] 5.15.2: test boot strap

---
 5.15.2/compile_mac_arm_cross.sh                         | 6 +++---
 5.15.2/qtbase/src/corelib/global/qconfig-bootstrapped.h | 2 +-
 5.15.2/qtbase/src/tools/bootstrap/bootstrap.pro         | 8 ++++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/5.15.2/compile_mac_arm_cross.sh b/5.15.2/compile_mac_arm_cross.sh
index ace61d5..f0a3de9 100644
--- a/5.15.2/compile_mac_arm_cross.sh
+++ b/5.15.2/compile_mac_arm_cross.sh
@@ -6,17 +6,17 @@ cd qtbase
 
 ./configure -device-option QMAKE_APPLE_DEVICE_ARCHS=arm64 -opensource -confirm-license -nomake examples -nomake tests -no-openssl -securetransport -prefix /usr/local/Qt-5.15.2-arm
 
-make -j 8
+make -j 16
 echo maki | sudo -S sudo make install
 
 cd ../qttools
 qmake
-make -j 8
+make -j 16
 echo maki | sudo -S sudo make install
 
 cd ../qtmacextras
 qmake
-make -j 8
+make -j 16
 echo maki | sudo -S sudo make install
 
 cd /usr/local
diff --git a/5.15.2/qtbase/src/corelib/global/qconfig-bootstrapped.h b/5.15.2/qtbase/src/corelib/global/qconfig-bootstrapped.h
index b3daf43..42b22f7 100644
--- a/5.15.2/qtbase/src/corelib/global/qconfig-bootstrapped.h
+++ b/5.15.2/qtbase/src/corelib/global/qconfig-bootstrapped.h
@@ -104,7 +104,7 @@
 #endif
 #define QT_FEATURE_lttng -1
 #define QT_NO_QOBJECT
-#define QT_FEATURE_process -1
+#define QT_FEATURE_process 1
 #define QT_FEATURE_regularexpression -1
 #ifdef __GLIBC_PREREQ
 # define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1)
diff --git a/5.15.2/qtbase/src/tools/bootstrap/bootstrap.pro b/5.15.2/qtbase/src/tools/bootstrap/bootstrap.pro
index 24862a0..06e161e 100644
--- a/5.15.2/qtbase/src/tools/bootstrap/bootstrap.pro
+++ b/5.15.2/qtbase/src/tools/bootstrap/bootstrap.pro
@@ -59,6 +59,7 @@ SOURCES += \
            ../../corelib/io/qurlidna.cpp \
            ../../corelib/io/qurlquery.cpp \
            ../../corelib/io/qurlrecode.cpp \
+           ../../corelib/io/qprocess.cpp \
            ../../corelib/kernel/qcoreapplication.cpp \
            ../../corelib/kernel/qcoreglobaldata.cpp \
            ../../corelib/kernel/qmetatype.cpp \
@@ -123,7 +124,8 @@ unix:SOURCES += ../../corelib/kernel/qcore_unix.cpp \
                 ../../corelib/kernel/qsystemsemaphore_unix.cpp \
                 ../../corelib/io/qfilesystemengine_unix.cpp \
                 ../../corelib/io/qfilesystemiterator_unix.cpp \
-                ../../corelib/io/qfsfileengine_unix.cpp
+                ../../corelib/io/qfsfileengine_unix.cpp \
+                ../../corelib/io/qprocess_unix.cpp
 
 win32:SOURCES += ../../corelib/global/qoperatingsystemversion_win.cpp \
                  ../../corelib/io/qfilesystemengine_win.cpp \
@@ -134,13 +136,15 @@ win32:SOURCES += ../../corelib/global/qoperatingsystemversion_win.cpp \
                  ../../corelib/kernel/qsystemsemaphore_win.cpp \
                  ../../corelib/plugin/qsystemlibrary.cpp \
                  ../../corelib/kernel/qwinregistry.cpp \
+                 ../../corelib/io/qprocess_win.cpp
 
 mac {
     SOURCES += \
         ../../corelib/kernel/qcoreapplication_mac.cpp \
         ../../corelib/kernel/qcore_mac.mm \
         ../../corelib/global/qoperatingsystemversion_darwin.mm \
-        ../../corelib/kernel/qcore_foundation.mm
+        ../../corelib/kernel/qcore_foundation.mm \
+        ../../corelib/io/qprocess_darwin.mm
 
     LIBS += -framework Foundation
     osx: LIBS_PRIVATE += -framework CoreServices