1 files changed, 17 insertions, 39 deletions
diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
index 76890a6a4..cdd1ce7b6 100644
--- a/src/core/config/mac_osx.pri
+++ b/src/core/config/mac_osx.pri
@@ -21,44 +21,22 @@ message("Using clang++ from $${QMAKE_CLANG_PATH}")
 system("$${QMAKE_CLANG_PATH} --version")
 
 
-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}\" \
-        toolkit_views=false \
-        use_external_popup_menu=false
-
-    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
-    }
-
-    use?(appstore_compliant_code): gn_args += appstore_compliant_code=true
-
+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}\" \
+    toolkit_views=false \
+    use_external_popup_menu=false
+
+use?(spellchecker) {
+    use?(native_spellchecker): gn_args += use_browser_spellchecker=true
+    else: 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}\"
+    macos: gn_args += use_browser_spellchecker=false
 }
+
+use?(appstore_compliant_code): gn_args += appstore_compliant_code=true