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>

12 files changed, 330 insertions, 330 deletions

diff --git a/mkspecs/unsupported/android-g++/qmake.conf b/mkspecs/unsupported/android-g++/qmake.conf
index 1955054880..71b843af7e 100644
--- a/mkspecs/unsupported/android-g++/qmake.conf
+++ b/mkspecs/unsupported/android-g++/qmake.conf
@@ -135,26 +135,26 @@ QMAKE_INCDIR_OPENGL_ES2 =
 QMAKE_LIBDIR_OPENGL_ES2 =
 
 
-QMAKE_LINK              =   $$QMAKE_CXX
-QMAKE_LINK_SHLIB        =   $$QMAKE_CXX
-QMAKE_LFLAGS            =   $${ANDROID_TARGET_LDFLAGS} \
-                            -nostdlib  \
-                            -L${ANDROID_PRODUCT_OUT}/obj/lib \
-                            -Wl,-rpath-link,${ANDROID_PRODUCT_OUT}/obj/lib
+QMAKE_LINK              = $$QMAKE_CXX
+QMAKE_LINK_SHLIB        = $$QMAKE_CXX
+QMAKE_LFLAGS            = $${ANDROID_TARGET_LDFLAGS} \
+                          -nostdlib  \
+                          -L${ANDROID_PRODUCT_OUT}/obj/lib \
+                          -Wl,-rpath-link,${ANDROID_PRODUCT_OUT}/obj/lib
 
-QMAKE_LFLAGS_PLUGIN     =   -Wl,-T,${ANDROID_BUILD_TOP}/build/core/armelf.xsc \
-                            -Wl,-shared,-Bsymbolic
+QMAKE_LFLAGS_PLUGIN     = -Wl,-T,${ANDROID_BUILD_TOP}/build/core/armelf.xsc \
+                          -Wl,-shared,-Bsymbolic
 
 #apparantly this file is missing from some builds.
 #it does work without, but this may change in future.
 #QMAKE_LFLAGS_APP        =   -Wl,-T,${ANDROID_BUILD_TOP}/build/core/armelf.xs \
-QMAKE_LFLAGS_APP        =   ${ANDROID_PRODUCT_OUT}/obj/lib/crtbegin_dynamic.o \
-                            ${ANDROID_PRODUCT_OUT}/obj/lib/crtend_android.o
+QMAKE_LFLAGS_APP        = ${ANDROID_PRODUCT_OUT}/obj/lib/crtbegin_dynamic.o \
+                          ${ANDROID_PRODUCT_OUT}/obj/lib/crtend_android.o
 
-QMAKE_LFLAGS_SHLIB      =   -Wl,-T,${ANDROID_BUILD_TOP}/build/core/armelf.xsc \
-                            -Wl,-shared,-Bsymbolic \
-                            ${ANDROID_PRODUCT_OUT}/obj/lib/crtbegin_so.o \
-                            ${ANDROID_PRODUCT_OUT}/obj/lib/crtend_so.o
+QMAKE_LFLAGS_SHLIB      = -Wl,-T,${ANDROID_BUILD_TOP}/build/core/armelf.xsc \
+                          -Wl,-shared,-Bsymbolic \
+                          ${ANDROID_PRODUCT_OUT}/obj/lib/crtbegin_so.o \
+                          ${ANDROID_PRODUCT_OUT}/obj/lib/crtend_so.o
 
 QMAKE_LFLAGS_SONAME     =
 QMAKE_LFLAGS_NOUNDEF    = -Wl,--no-undefined
@@ -174,12 +174,12 @@ QMAKE_LIBS_OPENGL       =
 QMAKE_LIBS_OPENGL_ES1   = -lGLESv1_CM
 QMAKE_LIBS_OPENGL_ES2   = -lEGL -lGLESv2 $$QMAKE_LIBS
 
-CONFIG += linux-android-9 android-9 linux-android android android-no-sdk android_app
+CONFIG                 += linux-android-9 android-9 linux-android android android-no-sdk android_app
 
 load(qt_config)
 
 # we don't support exceptions, but right now this has no effect
 # you need to manually delete mkspecs/features/exceptions.prf
-CONFIG -= exceptions
-CONFIG += exceptions_off
+CONFIG                 -= exceptions
+CONFIG                 += exceptions_off
 
diff --git a/mkspecs/unsupported/integrity-ghs/qmake.conf b/mkspecs/unsupported/integrity-ghs/qmake.conf
index 72f31477df..1ffc2ccec8 100644
--- a/mkspecs/unsupported/integrity-ghs/qmake.conf
+++ b/mkspecs/unsupported/integrity-ghs/qmake.conf
@@ -2,51 +2,51 @@
 # qmake configuration for integrity-ghs
 #
 
