- revert DISTCC changes

 (see mailinglist and wiki for use ccache and/or distcc)

1 files changed, 6 insertions, 6 deletions

diff --git a/mkspecs/qws/linux-generic-g++/qmake.conf b/mkspecs/qws/linux-generic-g++/qmake.conf
index 7a12e98..7de487d 100644
--- a/mkspecs/qws/linux-generic-g++/qmake.conf
+++ b/mkspecs/qws/linux-generic-g++/qmake.conf
@@ -8,7 +8,7 @@ MAKEFILE_GENERATOR	= UNIX
         TEMPLATE        = app
         CONFIG          += qt link_prl
 
-        QMAKE_CC        = $(CCACHE) gcc
+        QMAKE_CC        = $(CCACHE) $(DISTCC) gcc
         QMAKE_LEX       = flex
         QMAKE_LEXFLAGS  =
         QMAKE_YACC      = yacc
@@ -22,7 +22,7 @@ QMAKE_CFLAGS_SHLIB	= -fPIC
         QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
         QMAKE_CFLAGS_THREAD= -D_REENTRANT
 
-        QMAKE_CXX       = $(CCACHE) 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
@@ -34,8 +34,8 @@ QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
         QMAKE_INCDIR    =
         QMAKE_LIBDIR    =
-        QMAKE_INCDIR_X11= 
-        QMAKE_LIBDIR_X11= 
+        QMAKE_INCDIR_X11=
+        QMAKE_LIBDIR_X11=
         QMAKE_INCDIR_QT         = $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
         QMAKE_INCDIR_OPENGL= /usr/X11R6/include
@@ -56,8 +56,8 @@ QMAKE_RPATH             = -Wl,-rpath,
 
         QMAKE_LIBS      = $(LIBS_EXTRA)
 QMAKE_LIBS_DYNLOAD      = -ldl
-        QMAKE_LIBS_X11  = 
-        QMAKE_LIBS_X11SM= 
+        QMAKE_LIBS_X11  =
+        QMAKE_LIBS_X11SM=
         QMAKE_LIBS_QT   = -lqte
 QMAKE_LIBS_QT_THREAD    = -lqte-mt
         QMAKE_LIBS_QT_OPENGL= -lqgl