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>

1 files changed, 17 insertions, 17 deletions

diff --git a/mkspecs/unsupported/android-g++/qmake.conf b/mkspecs/unsupported/android-g++/qmake.conf
index 1955054880..71b843af7e 100644
--- a/mkspecs/unsupported/android-g++/qmake.conf
+++ b/mkspecs/unsupported/android-g++/qmake.conf
@@ -135,26 +135,26 @@ QMAKE_INCDIR_OPENGL_ES2 =
 QMAKE_LIBDIR_OPENGL_ES2 =
 
 
-QMAKE_LINK              =   $$QMAKE_CXX
-QMAKE_LINK_SHLIB        =   $$QMAKE_CXX
-QMAKE_LFLAGS            =   $${ANDROID_TARGET_LDFLAGS} \
-                            -nostdlib  \
-                            -L${ANDROID_PRODUCT_OUT}/obj/lib \
-                            -Wl,-rpath-link,${ANDROID_PRODUCT_OUT}/obj/lib
+QMAKE_LINK              = $$QMAKE_CXX
+QMAKE_LINK_SHLIB        = $$QMAKE_CXX
+QMAKE_LFLAGS            = $${ANDROID_TARGET_LDFLAGS} \
+                          -nostdlib  \
+                          -L${ANDROID_PRODUCT_OUT}/obj/lib \
+                          -Wl,-rpath-link,${ANDROID_PRODUCT_OUT}/obj/lib
 
-QMAKE_LFLAGS_PLUGIN     =   -Wl,-T,${ANDROID_BUILD_TOP}/build/core/armelf.xsc \
-                            -Wl,-shared,-Bsymbolic
+QMAKE_LFLAGS_PLUGIN     = -Wl,-T,${ANDROID_BUILD_TOP}/build/core/armelf.xsc \
+                          -Wl,-shared,-Bsymbolic
 
 #apparantly this file is missing from some builds.
 #it does work without, but this may change in future.
 #QMAKE_LFLAGS_APP        =   -Wl,-T,${ANDROID_BUILD_TOP}/build/core/armelf.xs \
-QMAKE_LFLAGS_APP        =   ${ANDROID_PRODUCT_OUT}/obj/lib/crtbegin_dynamic.o \
-                            ${ANDROID_PRODUCT_OUT}/obj/lib/crtend_android.o
+QMAKE_LFLAGS_APP        = ${ANDROID_PRODUCT_OUT}/obj/lib/crtbegin_dynamic.o \
+                          ${ANDROID_PRODUCT_OUT}/obj/lib/crtend_android.o
 
-QMAKE_LFLAGS_SHLIB      =   -Wl,-T,${ANDROID_BUILD_TOP}/build/core/armelf.xsc \
-                            -Wl,-shared,-Bsymbolic \
-                            ${ANDROID_PRODUCT_OUT}/obj/lib/crtbegin_so.o \
-                            ${ANDROID_PRODUCT_OUT}/obj/lib/crtend_so.o
+QMAKE_LFLAGS_SHLIB      = -Wl,-T,${ANDROID_BUILD_TOP}/build/core/armelf.xsc \
+                          -Wl,-shared,-Bsymbolic \
+                          ${ANDROID_PRODUCT_OUT}/obj/lib/crtbegin_so.o \
+                          ${ANDROID_PRODUCT_OUT}/obj/lib/crtend_so.o
 
 QMAKE_LFLAGS_SONAME     =
 QMAKE_LFLAGS_NOUNDEF    = -Wl,--no-undefined
@@ -174,12 +174,12 @@ QMAKE_LIBS_OPENGL       =
 QMAKE_LIBS_OPENGL_ES1   = -lGLESv1_CM
 QMAKE_LIBS_OPENGL_ES2   = -lEGL -lGLESv2 $$QMAKE_LIBS
 
-CONFIG += linux-android-9 android-9 linux-android android android-no-sdk android_app
+CONFIG                 += linux-android-9 android-9 linux-android android android-no-sdk android_app
 
 load(qt_config)
 
 # we don't support exceptions, but right now this has no effect
 # you need to manually delete mkspecs/features/exceptions.prf
-CONFIG -= exceptions
-CONFIG += exceptions_off
+CONFIG                 -= exceptions
+CONFIG                 += exceptions_off