summaryrefslogtreecommitdiffstats
path: root/mkspecs/linux-g++-64/qmake.conf
diff options
context:
space:
mode:
authorAxel Waggershauser <awagger@gmail.com>2013-03-19 02:57:31 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-27 17:16:37 +0100
commit5fcf4413928d4b2abed92fd021b4229402d5ad11 (patch)
tree6408948e400fb47f5bebc4f8e2ea740d4e3f5f69 /mkspecs/linux-g++-64/qmake.conf
parentbbfbf9d24c370177b1d613921f65dd594a0ce9c6 (diff)
Fix '=' alignment and replace tabs in *.conf (whitespace only change)
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>
Diffstat (limited to 'mkspecs/linux-g++-64/qmake.conf')
-rw-r--r--mkspecs/linux-g++-64/qmake.conf12
1 files changed, 6 insertions, 6 deletions
diff --git a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf
index 9e9c37ac56..fc7672f19d 100644
--- a/mkspecs/linux-g++-64/qmake.conf
+++ b/mkspecs/linux-g++-64/qmake.conf
@@ -5,19 +5,19 @@
# like the AMD Opteron.
#
-MAKEFILE_GENERATOR = UNIX
-CONFIG += incremental gdb_dwarf_index
+MAKEFILE_GENERATOR = UNIX
+CONFIG += incremental gdb_dwarf_index
QMAKE_INCREMENTAL_STYLE = sublib
-QMAKE_CFLAGS = -m64
-QMAKE_LFLAGS = -m64
+QMAKE_CFLAGS = -m64
+QMAKE_LFLAGS = -m64
include(../common/linux.conf)
include(../common/gcc-base-unix.conf)
include(../common/g++-unix.conf)
-QMAKE_LIBDIR_X11 = /usr/X11R6/lib64
-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64
+QMAKE_LIBDIR_X11 = /usr/X11R6/lib64
+QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64
load(qt_config)