-MAKEFILE_GENERATOR	= GBUILD
-QMAKE_PLATFORM = integrity unix posix
-CONFIG -= link_prl   # Not implemented
-
-QMAKE_CFLAGS		= -bsp $$INTEGRITY_BSP -os_dir $__OS_DIR
-QMAKE_CFLAGS		+= --diag_suppress=1,228,236,381,611,997
-QMAKE_CFLAGS_WARN_ON	=
-QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -g -Ospeed -Olink --signed_fields --no_commons
-QMAKE_CFLAGS_DEBUG	= -g --no_commons --signed_fields
-QMAKE_CFLAGS_SHLIB	=
-QMAKE_CFLAGS_THREAD	= -D_REENTRANT
-
-QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS --no_implicit_include --link_once_templates
-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_YACC	= $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
-
-QMAKE_INCDIR		=
-QMAKE_LIBDIR		=
-QMAKE_INCDIR_X11	=
-QMAKE_LIBDIR_X11	=
-QMAKE_INCDIR_OPENGL	=
-QMAKE_LIBDIR_OPENGL	=
-
-QMAKE_LFLAGS		= -lposix -livfs -lnet -lsocket -lfbdev -ldl
-QMAKE_LFLAGS_RELEASE	= -g -Ospeed -Olink --no_commons -non_shared --link_once_templates
-QMAKE_LFLAGS_DEBUG	= -g --no_commons
+MAKEFILE_GENERATOR      = GBUILD
+QMAKE_PLATFORM          = integrity unix posix
+CONFIG                 -= link_prl   # Not implemented
+
+QMAKE_CFLAGS            = -bsp $$INTEGRITY_BSP -os_dir $__OS_DIR
+QMAKE_CFLAGS           += --diag_suppress=1,228,236,381,611,997
+QMAKE_CFLAGS_WARN_ON    =
+QMAKE_CFLAGS_WARN_OFF   = -w
+QMAKE_CFLAGS_RELEASE    = -g -Ospeed -Olink --signed_fields --no_commons
+QMAKE_CFLAGS_DEBUG      = -g --no_commons --signed_fields
+QMAKE_CFLAGS_SHLIB      =
+QMAKE_CFLAGS_THREAD     = -D_REENTRANT
+
+QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS --no_implicit_include --link_once_templates
+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_YACC     = $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
+
+QMAKE_INCDIR            =
+QMAKE_LIBDIR            =
+QMAKE_INCDIR_X11        =
+QMAKE_LIBDIR_X11        =
+QMAKE_INCDIR_OPENGL     =
+QMAKE_LIBDIR_OPENGL     =
+
+QMAKE_LFLAGS            = -lposix -livfs -lnet -lsocket -lfbdev -ldl
+QMAKE_LFLAGS_RELEASE    = -g -Ospeed -Olink --no_commons -non_shared --link_once_templates
+QMAKE_LFLAGS_DEBUG      = -g --no_commons
 QMAKE_LFLAGS_SHLIB      =
 QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME     =
 QMAKE_LFLAGS_THREAD     =
 QMAKE_LFLAGS_RPATH      =
 
-QMAKE_LIBS		=
+QMAKE_LIBS              =
 QMAKE_LIBS_DYNLOAD      = -ldl
-QMAKE_LIBS_X11		=
+QMAKE_LIBS_X11          =
 QMAKE_LIBS_THREAD       =
 
-QMAKE_AR		= ar cqs
-QMAKE_RANLIB		=
+QMAKE_AR                = ar cqs
+QMAKE_RANLIB            =
 
 include(../../common/shell-unix.conf)
 load(qt_config)
diff --git a/mkspecs/unsupported/linux-armcc/qmake.conf b/mkspecs/unsupported/linux-armcc/qmake.conf
index a65f8d534e..2c7eb7c2d8 100644
--- a/mkspecs/unsupported/linux-armcc/qmake.conf
+++ b/mkspecs/unsupported/linux-armcc/qmake.conf
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR      = UNIX
-CONFIG                  += incremental armcc_linker
+CONFIG                 += incremental armcc_linker
 QMAKE_INCREMENTAL_STYLE = sublib
 
 include(../../common/linux.conf)
@@ -11,19 +11,19 @@ include(../../common/armcc.conf)
 load(qt_config)
 
 # use armcc for linking since armlink doesn't understand the arm_linux_config_file option
-QMAKE_LINK		= armcc
-QMAKE_LINK_SHLIB	= armcc
-QMAKE_LINK_C		= armcc
-QMAKE_LINK_C_SHLIB	= armcc
+QMAKE_LINK              = armcc
+QMAKE_LINK_SHLIB        = armcc
+QMAKE_LINK_C            = armcc
+QMAKE_LINK_C_SHLIB      = armcc
 
-QMAKE_LFLAGS_SHLIB      += --apcs=/fpic --shared
+QMAKE_LFLAGS_SHLIB     += --apcs=/fpic --shared
 QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
 
-QMAKE_LIBS              += libstdc++.so librt.so
+QMAKE_LIBS             += libstdc++.so librt.so
 
-CONFIG -= rvct_linker
+CONFIG                 -= rvct_linker
 
