macOS GN integration

Change-Id: I89850d43c8f11ec54b3a47318ef0b3f083ae3dee
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 38 insertions, 17 deletions

diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
index dfc8d840b..e52051b0c 100644
--- a/src/core/config/mac_osx.pri
+++ b/src/core/config/mac_osx.pri
@@ -19,21 +19,42 @@ QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX)
 QMAKE_CLANG_PATH = "$${QMAKE_CLANG_DIR}/bin/clang++"
 message("Using clang++ from $${QMAKE_CLANG_PATH}")
 system("$${QMAKE_CLANG_PATH} --version")
-GYP_CONFIG += \
-    qt_os=\"mac\" \
-    mac_sdk_min=\"$${QMAKE_MAC_SDK_VERSION}\" \
-    mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \
-    make_clang_dir=\"$${QMAKE_CLANG_DIR}\" \
-    clang_use_chrome_plugins=0
-
-# Force touch API is used in 49-based Chromium, which is included starting with 10.10.3 SDK, so we
-# disable the API usage if the SDK version is lower.
-!isMinOSXSDKVersion(10, 10, 3): GYP_CONFIG += disable_force_touch=1
-
-# Pass a supported -fstack-protect flag depending on Xcode version.
-lessThan(QMAKE_XCODE_VERSION, 6.3) {
-  GYP_CONFIG += use_xcode_stack_protector_strong=0
-}
 
-QMAKE_MAC_SDK_PATH = "$$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.path)"
-exists($$QMAKE_MAC_SDK_PATH): GYP_CONFIG += mac_sdk_path=\"$${QMAKE_MAC_SDK_PATH}\"
+
+use?(gn) {
+    gn_args += \
+        is_clang=true \
+        use_sysroot=false \
+        use_kerberos=false \
+        clang_base_path=\"$${QMAKE_CLANG_DIR}\" \
+        clang_use_chrome_plugins=false \
+        mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \
+        mac_sdk_min=\"$${QMAKE_MAC_SDK_VERSION}\"
+
+    use?(spellchecker) {
+        use?(native_spellchecker): gn_args += use_browser_spellchecker=true
+        else: gn_args += use_browser_spellchecker=false
+    } else {
+        macos: gn_args += use_browser_spellchecker=false
+    }
+
+} else {
+    GYP_CONFIG += \
+        qt_os=\"mac\" \
+        mac_sdk_min=\"$${QMAKE_MAC_SDK_VERSION}\" \
+        mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \
+        make_clang_dir=\"$${QMAKE_CLANG_DIR}\" \
+        clang_use_chrome_plugins=0
+
+    # Force touch API is used in 49-based Chromium, which is included starting with 10.10.3 SDK, so we
+    # disable the API usage if the SDK version is lower.
+    !isMinOSXSDKVersion(10, 10, 3): GYP_CONFIG += disable_force_touch=1
+
+    # Pass a supported -fstack-protect flag depending on Xcode version.
+    lessThan(QMAKE_XCODE_VERSION, 6.3) {
+      GYP_CONFIG += use_xcode_stack_protector_strong=0
+    }
+
+    QMAKE_MAC_SDK_PATH = "$$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.path)"
+    exists($$QMAKE_MAC_SDK_PATH): GYP_CONFIG += mac_sdk_path=\"$${QMAKE_MAC_SDK_PATH}\"
+}