Merge branch 'SPI-2013' into 'master'

Build Qt5 with no-framework option for MacOS

Closes SPI-2013

See merge request !984

externals/CMakeLists.txt

@@ -1440,7 +1440,7 @@ LCGPackage_Add(
 
 #---Qt5-------------------------------------------------------------------------------------------------------
 if(LCG_TARGET MATCHES mac)
-  set(Qt5_extra_config_opts -no-pch -skip qtwebengine QMAKE_MACOSX_DEPLOYMENT_TARGET=10.14)
+  set(Qt5_extra_config_opts -no-pch -no-framework -skip qtwebengine QMAKE_MACOSX_DEPLOYMENT_TARGET=10.14)
   set(Qt5_xcb_config_opts -no-xcb)
   set(Qt5_extra_depends harfbuzz)
 elseif(LCG_TARGET MATCHES ubuntu)
@@ -1476,7 +1476,7 @@ LCGPackage_Add(
           COMMAND ${CMAKE_SOURCE_DIR}/externals/Qt_postinstall.sh <INSTALL_DIR>
   BUILD_IN_SOURCE 1
   DEPENDS Python fontconfig ${Qt5_extra_depends}
-  REVISION 1
+  REVISION IF LCG_TARGET MATCHES mac THEN 2 ELSE 1 ENDIF
 )
 
 if (LCG_TARGET MATCHES mac OR LCG_TARGET MATCHES ubuntu)