-QMAKE_CFLAGS            += --gnu --arm_linux --dllimport_runtime --thumb --cpu Cortex-A9 --arm_linux_config_file="$(HOME)/qt_rvct_config" --arm-linux-paths --apcs=/interwork --visibility_inlines_hidden --diag_suppress 1300,2523
-QMAKE_CXXFLAGS          += $$QMAKE_CFLAGS --cpp
+QMAKE_CFLAGS           += --gnu --arm_linux --dllimport_runtime --thumb --cpu Cortex-A9 --arm_linux_config_file="$(HOME)/qt_rvct_config" --arm-linux-paths --apcs=/interwork --visibility_inlines_hidden --diag_suppress 1300,2523
+QMAKE_CXXFLAGS         += $$QMAKE_CFLAGS --cpp
 
-QMAKE_LFLAGS            += --diag_suppress 6331,6780,6439 --arm_linux_config_file="$(HOME)/qt_rvct_config" --arm-linux-paths
+QMAKE_LFLAGS           += --diag_suppress 6331,6780,6439 --arm_linux_config_file="$(HOME)/qt_rvct_config" --arm-linux-paths
diff --git a/mkspecs/unsupported/linux-host-g++/qmake.conf b/mkspecs/unsupported/linux-host-g++/qmake.conf
index 47579600c1..710c1876aa 100644
--- a/mkspecs/unsupported/linux-host-g++/qmake.conf
+++ b/mkspecs/unsupported/linux-host-g++/qmake.conf
@@ -12,41 +12,41 @@
 #       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
+MAKEFILE_GENERATOR      = UNIX
+QMAKE_PLATFORM          = linux
+CONFIG                 += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
 
 #
 # qmake configuration for common gcc
 #
 
-QMAKE_COMPILER = 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           += -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_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         += $$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_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_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
@@ -55,15 +55,15 @@ 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           +=
+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
@@ -76,43 +76,43 @@ QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
 # qmake configuration for common linux
 #
 
-QMAKE_CFLAGS_THREAD	+= -D_REENTRANT
-QMAKE_CXXFLAGS_THREAD	+= $$QMAKE_CFLAGS_THREAD
+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            =
+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_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_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_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
+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)
diff --git a/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf b/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf
index 069b016adb..a300712d33 100644
--- a/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf
+++ b/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf
@@ -11,8 +11,8 @@
 # correctly query and utilize your targets .pc files (normally stored in
 # $staging/usr/lib/pkgconfig)
 
-MAKEFILE_GENERATOR	= UNIX
-CONFIG += incremental
+MAKEFILE_GENERATOR      = UNIX
+CONFIG                 += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
 
 include(../../common/linux.conf)
diff --git a/mkspecs/unsupported/macx-ios-clang/qmake.conf b/mkspecs/unsupported/macx-ios-clang/qmake.conf
index 7805c079bb..32d10a06ed 100644
--- a/mkspecs/unsupported/macx-ios-clang/qmake.conf
+++ b/mkspecs/unsupported/macx-ios-clang/qmake.conf
@@ -9,8 +9,8 @@ QMAKE_INCREMENTAL_STYLE = sublib
 QMAKE_MACOSX_DEPLOYMENT_TARGET  =
 QMAKE_IOS_DEPLOYMENT_TARGET     = 4.3
 
-INCLUDEPATH += $$PWD/ios
-DEFINES += DARWIN_NO_CARBON QT_NO_CORESERVICES QT_NO_PRINTER QT_NO_PRINTDIALOG
+INCLUDEPATH            += $$PWD/ios
+DEFINES                += DARWIN_NO_CARBON QT_NO_CORESERVICES QT_NO_PRINTER QT_NO_PRINTDIALOG
 
 # Universal target (iPhone and iPad)
 QMAKE_IOS_TARGETED_DEVICE_FAMILY = 1,2
diff --git a/mkspecs/unsupported/qnx-X11-g++/qmake.conf b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
index 21b76df9b0..8d2c63f330 100644
--- a/mkspecs/unsupported/qnx-X11-g++/qmake.conf
+++ b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
@@ -4,36 +4,36 @@
 # Written for QNX RTOS v6 with X11
 #
 
-MAKEFILE_GENERATOR	= UNIX
-QMAKE_PLATFORM = qnx
+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_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_AR                = ar cqs
+QMAKE_RANLIB            =
 
-QMAKE_STRIP           = strip
-QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+QMAKE_STRIP             = strip
+QMAKE_STRIPFLAGS_LIB   += --strip-unneeded
 
 load(qt_config)
diff --git a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
index afb92485b3..806484369b 100644
--- a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
+++ b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
@@ -2,58 +2,58 @@
 # qmake configuration for vxworks-ppc-dcc
 #
 
-MAKEFILE_GENERATOR  = UNIX
-QMAKE_PLATFORM      = vxworks
-CONFIG             += incremental
+MAKEFILE_GENERATOR      = UNIX
+QMAKE_PLATFORM          = vxworks
+CONFIG                 += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
 
