2 files changed, 6 insertions, 2 deletions

diff --git a/Vars.make b/Vars.make
index 062094c..1a5d9d4 100644
--- a/Vars.make
+++ b/Vars.make
@@ -58,64 +58,68 @@ ifeq ($(VERSION_CVS),)
     VERSION_CVS:=$(shell date +%Y%m%d)
 endif
 ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),)
     SUB_VERSION:=$(VERSION_CVS)
 endif
 export SUB_VERSION
 
 ifneq ($(strip $(SUB_VERSION)),)
 EXTRAVERSION=-$(SUB_VERSION)
 endif
 
 ifeq ($(QTE_REVISION),)
     QTE_REVISION=5
 endif
 export QTE_REVISION
 
 export DEB_VERSION=2.0
 
 ifeq ($(QTE_BASEVERSION),)
     ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
         QTE_BASEVERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION'|grep -v STR|sed -e 's/\#define QT_VERSION\t*//; s/.*\([0-9]\)\([0-9]\)\([0-9]\).*/\1.\2.\3/;')
     else
         QTE_BASEVERSION=2.3.5
     endif
 endif
 export QTE_BASEVERSION
 
 ifeq ($(QTE_VERSION),)
     ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
         QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;')
     else
         QTE_VERSION=2.3.5
     endif
 endif
 export QTE_VERSION
 
 export PATH:=$(OPIEDIR)/scripts:$(PATH)
 export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
 
 ifdef CONFIG_OPTIMIZATIONS
 export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
 export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
 endif
 
 ifeq ($(STRIP),)
     ifneq ($(CONFIG_TARGET_X86),)
         STRIP=strip
     endif
     ifneq ($(CONFIG_TARGET_IPAQ),)
         STRIP=arm-linux-strip
     endif
     ifneq ($(CONFIG_TARGET_SHARP),)
         STRIP=arm-linux-strip
     endif
     ifneq ($(CONFIG_TARGET_RAMSES),)
         STRIP=arm-linux-strip
     endif
     ifneq ($(CONFIG_TARGET_SIMPAD),)
         STRIP=arm-linux-strip
     endif
     ifneq ($(CONFIG_TARGET_YOPY),)
         STRIP=arm-linux-strip
     endif
 endif
+
+export CCACHE=$(shell which ccache 2>/dev/null)
+export DISTCC=$(shell which distcc 2>/dev/null)
+
diff --git a/mkspecs/qws/linux-generic-g++/qmake.conf b/mkspecs/qws/linux-generic-g++/qmake.conf
index 40af4ad..2610b12 100644
--- a/mkspecs/qws/linux-generic-g++/qmake.conf
+++ b/mkspecs/qws/linux-generic-g++/qmake.conf
@@ -1,76 +1,76 @@
 #
 # $Id$
 #
 # qmake configuration for linux-g++
 #
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
         CONFIG          += qt warn_on release
 
-        QMAKE_CC        = gcc
+        QMAKE_CC        = $(CCACHE) $(DISTCC) gcc
         QMAKE_LEX       = flex
         QMAKE_LEXFLAGS  =
         QMAKE_YACC      = yacc
         QMAKE_YACCFLAGS         = -d
         QMAKE_CFLAGS    = -pipe $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_WARN_ON= -Wall -W
         QMAKE_CFLAGS_WARN_OFF=
         QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
         QMAKE_CFLAGS_DEBUG= -g
         QMAKE_CFLAGS_SHLIB= -fPIC
         QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
         QMAKE_CFLAGS_THREAD= -D_REENTRANT
 
-        QMAKE_CXX       = g++
+        QMAKE_CXX       = $(CCACHE) $(DISTCC) g++
         QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
         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_QT         = $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
         QMAKE_INCDIR_OPENGL= /usr/X11R6/include
         QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
 
         QMAKE_LINK      = g++
         QMAKE_LINK_SHLIB= g++
         QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE=
         QMAKE_LFLAGS_DEBUG=
 QMAKE_LFLAGS_SHLIB      = -shared
 QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME     = -Wl,-soname,
 QMAKE_LFLAGS_THREAD     =
 QMAKE_RPATH             = -Wl,-rpath,
 
         QMAKE_LIBS      = $(LIBS_EXTRA)
 QMAKE_LIBS_DYNLOAD      = -ldl
         QMAKE_LIBS_X11  = 
         QMAKE_LIBS_X11SM= 
         QMAKE_LIBS_QT   = -lqte
 QMAKE_LIBS_QT_THREAD    = -lqte-mt
         QMAKE_LIBS_QT_OPENGL= -lqgl
 QMAKE_LIBS_THREAD       = -lpthread
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
         QMAKE_UIC       = $(QTDIR)/bin/uic
 
         QMAKE_AR        = ar cqs
         QMAKE_RANLIB    =
 
         QMAKE_TAR       = tar -cf
         QMAKE_GZIP      = gzip -9f
 
         QMAKE_COPY      = cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir