From 19ad2e47bd69831fd595a28cb18d0285527f6fdc Mon Sep 17 00:00:00 2001
From: Benjamin Alterauge <5332429+ageeye@users.noreply.github.com>
Date: Wed, 3 Feb 2021 18:28:14 +0100
Subject: [PATCH] Temporarily qt5 fixes for Apple Silicon need to disable the
 qtwebengine. That has to be considered in MacAppBundle.

---
 src/MacAppBundle/CMakeLists.txt | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/MacAppBundle/CMakeLists.txt b/src/MacAppBundle/CMakeLists.txt
index c8bd761b73..c0b6ccf09f 100644
--- a/src/MacAppBundle/CMakeLists.txt
+++ b/src/MacAppBundle/CMakeLists.txt
@@ -63,16 +63,17 @@ if(BUILD_QT5)
 endif(BUILD_QT5)
 
   # add QtWebEngineProcess to bundle
+  if(BUILD_WEB)
   install(PROGRAMS "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess" DESTINATION ${CMAKE_INSTALL_PREFIX}/MacOS)
 
   # add locales to bundle
-  file(GLOB _locales_files RELATIVE "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/qtwebengine_locales" "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/qtwebengine_locales/*")
-  foreach(_locales_file ${_locales_files})
+  	file(GLOB _locales_files RELATIVE "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/qtwebengine_locales" "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/qtwebengine_locales/*")
+  	foreach(_locales_file ${_locales_files})
         get_filename_component(_resolved_file "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/qtwebengine_locales/${_locales_file}" REALPATH)
         list(APPEND _locales_resolved_files ${_resolved_file})
-  endforeach()
-  install(FILES ${_locales_resolved_files} DESTINATION "${CMAKE_INSTALL_PREFIX}/MacOS/qtwebengine_locales")
-
+  	endforeach()
+  	install(FILES ${_locales_resolved_files} DESTINATION "${CMAKE_INSTALL_PREFIX}/MacOS/qtwebengine_locales")
+  
   # add pak
   file(GLOB _pak_files RELATIVE "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/" "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/*.pak")
   foreach(_pak_file ${_pak_files})
@@ -82,9 +83,10 @@ endif(BUILD_QT5)
   install(FILES ${_pak_resolved_files} DESTINATION "${CMAKE_INSTALL_PREFIX}/")
 
   # add icudtl.dat
+ 
   install(PROGRAMS "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/icudtl.dat" DESTINATION ${CMAKE_INSTALL_PREFIX}/)
-  install(PROGRAMS "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/QtWebEngineCore.prl" DESTINATION ${CMAKE_INSTALL_PREFIX}/)
-
+  	install(PROGRAMS "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/QtWebEngineCore.prl" DESTINATION ${CMAKE_INSTALL_PREFIX}/)
+  endif(BUILD_WEB)
 
 
 # Ensure the actual plugin files are installed instead of symlinks.