-VXWORKS_ARCH        = ppc
-VXWORKS_CPU         = PPC32
-VXWORKS_DIAB_SPEC   = -tPPC7400FV:vxworks66
-VXWORKS_ARCH_MUNCH  = ppc
-
-QMAKE_COMPILER = wr_dcc
-
-QMAKE_CC		= dcc
-QMAKE_CFLAGS		+= $$VXWORKS_DIAB_SPEC -Xkeywords=0x0 -Xcode-absolute-far -Xansi -Xforce-declarations -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip -DCPU=$$upper($$VXWORKS_ARCH) -DVX_CPU_FAMILY=$$VXWORKS_ARCH -DTOOL_FAMILY=diab -DTOOL=diab -D_WRS_KERNEL -DVXWORKS -D_VSB_CONFIG_FILE=\'<../lib/h/config/vsbConfig.h>\'
-QMAKE_CFLAGS_DEPS	+=
-QMAKE_CFLAGS_WARN_ON	+=
-QMAKE_CFLAGS_WARN_OFF	+= -Xsuppress-warnings
-QMAKE_CFLAGS_RELEASE	+=
-QMAKE_CFLAGS_DEBUG	+= -g
-QMAKE_CFLAGS_SHLIB	+=
-QMAKE_CFLAGS_STATIC_LIB	+=
-QMAKE_CFLAGS_YACC	+=
-QMAKE_CFLAGS_HIDESYMS   +=
+VXWORKS_ARCH            = ppc
+VXWORKS_CPU             = PPC32
+VXWORKS_DIAB_SPEC       = -tPPC7400FV:vxworks66
+VXWORKS_ARCH_MUNCH      = ppc
+
+QMAKE_COMPILER          = wr_dcc
+
+QMAKE_CC                = dcc
+QMAKE_CFLAGS           += $$VXWORKS_DIAB_SPEC -Xkeywords=0x0 -Xcode-absolute-far -Xansi -Xforce-declarations -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip -DCPU=$$upper($$VXWORKS_ARCH) -DVX_CPU_FAMILY=$$VXWORKS_ARCH -DTOOL_FAMILY=diab -DTOOL=diab -D_WRS_KERNEL -DVXWORKS -D_VSB_CONFIG_FILE=\'<../lib/h/config/vsbConfig.h>\'
+QMAKE_CFLAGS_DEPS      +=
+QMAKE_CFLAGS_WARN_ON   +=
+QMAKE_CFLAGS_WARN_OFF  += -Xsuppress-warnings
+QMAKE_CFLAGS_RELEASE   +=
+QMAKE_CFLAGS_DEBUG     += -g
+QMAKE_CFLAGS_SHLIB     +=
+QMAKE_CFLAGS_STATIC_LIB +=
+QMAKE_CFLAGS_YACC      +=
+QMAKE_CFLAGS_HIDESYMS  +=
 QMAKE_CFLAGS_PRECOMPILE +=
 QMAKE_CFLAGS_USE_PRECOMPILE +=
 
-QMAKE_CXX		= dcc
-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_CXX               = dcc
+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_YACC    += $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS
 QMAKE_CXXFLAGS_PRECOMPILE +=
 QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
 
-QMAKE_LINK		= dld
-QMAKE_LINK_SHLIB	= dld
-QMAKE_LFLAGS		+= $$VXWORKS_DIAB_SPEC
-QMAKE_LFLAGS_RELEASE	+=
-QMAKE_LFLAGS_DEBUG	+=
-QMAKE_LFLAGS_APP	+= -r5
-QMAKE_LFLAGS_SHLIB	+=
-QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME	+=
-QMAKE_LFLAGS_THREAD	+=
-QMAKE_LFLAGS_NOUNDEF	+=
-QMAKE_LFLAGS_RPATH	=
+QMAKE_LINK              = dld
+QMAKE_LINK_SHLIB        = dld
+QMAKE_LFLAGS           += $$VXWORKS_DIAB_SPEC
+QMAKE_LFLAGS_RELEASE   +=
+QMAKE_LFLAGS_DEBUG     +=
+QMAKE_LFLAGS_APP       += -r5
+QMAKE_LFLAGS_SHLIB     +=
+QMAKE_LFLAGS_PLUGIN    += $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_SONAME    +=
+QMAKE_LFLAGS_THREAD    +=
+QMAKE_LFLAGS_NOUNDEF   +=
+QMAKE_LFLAGS_RPATH      =
 
 QMAKE_PCH_OUTPUT_EXT    = .gch
 
@@ -61,33 +61,33 @@ QMAKE_PCH_OUTPUT_EXT    = .gch
 QMAKE_LFLAGS_BSYMBOLIC_FUNC =
 QMAKE_LFLAGS_DYNAMIC_LIST =
 
