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>
40 lines
965 B
Plaintext
40 lines
965 B
Plaintext
#
|
|
# qmake configuration for qnx-x11-g++
|
|
#
|
|
# Written for QNX RTOS v6 with X11
|
|
#
|
|
|
|
MAKEFILE_GENERATOR = UNIX
|
|
QMAKE_PLATFORM = qnx
|
|
|
|
include(../common/gcc-base-unix.conf)
|
|
include(../common/g++-unix.conf)
|
|
include(../common/unix.conf)
|
|
|
|
QMAKE_CFLAGS_THREAD = -D_REENTRANT
|
|
QMAKE_CXXFLAGS_THREAD = $$QMAKE_CLFAGS_THREAD
|
|
QMAKE_COMPILER_DEFINES += __QNXNTO__
|
|
|
|
QMAKE_INCDIR =
|
|
QMAKE_LIBDIR =
|
|
QMAKE_INCDIR_X11 = /opt/X11R6/include
|
|
QMAKE_LIBDIR_X11 = /opt/X11R6/lib
|
|
QMAKE_INCDIR_OPENGL = /opt/X11R6/include
|
|
QMAKE_LIBDIR_OPENGL = /opt/X11R6/lib
|
|
|
|
#QMAKE_LIBS = -lunix
|
|
QMAKE_LIBS =
|
|
QMAKE_LIBS_DYNLOAD =
|
|
QMAKE_LIBS_X11 = -lXext -lX11 -lm -lsocket
|
|
QMAKE_LIBS_OPENGL = -lGL
|
|
QMAKE_LIBS_THREAD =
|
|
QMAKE_LIBS_NETWORK = -lsocket
|
|
|
|
QMAKE_AR = ar cqs
|
|
QMAKE_RANLIB =
|
|
|
|
QMAKE_STRIP = strip
|
|
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
|
|
|
|
load(qt_config)
|