From 5fcf4413928d4b2abed92fd021b4229402d5ad11 Mon Sep 17 00:00:00 2001
From: Axel Waggershauser <awagger@gmail.com>
Date: Tue, 19 Mar 2013 02:57:31 +0100
Subject: Fix '=' alignment and replace tabs in *.conf (whitespace only change)

Replace all tabs with proper space characters and consistently align
the '=' characters. The default alignment for the '=' of 25 characters
has been left as is to get a minimal diff. Lines with the '=' further
to the right and those belonging to 'proper code (TM)' have not been
touched.

The work was mostly done using the following python script (might
come in handy again...):

import sys, re
indent_eq = 25 + 0*4 # 25 characters was the most widely used indentation for the '=' character
p = re.compile(r'(\w+)[ \t]*([\-\+]?)(=$|= )[ \t]*(.*$)')

for fn in sys.argv[1:]:
    with open(fn, 'r+') as f:
        lines = []
        nl_count = 0
        continuity_indent = None
        for l in f:
            m = p.match(l)
            nl = l
            if m:
                n_spaces = max(m.start(3), indent_eq - 1) - len(m.group(2)) - len(m.group(1))
                if m.group(2) and m.start(2) >= indent_eq-1 and m.start(2) % 4 == 0:
                    n_spaces -= 1 # left-shift '+=' by one if the '+' is aligned to a multiple of 4
                n_spaces = max(1, n_spaces) # we want at least one space before '='/'+='
                nl = m.group(1) + ' '*n_spaces + ''.join(m.group(2,3,4)) + '\n'
                continuity_indent = nl.find('= ') + 2 if l[-2] == '\\' else None # remember indent on '\\$'
            elif continuity_indent:
                nl = ' '*continuity_indent + l.lstrip()
                if l[-2] != '\\': # check when to stop the continuation
                    continuity_indent = None
            elif l.startswith('#'):
                nl = l.expandtabs(2)
            if l != nl:
                nl_count += 1
            lines.append(nl)
        if nl_count > 0:
            print fn, nl_count, len(lines)
            f.seek(0)
            f.writelines(lines)
            f.truncate()

Change-Id: I1d2870d0a2fe2e30d398c140fe523e69dd20c81b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
 mkspecs/macx-clang-32/qmake.conf | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'mkspecs/macx-clang-32/qmake.conf')

diff --git a/mkspecs/macx-clang-32/qmake.conf b/mkspecs/macx-clang-32/qmake.conf
index 6a0b65d641..e0c4bd57b7 100644
--- a/mkspecs/macx-clang-32/qmake.conf
+++ b/mkspecs/macx-clang-32/qmake.conf
@@ -2,8 +2,8 @@
 # qmake configuration for 32-bit Clang on OS X
 #
 
-MAKEFILE_GENERATOR = UNIX
-CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname
+MAKEFILE_GENERATOR      = UNIX
+CONFIG                 += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname
 QMAKE_INCREMENTAL_STYLE = sublib
 
 include(../common/macx.conf)
@@ -13,9 +13,9 @@ include(../common/clang-mac.conf)
 
 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
 
-QMAKE_CFLAGS += -arch i386
+QMAKE_CFLAGS           += -arch i386
 QMAKE_OBJECTIVE_CFLAGS += -arch i386
-QMAKE_CXXFLAGS += -arch i386
-QMAKE_LFLAGS += -arch i386
+QMAKE_CXXFLAGS         += -arch i386
+QMAKE_LFLAGS           += -arch i386
 
 load(qt_config)
-- 
cgit v1.2.3