-QMAKE_CFLAGS_THREAD	+= -D_REENTRANT
-QMAKE_CXXFLAGS_THREAD	+= $$QMAKE_CFLAGS_THREAD
-
-QMAKE_INCDIR          =
-QMAKE_LIBDIR          =
-QMAKE_INCDIR_X11      = $(WIND_HOME)/GSS/include
-QMAKE_LIBDIR_X11      = $(WIND_HOME)/GSS/lib
-QMAKE_INCDIR_OPENGL   = $$QMAKE_INCDIR_X11
-QMAKE_LIBDIR_OPENGL   = $$QMAKE_LIBDIR_X11
-
-QMAKE_LIBS            =
-QMAKE_LIBS_DYNLOAD    =
-QMAKE_LIBS_X11        = -lXext -lX11
-QMAKE_LIBS_NIS        = -lnsl
-QMAKE_LIBS_OPENGL     = -lGL
-QMAKE_LIBS_THREAD     =
-QMAKE_LIBS_NETWORK    = # -lnetwrap # only needed if kernel is missing gethostbyname and friends
-
-
-QMAKE_AR              = ar cqs
-QMAKE_OBJCOPY         = objcopy
-QMAKE_RANLIB          =
-
-QMAKE_STRIP           = strip
-QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_INSTALL_FILE    = install -m 644 -p
-QMAKE_INSTALL_PROGRAM = install -m 755 -p
+QMAKE_CFLAGS_THREAD    += -D_REENTRANT
+QMAKE_CXXFLAGS_THREAD  += $$QMAKE_CFLAGS_THREAD
+
+QMAKE_INCDIR            =
+QMAKE_LIBDIR            =
+QMAKE_INCDIR_X11        = $(WIND_HOME)/GSS/include
+QMAKE_LIBDIR_X11        = $(WIND_HOME)/GSS/lib
+QMAKE_INCDIR_OPENGL     = $$QMAKE_INCDIR_X11
+QMAKE_LIBDIR_OPENGL     = $$QMAKE_LIBDIR_X11
+
+QMAKE_LIBS              =
+QMAKE_LIBS_DYNLOAD      =
+QMAKE_LIBS_X11          = -lXext -lX11
+QMAKE_LIBS_NIS          = -lnsl
+QMAKE_LIBS_OPENGL       = -lGL
+QMAKE_LIBS_THREAD       =
+QMAKE_LIBS_NETWORK      = # -lnetwrap # only needed if kernel is missing gethostbyname and friends
+
+
+QMAKE_AR                = ar cqs
+QMAKE_OBJCOPY           = objcopy
+QMAKE_RANLIB            =
+
+QMAKE_STRIP             = 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)
diff --git a/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf b/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf
index e659639ae4..1d3e9f4eb4 100644
--- a/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf
+++ b/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf
@@ -2,36 +2,36 @@
 # qmake configuration for vxworks-simpentium-g++
 #
 
-MAKEFILE_GENERATOR  = UNIX
-QMAKE_PLATFORM      = vxworks
-CONFIG             += incremental
+MAKEFILE_GENERATOR      = UNIX
+QMAKE_PLATFORM          = vxworks
+CONFIG                 += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
-DEFINES            += VXWORKS
+DEFINES                += VXWORKS
 
-VXWORKS_ARCH        = ppc
-VXWORKS_CPU         = PPC32
-VXWORKS_ARCH_MUNCH  = ppc
+VXWORKS_ARCH            = ppc
+VXWORKS_CPU             = PPC32
+VXWORKS_ARCH_MUNCH      = ppc
 
 include(../../common/gcc-base-unix.conf)
 include(../../common/g++-unix.conf)
 include(../../common/linux.conf)
 
-QMAKE_CC            = cc$$VXWORKS_ARCH_MUNCH
-QMAKE_CFLAGS        = -fno-builtin -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip -DCPU=$$upper($$VXWORKS_ARCH) -DVX_CPU_FAMILY=$$VXWORKS_ARCH -DTOOL_FAMILY=gnu -DTOOL=gnu -D_WRS_KERNEL -D_VSB_CONFIG_FILE=\'<../lib/h/config/vsbConfig.h>\'
-QMAKE_CFLAGS_SHLIB  =  # remove -fPIC
-QMAKE_CFLAGS_STATIC_LIB  =  # remove -fPIC
-QMAKE_CXX           = c++$$VXWORKS_ARCH_MUNCH
-QMAKE_CXXFLAGS      = $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS_SHLIB=  # remove -fPIC
-QMAKE_CXXFLAGS_STATIC_LIB=  # remove -fPIC
-QMAKE_LINK          = $$QMAKE_CXX
-QMAKE_LINK_SHLIB    = $$QMAKE_CXX
-QMAKE_LFLAGS_SHLIB  = -Wl,-Ur -L $(WIND_BASE)/target/lib/$$VXWORKS_ARCH/$$VXWORKS_CPU/common # remove -shared
-QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_APP   += -Wl,-Ur -L $(WIND_BASE)/target/lib/$$VXWORKS_ARCH/$$VXWORKS_CPU/common
+QMAKE_CC                = cc$$VXWORKS_ARCH_MUNCH
+QMAKE_CFLAGS            = -fno-builtin -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip -DCPU=$$upper($$VXWORKS_ARCH) -DVX_CPU_FAMILY=$$VXWORKS_ARCH -DTOOL_FAMILY=gnu -DTOOL=gnu -D_WRS_KERNEL -D_VSB_CONFIG_FILE=\'<../lib/h/config/vsbConfig.h>\'
+QMAKE_CFLAGS_SHLIB      = # remove -fPIC
+QMAKE_CFLAGS_STATIC_LIB  = # remove -fPIC
+QMAKE_CXX               = c++$$VXWORKS_ARCH_MUNCH
+QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
+QMAKE_CXXFLAGS_SHLIB    = # remove -fPIC
+QMAKE_CXXFLAGS_STATIC_LIB = # remove -fPIC
+QMAKE_LINK              = $$QMAKE_CXX
+QMAKE_LINK_SHLIB        = $$QMAKE_CXX
+QMAKE_LFLAGS_SHLIB      = -Wl,-Ur -L $(WIND_BASE)/target/lib/$$VXWORKS_ARCH/$$VXWORKS_CPU/common # remove -shared
+QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_APP       += -Wl,-Ur -L $(WIND_BASE)/target/lib/$$VXWORKS_ARCH/$$VXWORKS_CPU/common
 # QMAKE_LIBS_NETWORK  = # -lnetwrap # only needed if kernel is missing gethostbyname() and friends
