From c7a5b7bed4828c095903c249e4f62cf2bff2a8c5 Mon Sep 17 00:00:00 2001
From: Andras Becsi <andras.becsi@digia.com>
Date: Tue, 4 Feb 2014 17:19:41 +0100
Subject: Clean up qtwebengine.gypi

Fix the indentation and remove some obsolete settings.

Change-Id: I59d3c00f481b2ae124e1b3a6434ff5c68acde53d
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
---
 src/core/qtwebengine.gypi | 83 +++++++++++++++++++----------------------------
 1 file changed, 33 insertions(+), 50 deletions(-)

diff --git a/src/core/qtwebengine.gypi b/src/core/qtwebengine.gypi
index d1415f3f6..20cac744a 100644
--- a/src/core/qtwebengine.gypi
+++ b/src/core/qtwebengine.gypi
@@ -1,16 +1,4 @@
 {
-  'variables': {
-    'blink_process_product_name': 'Blink Process',
-# Define used when building the user agent. Pass as recent enough chrome with an irrealistic minor version.
-      'user_agent_version': '22.42.5.2',
-      'conditions': [
-        ['OS=="linux"', {
-          'use_custom_freetype%': 1,
-        }, {
-          'use_custom_freetype%': 0,
-        }],
-        ],
-  },
     'dependencies': [
       '<(chromium_src_dir)/content/content.gyp:content',
       '<(chromium_src_dir)/content/content.gyp:content_app_browser',
@@ -83,46 +71,41 @@
           '<(chromium_src_dir)/third_party/android_tools/ndk/android_tools_ndk.gyp:cpu_features',
         ],
       }],
-    ['OS=="win"', {
-      'resource_include_dirs': [
-        '<(SHARED_INTERMEDIATE_DIR)/webkit',
-      ],
-      'configurations': {
-        'Debug_Base': {
-          'msvs_settings': {
-            'VCLinkerTool': {
-              'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
+      ['OS=="win"', {
+        'resource_include_dirs': [
+          '<(SHARED_INTERMEDIATE_DIR)/webkit',
+        ],
+        'configurations': {
+          'Debug_Base': {
+            'msvs_settings': {
+              'VCLinkerTool': {
+                'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
+              },
             },
           },
         },
-      },
-# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-      'msvs_disabled_warnings': [ 4267, ],
-    }],  # OS=="win"
-  ['OS=="linux"', {
-    'dependencies': [
-      '<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
-    ],
-  }],
-    ['os_posix==1 and linux_use_tcmalloc==1', {
-      'dependencies': [
-# This is needed by content/app/content_main_runner.cc
-        '<(chromium_src_dir)/base/allocator/allocator.gyp:allocator',
-      ],
-    }],
-    ['use_aura==1', {
-      'dependencies': [
-        '<(chromium_src_dir)/ui/aura/aura.gyp:aura',
-        '<(chromium_src_dir)/ui/base/strings/ui_strings.gyp:ui_strings',
-        '<(chromium_src_dir)/ui/views/controls/webview/webview.gyp:webview',
-        '<(chromium_src_dir)/ui/views/views.gyp:views',
-        '<(chromium_src_dir)/ui/ui.gyp:ui_resources',
-      ],
-    }],  # use_aura==1
-  ['use_custom_freetype==1', {
-    'dependencies': [
-      '<(chromium_src_dir)/third_party/freetype2/freetype2.gyp:freetype2',
-    ],
-  }],
+        # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+        'msvs_disabled_warnings': [ 4267, ],
+      }],  # OS=="win"
+      ['OS=="linux"', {
+        'dependencies': [
+          '<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
+        ],
+      }],
+      ['os_posix==1 and linux_use_tcmalloc==1', {
+        'dependencies': [
+          # This is needed by content/app/content_main_runner.cc
+          '<(chromium_src_dir)/base/allocator/allocator.gyp:allocator',
+        ],
+      }],
+      ['use_aura==1', {
+        'dependencies': [
+          '<(chromium_src_dir)/ui/aura/aura.gyp:aura',
+          '<(chromium_src_dir)/ui/base/strings/ui_strings.gyp:ui_strings',
+          '<(chromium_src_dir)/ui/views/controls/webview/webview.gyp:webview',
+          '<(chromium_src_dir)/ui/views/views.gyp:views',
+          '<(chromium_src_dir)/ui/ui.gyp:ui_resources',
+        ],
+      }],  # use_aura==1
     ],
 }
-- 
cgit v1.2.3