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>
22 lines
604 B
Plaintext
22 lines
604 B
Plaintext
#
|
|
# 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
|
|
QMAKE_INCREMENTAL_STYLE = sublib
|
|
|
|
include(../common/macx.conf)
|
|
include(../common/gcc-base-mac.conf)
|
|
include(../common/clang.conf)
|
|
include(../common/clang-mac.conf)
|
|
|
|
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
|
|
|
|
QMAKE_CFLAGS += -arch i386
|
|
QMAKE_OBJECTIVE_CFLAGS += -arch i386 -stdlib=libc++
|
|
QMAKE_CXXFLAGS += -arch i386 -stdlib=libc++
|
|
QMAKE_LFLAGS += -arch i386 -stdlib=libc++
|
|
|
|
load(qt_config)
|