5fcf441392
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>
34 lines
1.1 KiB
Plaintext
34 lines
1.1 KiB
Plaintext
#
|
|
# qmake configuration derived from linux-g++
|
|
#
|
|
# This mkspec is intended for use with scratchbox 2 (sb2) and assumes the
|
|
# default sb2 target is set appropriately, or you will have to append the
|
|
# appropriate -t $target argument to sb2
|
|
|
|
# If you want to use pkg-config you have to explicitly force it by passing
|
|
# -force-pkg-config to configure. You will probably want to export your
|
|
# PKG_CONFIG_PATH shell variable in order for the host pkg-config to
|
|
# correctly query and utilize your targets .pc files (normally stored in
|
|
# $staging/usr/lib/pkgconfig)
|
|
|
|
MAKEFILE_GENERATOR = UNIX
|
|
CONFIG += incremental
|
|
QMAKE_INCREMENTAL_STYLE = sublib
|
|
|
|
include(../../common/linux.conf)
|
|
include(../../common/gcc-base-unix.conf)
|
|
include(../../common/g++-unix.conf)
|
|
|
|
# modifications to g++.conf
|
|
QMAKE_CC = sb2 gcc
|
|
QMAKE_CXX = sb2 g++
|
|
QMAKE_LINK = sb2 g++
|
|
QMAKE_LINK_SHLIB = sb2 g++
|
|
|
|
# modifications to linux.conf
|
|
QMAKE_AR = sb2 ar cqs
|
|
QMAKE_OBJCOPY = sb2 objcopy
|
|
QMAKE_STRIP = sb2 strip
|
|
|
|
load(qt_config)
|