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>
119 lines
3.8 KiB
Plaintext
119 lines
3.8 KiB
Plaintext
#
|
|
# QMake configuration for Scratchbox's host-gcc compiler.
|
|
#
|
|
# This mkspec can be used as the platform mkspec when building
|
|
# Qt in scratchbox. If used as such, qmake and similar host
|
|
# tools will be compiled for the host architecture (E.g. x86)
|
|
# and thus not run in the emulator. This results in a
|
|
# significant improvement in build times.
|
|
#
|
|
# Note: The mkspec copied & pasted parts from common/gcc.conf
|
|
# and common/linux.conf as setBootstrapVariable in
|
|
# configure has a bug which stops re-assignments working
|
|
# for QMake variables (I.e. "QMAKE_foo = bar" is broken).
|
|
|
|
MAKEFILE_GENERATOR = UNIX
|
|
QMAKE_PLATFORM = linux
|
|
CONFIG += incremental
|
|
QMAKE_INCREMENTAL_STYLE = sublib
|
|
|
|
#
|
|
# qmake configuration for common gcc
|
|
#
|
|
|
|
QMAKE_COMPILER = gcc
|
|
|
|
QMAKE_CC = host-gcc
|
|
QMAKE_CFLAGS += -pipe
|
|
QMAKE_CFLAGS_DEPS += -M
|
|
QMAKE_CFLAGS_WARN_ON += -Wall -W
|
|
QMAKE_CFLAGS_WARN_OFF += -w
|
|
QMAKE_CFLAGS_RELEASE += -O2
|
|
QMAKE_CFLAGS_DEBUG += -g
|
|
QMAKE_CFLAGS_SHLIB += -fPIC
|
|
QMAKE_CFLAGS_STATIC_LIB += -fPIC
|
|
QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
|
|
QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
|
|
QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
|
|
QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
|
|
|
|
QMAKE_CXX = host-g++
|
|
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
|
|
QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
|
|
QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
|
|
QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
|
|
QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
|
|
QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
|
|
QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
|
|
QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
|
|
QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC
|
|
QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
|
|
QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
|
|
QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
|
|
|
|
QMAKE_LINK = host-g++
|
|
QMAKE_LINK_SHLIB = host-g++
|
|
QMAKE_LINK_C = host-gcc
|
|
QMAKE_LINK_C_SHLIB = host-gcc
|
|
QMAKE_LFLAGS +=
|
|
QMAKE_LFLAGS_RELEASE += -Wl,-O1
|
|
QMAKE_LFLAGS_DEBUG +=
|
|
QMAKE_LFLAGS_APP +=
|
|
QMAKE_LFLAGS_SHLIB += -shared
|
|
QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
|
|
QMAKE_LFLAGS_SONAME += -Wl,-soname,
|
|
QMAKE_LFLAGS_THREAD +=
|
|
QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
|
|
QMAKE_LFLAGS_RPATH = -Wl,-rpath,
|
|
|
|
QMAKE_PCH_OUTPUT_EXT = .gch
|
|
|
|
# -Bsymbolic-functions (ld) support
|
|
QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
|
|
QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
|
|
|
|
#
|
|
# qmake configuration for common linux
|
|
#
|
|
|
|
QMAKE_CFLAGS_THREAD += -D_REENTRANT
|
|
QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
|
|
|
|
QMAKE_INCDIR =
|
|
QMAKE_LIBDIR =
|
|
QMAKE_INCDIR_X11 =
|
|
QMAKE_LIBDIR_X11 =
|
|
QMAKE_INCDIR_OPENGL =
|
|
QMAKE_LIBDIR_OPENGL =
|
|
QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
|
|
QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
|
|
QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
|
|
QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
|
|
QMAKE_INCDIR_EGL =
|
|
QMAKE_LIBDIR_EGL =
|
|
QMAKE_INCDIR_OPENVG =
|
|
QMAKE_LIBDIR_OPENVG =
|
|
|
|
QMAKE_LIBS =
|
|
QMAKE_LIBS_DYNLOAD = -ldl
|
|
QMAKE_LIBS_X11 = -lXext -lX11 -lm
|
|
QMAKE_LIBS_NIS = -lnsl
|
|
QMAKE_LIBS_EGL = -lEGL
|
|
QMAKE_LIBS_OPENGL = -lGL
|
|
QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
|
|
QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
|
|
QMAKE_LIBS_OPENVG = -lOpenVG
|
|
QMAKE_LIBS_THREAD = -lpthread
|
|
|
|
QMAKE_AR = host-ar cqs
|
|
QMAKE_OBJCOPY = host-objcopy
|
|
QMAKE_RANLIB =
|
|
|
|
QMAKE_STRIP = host-strip
|
|
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
|
|
QMAKE_INSTALL_FILE = install -m 644 -p
|
|
QMAKE_INSTALL_PROGRAM = install -m 755 -p
|
|
|
|
include(../../common/unix.conf)
|
|
load(qt_config)
|