-QMAKE_LIBS_DYNLOAD  =
-QMAKE_LIBS_THREAD   =
+QMAKE_LIBS_DYNLOAD      =
+QMAKE_LIBS_THREAD       =
 
 load(qt_config)
 
diff --git a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
index 323da44243..d349189878 100644
--- a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
+++ b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
@@ -2,58 +2,58 @@
 # qmake configuration for vxworks-simpentium-dcc
 #
 
-MAKEFILE_GENERATOR  = UNIX
-QMAKE_PLATFORM      = vxworks
-CONFIG             += incremental
+MAKEFILE_GENERATOR      = UNIX
+QMAKE_PLATFORM          = vxworks
+CONFIG                 += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
 
-VXWORKS_ARCH        = simlinux
-VXWORKS_CPU         = SIMLINUX
-VXWORKS_DIAB_SPEC   = -tX86LH:vxworks66
-VXWORKS_ARCH_MUNCH  = pentium
+VXWORKS_ARCH            = simlinux
+VXWORKS_CPU             = SIMLINUX
+VXWORKS_DIAB_SPEC       = -tX86LH:vxworks66
+VXWORKS_ARCH_MUNCH      = pentium
 
-QMAKE_COMPILER = wr_dcc
+QMAKE_COMPILER          = wr_dcc
 
-QMAKE_CC		= dcc
-QMAKE_CFLAGS		+= $$VXWORKS_DIAB_SPEC -Xkeywords=0x0 -Xcode-absolute-far -Xansi -Xforce-declarations -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip -DCPU=$$upper($$VXWORKS_ARCH) -DVX_CPU_FAMILY=$$VXWORKS_ARCH -DTOOL_FAMILY=diab -DTOOL=diab -D_WRS_KERNEL -DVXWORKS -D_VSB_CONFIG_FILE=\'<../lib/h/config/vsbConfig.h>\'
-QMAKE_CFLAGS_DEPS	+=
-QMAKE_CFLAGS_WARN_ON	+=
-QMAKE_CFLAGS_WARN_OFF	+= -Xsuppress-warnings
-QMAKE_CFLAGS_RELEASE	+=
-QMAKE_CFLAGS_DEBUG	+= -g
-QMAKE_CFLAGS_SHLIB	+=
-QMAKE_CFLAGS_STATIC_LIB	+=
-QMAKE_CFLAGS_YACC	+=
-QMAKE_CFLAGS_HIDESYMS   +=
+QMAKE_CC                = dcc
+QMAKE_CFLAGS           += $$VXWORKS_DIAB_SPEC -Xkeywords=0x0 -Xcode-absolute-far -Xansi -Xforce-declarations -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip -DCPU=$$upper($$VXWORKS_ARCH) -DVX_CPU_FAMILY=$$VXWORKS_ARCH -DTOOL_FAMILY=diab -DTOOL=diab -D_WRS_KERNEL -DVXWORKS -D_VSB_CONFIG_FILE=\'<../lib/h/config/vsbConfig.h>\'
+QMAKE_CFLAGS_DEPS      +=
+QMAKE_CFLAGS_WARN_ON   +=
+QMAKE_CFLAGS_WARN_OFF  += -Xsuppress-warnings
+QMAKE_CFLAGS_RELEASE   +=
+QMAKE_CFLAGS_DEBUG     += -g
+QMAKE_CFLAGS_SHLIB     +=
+QMAKE_CFLAGS_STATIC_LIB +=
+QMAKE_CFLAGS_YACC      +=
+QMAKE_CFLAGS_HIDESYMS  +=
 QMAKE_CFLAGS_PRECOMPILE +=
 QMAKE_CFLAGS_USE_PRECOMPILE +=
 
-QMAKE_CXX		= dcc
-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_CXX               = dcc
+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_YACC    += $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS
 QMAKE_CXXFLAGS_PRECOMPILE +=
 QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
 
