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>
62 lines
1.9 KiB
Plaintext
62 lines
1.9 KiB
Plaintext
#
|
|
# Base qmake configuration for QCC on *nix-systems
|
|
#
|
|
|
|
include(qcc-base.conf)
|
|
|
|
CONFIG += qnx
|
|
|
|
#Choose qnx QPA Plugin as default
|
|
QT_QPA_DEFAULT_PLATFORM = qnx
|
|
|
|
QMAKE_LFLAGS_SHLIB += -shared
|
|
QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
|
|
QMAKE_LFLAGS_SONAME += -Wl,-soname,
|
|
QMAKE_LFLAGS_THREAD +=
|
|
QMAKE_LFLAGS_RPATH = -Wl,-rpath,
|
|
QMAKE_LFLAGS_RPATHLINK = -Wl,-rpath-link,
|
|
|
|
# -Bsymbolic-functions (ld) support
|
|
QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
|
|
QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
|
|
|
|
# Generic options for all BlackBerry/QNX qcc mkspecs
|
|
QMAKE_CFLAGS_THREAD = -D_REENTRANT
|
|
QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
|
|
QMAKE_COMPILER_DEFINES += __QNXNTO__
|
|
|
|
QMAKE_LIBS = -lm
|
|
QMAKE_LIBS_NETWORK = -lsocket
|
|
|
|
# OpenGL libraries have a dependency on libEGL
|
|
QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM -lEGL
|
|
QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 -lEGL
|
|
QMAKE_LIBS_EGL = -lEGL
|
|
|
|
# When using this mkspec to build Qt apps (ie - not Qt itself) we want to build
|
|
# against the NDK's target directory which is referenced by the QNX_TARGET environment
|
|
# variable, and which is guaranteed by the NDK to be set.
|
|
QNX_DIR = $$(QNX_TARGET)
|
|
isEmpty(QNX_DIR) {
|
|
error("QNX_TARGET environment variable not set")
|
|
}
|
|
|
|
QMAKE_INCDIR = $${QNX_DIR}/usr/include $${QNX_DIR}/usr/include/freetype2
|
|
QMAKE_LIBDIR = $${QNX_DIR}/$${QNX_CPUDIR}/lib $${QNX_DIR}/$${QNX_CPUDIR}/usr/lib
|
|
QMAKE_LFLAGS += -Wl,-rpath-link,$${QNX_DIR}/$${QNX_CPUDIR}/lib -Wl,-rpath-link,$${QNX_DIR}/$${QNX_CPUDIR}/usr/lib
|
|
|
|
QMAKE_CXXFLAGS_CXX11 = -Wc,-std=gnu++0x
|
|
|
|
QMAKE_LINK_C = $$QMAKE_CC
|
|
QMAKE_LINK_C_SHLIB = $$QMAKE_CC
|
|
|
|
QMAKE_LINK = $$QMAKE_CXX
|
|
QMAKE_LINK_SHLIB = $$QMAKE_CXX
|
|
|
|
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
|
|
|
|
equals(QMAKE_HOST.os, Windows) {
|
|
isEmpty(QMAKE_SH): error("This mkspec requires an MSYS environment.")
|
|
QMAKE_DIR_SEP = /
|
|
}
|