-QMAKE_LINK		= dld
-QMAKE_LINK_SHLIB	= dld
-QMAKE_LFLAGS		+= $$VXWORKS_DIAB_SPEC -L $(WIND_BASE)/target/lib/$$VXWORKS_ARCH/$$VXWORKS_CPU/common
-QMAKE_LFLAGS_RELEASE	+=
-QMAKE_LFLAGS_DEBUG	+=
-QMAKE_LFLAGS_APP	+= -r5
-QMAKE_LFLAGS_SHLIB	+=
-QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME	+=
-QMAKE_LFLAGS_THREAD	+=
-QMAKE_LFLAGS_NOUNDEF	+=
-QMAKE_LFLAGS_RPATH	=
+QMAKE_LINK              = dld
+QMAKE_LINK_SHLIB        = dld
+QMAKE_LFLAGS           += $$VXWORKS_DIAB_SPEC -L $(WIND_BASE)/target/lib/$$VXWORKS_ARCH/$$VXWORKS_CPU/common
+QMAKE_LFLAGS_RELEASE   +=
+QMAKE_LFLAGS_DEBUG     +=
+QMAKE_LFLAGS_APP       += -r5
+QMAKE_LFLAGS_SHLIB     +=
+QMAKE_LFLAGS_PLUGIN    += $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_SONAME    +=
+QMAKE_LFLAGS_THREAD    +=
+QMAKE_LFLAGS_NOUNDEF   +=
+QMAKE_LFLAGS_RPATH      =
 
 QMAKE_PCH_OUTPUT_EXT    = .gch
 
@@ -61,32 +61,32 @@ QMAKE_PCH_OUTPUT_EXT    = .gch
 QMAKE_LFLAGS_BSYMBOLIC_FUNC =
 QMAKE_LFLAGS_DYNAMIC_LIST =
 
-QMAKE_CFLAGS_THREAD	+= -D_REENTRANT
-QMAKE_CXXFLAGS_THREAD	+= $$QMAKE_CFLAGS_THREAD
+QMAKE_CFLAGS_THREAD    += -D_REENTRANT
+QMAKE_CXXFLAGS_THREAD  += $$QMAKE_CFLAGS_THREAD
 
-QMAKE_INCDIR          =
-QMAKE_LIBDIR          =
-QMAKE_INCDIR_X11      = $(WIND_HOME)/GSS/include
-QMAKE_LIBDIR_X11      = $(WIND_HOME)/GSS/lib
-QMAKE_INCDIR_OPENGL   = $$QMAKE_INCDIR_X11
-QMAKE_LIBDIR_OPENGL   = $$QMAKE_LIBDIR_X11
+QMAKE_INCDIR            =
+QMAKE_LIBDIR            =
+QMAKE_INCDIR_X11        = $(WIND_HOME)/GSS/include
+QMAKE_LIBDIR_X11        = $(WIND_HOME)/GSS/lib
+QMAKE_INCDIR_OPENGL     = $$QMAKE_INCDIR_X11
+QMAKE_LIBDIR_OPENGL     = $$QMAKE_LIBDIR_X11
 
-QMAKE_LIBS            =
-QMAKE_LIBS_DYNLOAD    =
-QMAKE_LIBS_X11        = -lXext -lX11
-QMAKE_LIBS_NIS        = -lnsl
-QMAKE_LIBS_OPENGL     = -lGL
-QMAKE_LIBS_THREAD     =
-QMAKE_LIBS_NETWORK    = # -lnet # only needed if kernel is missing gethostbyname and friends
+QMAKE_LIBS              =
+QMAKE_LIBS_DYNLOAD      =
+QMAKE_LIBS_X11          = -lXext -lX11
+QMAKE_LIBS_NIS          = -lnsl
+QMAKE_LIBS_OPENGL       = -lGL
+QMAKE_LIBS_THREAD       =
+QMAKE_LIBS_NETWORK      = # -lnet # only needed if kernel is missing gethostbyname and friends
 
-QMAKE_AR              = ar cqs
-QMAKE_OBJCOPY         = objcopy
-QMAKE_RANLIB          =
+QMAKE_AR                = ar cqs
+QMAKE_OBJCOPY           = objcopy
+QMAKE_RANLIB            =
 
-QMAKE_STRIP           = strip
-QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_INSTALL_FILE    = install -m 644 -p
-QMAKE_INSTALL_PROGRAM = install -m 755 -p
+QMAKE_STRIP             = 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)
diff --git a/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf b/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
index 3adfd1089e..3c8fd12d4a 100644
--- a/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
+++ b/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
@@ -2,36 +2,36 @@
 # qmake configuration for vxworks-simpentium-g++
 #
 
-MAKEFILE_GENERATOR  = UNIX
-QMAKE_PLATFORM      = vxworks
-CONFIG             += incremental
+MAKEFILE_GENERATOR      = UNIX
+QMAKE_PLATFORM          = vxworks
+CONFIG                 += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
-DEFINES            += VXWORKS
+DEFINES                += VXWORKS
 
-VXWORKS_ARCH        = simlinux
-VXWORKS_CPU         = SIMLINUX
-VXWORKS_ARCH_MUNCH  = pentium
+VXWORKS_ARCH            = simlinux
+VXWORKS_CPU             = SIMLINUX
+VXWORKS_ARCH_MUNCH      = pentium
 
 include(../../common/gcc-base-unix.conf)
 include(../../common/g++-unix.conf)
 include(../../common/linux.conf)
 
-QMAKE_CC            = cc$$VXWORKS_ARCH_MUNCH
-QMAKE_CFLAGS        = -fno-builtin -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip -DCPU=$$upper($$VXWORKS_ARCH) -DVX_CPU_FAMILY=$$VXWORKS_ARCH -DTOOL_FAMILY=gnu -DTOOL=gnu -D_WRS_KERNEL -D_VSB_CONFIG_FILE=\'<../lib/h/config/vsbConfig.h>\'
-QMAKE_CFLAGS_SHLIB  =  # remove -fPIC
-QMAKE_CFLAGS_STATIC_LIB  =  # remove -fPIC
-QMAKE_CXX           = c++$$VXWORKS_ARCH_MUNCH
-QMAKE_CXXFLAGS      = $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS_SHLIB=  # remove -fPIC
-QMAKE_CXXFLAGS_STATIC_LIB=  # remove -fPIC
-QMAKE_LINK          = $$QMAKE_CXX
-QMAKE_LINK_SHLIB    = $$QMAKE_CXX
-QMAKE_LFLAGS_SHLIB  = -Wl,-Ur -L $(WIND_BASE)/target/lib/$$VXWORKS_ARCH/$$VXWORKS_CPU/common # remove -shared
-QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_APP   += -Wl,-Ur -L $(WIND_BASE)/target/lib/$$VXWORKS_ARCH/$$VXWORKS_CPU/common
-QMAKE_LIBS_NETWORK  = # -lnetwrap # only needed if kernel is missing gethostbyname() and friends
-QMAKE_LIBS_DYNLOAD  =
-QMAKE_LIBS_THREAD   =
+QMAKE_CC                = cc$$VXWORKS_ARCH_MUNCH
+QMAKE_CFLAGS            = -fno-builtin -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip -DCPU=$$upper($$VXWORKS_ARCH) -DVX_CPU_FAMILY=$$VXWORKS_ARCH -DTOOL_FAMILY=gnu -DTOOL=gnu -D_WRS_KERNEL -D_VSB_CONFIG_FILE=\'<../lib/h/config/vsbConfig.h>\'
+QMAKE_CFLAGS_SHLIB      = # remove -fPIC
+QMAKE_CFLAGS_STATIC_LIB = # remove -fPIC
+QMAKE_CXX               = c++$$VXWORKS_ARCH_MUNCH
+QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
+QMAKE_CXXFLAGS_SHLIB    = # remove -fPIC
+QMAKE_CXXFLAGS_STATIC_LIB = # remove -fPIC
+QMAKE_LINK              = $$QMAKE_CXX
+QMAKE_LINK_SHLIB        = $$QMAKE_CXX
+QMAKE_LFLAGS_SHLIB      = -Wl,-Ur -L $(WIND_BASE)/target/lib/$$VXWORKS_ARCH/$$VXWORKS_CPU/common # remove -shared
+QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_APP       += -Wl,-Ur -L $(WIND_BASE)/target/lib/$$VXWORKS_ARCH/$$VXWORKS_CPU/common
+QMAKE_LIBS_NETWORK      = # -lnetwrap # only needed if kernel is missing gethostbyname() and friends
+QMAKE_LIBS_DYNLOAD      =
+QMAKE_LIBS_THREAD       =
 
 load(qt_config)
 
diff --git a/mkspecs/unsupported/win32-msvc2003/qmake.conf b/mkspecs/unsupported/win32-msvc2003/qmake.conf
index e510b74738..a65a9929c3 100644
--- a/mkspecs/unsupported/win32-msvc2003/qmake.conf
+++ b/mkspecs/unsupported/win32-msvc2003/qmake.conf
@@ -6,11 +6,11 @@
 
 MAKEFILE_GENERATOR      = MSVC.NET
 QMAKE_PLATFORM          = win32
-CONFIG                  += incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target
-DEFINES                 += UNICODE WIN32
-QMAKE_COMPILER_DEFINES  += _MSC_VER=1310 WIN32
+CONFIG                 += incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target
+DEFINES                += UNICODE WIN32
+QMAKE_COMPILER_DEFINES += _MSC_VER=1310 WIN32
 
-QMAKE_COMPILER = msvc
+QMAKE_COMPILER          = msvc
 
 QMAKE_CC                = cl
 QMAKE_LEX               = flex
@@ -74,5 +74,5 @@ include(../../common/shell-win32.conf)
 
 VCPROJ_EXTENSION        = .vcproj
 VCSOLUTION_EXTENSION    = .sln
-VCPROJ_KEYWORD  = Qt4VSv1.0
+VCPROJ_KEYWORD          = Qt4VSv1.0
 load(qt_config)