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
@@ -5,13 +5,13 @@
 #
        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
        QMAKE_YACCFLAGS         = -d
        QMAKE_CFLAGS    = -pipe $(CFLAGS_EXTRA)
        QMAKE_CFLAGS_WARN_ON= -Wall -W
@@ -19,26 +19,26 @@ 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       = $(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
        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_INCDIR_X11=
-        QMAKE_LIBDIR_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_INCDIR_QTOPIA= $(QPEDIR)/include/
        QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib
@@ -53,14 +53,14 @@ 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_X11  =
-        QMAKE_LIBS_X11SM= 
+        QMAKE_LIBS_X11SM=
        QMAKE_LIBS_QT   = -lqte
 QMAKE_LIBS_QT_THREAD    = -lqte-mt
        QMAKE_LIBS_QT_OPENGL= -lqgl
        QMAKE_LIBS_QTOPIA= -lqtopia -lqpe
 QMAKE_LIBS_THREAD       = -lpthread

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
@@ -5,13 +5,13 @@
5	#	5	#
6		6
7	MAKEFILE_GENERATOR= UNIX	7	MAKEFILE_GENERATOR= UNIX
8	TEMPLATE = app	8	TEMPLATE = app
9	CONFIG += qt link_prl	9	CONFIG += qt link_prl
10		10
11	QMAKE_CC = $(CCACHE) gcc	11	QMAKE_CC = $(CCACHE) $(DISTCC) gcc
12	QMAKE_LEX = flex	12	QMAKE_LEX = flex
13	QMAKE_LEXFLAGS =	13	QMAKE_LEXFLAGS =
14	QMAKE_YACC = yacc	14	QMAKE_YACC = yacc
15	QMAKE_YACCFLAGS = -d	15	QMAKE_YACCFLAGS = -d
16	QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA)	16	QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA)
17	QMAKE_CFLAGS_WARN_ON= -Wall -W	17	QMAKE_CFLAGS_WARN_ON= -Wall -W
@@ -19,26 +19,26 @@ QMAKE_CFLAGS_WARN_OFF =
19	QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)	19	QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
20	QMAKE_CFLAGS_DEBUG= -g	20	QMAKE_CFLAGS_DEBUG= -g
21	QMAKE_CFLAGS_SHLIB= -fPIC	21	QMAKE_CFLAGS_SHLIB= -fPIC
22	QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses	22	QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
23	QMAKE_CFLAGS_THREAD= -D_REENTRANT	23	QMAKE_CFLAGS_THREAD= -D_REENTRANT
24		24
25	QMAKE_CXX = $(CCACHE) g++	25	QMAKE_CXX = $(CCACHE) $(DISTCC) g++
26	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)	26	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
27	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON	27	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
28	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF	28	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
29	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE	29	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
30	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG	30	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
31	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB	31	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
32	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC	32	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
33	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD	33	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
34		34
35	QMAKE_INCDIR =	35	QMAKE_INCDIR =
36	QMAKE_LIBDIR =	36	QMAKE_LIBDIR =
37	QMAKE_INCDIR_X11=	37	QMAKE_INCDIR_X11=
38	QMAKE_LIBDIR_X11=	38	QMAKE_LIBDIR_X11=
39	QMAKE_INCDIR_QT = $(QTDIR)/include	39	QMAKE_INCDIR_QT = $(QTDIR)/include
40	QMAKE_LIBDIR_QT = $(QTDIR)/lib	40	QMAKE_LIBDIR_QT = $(QTDIR)/lib
41	QMAKE_INCDIR_OPENGL= /usr/X11R6/include	41	QMAKE_INCDIR_OPENGL= /usr/X11R6/include
42	QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib	42	QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
43	QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include/	43	QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include/
44	QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib	44	QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib
@@ -53,14 +53,14 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
53	QMAKE_LFLAGS_SONAME = -Wl,-soname,	53	QMAKE_LFLAGS_SONAME = -Wl,-soname,
54	QMAKE_LFLAGS_THREAD =	54	QMAKE_LFLAGS_THREAD =
55	QMAKE_RPATH = -Wl,-rpath,	55	QMAKE_RPATH = -Wl,-rpath,
56		56
57	QMAKE_LIBS = $(LIBS_EXTRA)	57	QMAKE_LIBS = $(LIBS_EXTRA)
58	QMAKE_LIBS_DYNLOAD = -ldl	58	QMAKE_LIBS_DYNLOAD = -ldl
59	QMAKE_LIBS_X11 =	59	QMAKE_LIBS_X11 =
60	QMAKE_LIBS_X11SM=	60	QMAKE_LIBS_X11SM=
61	QMAKE_LIBS_QT = -lqte	61	QMAKE_LIBS_QT = -lqte
62	QMAKE_LIBS_QT_THREAD = -lqte-mt	62	QMAKE_LIBS_QT_THREAD = -lqte-mt
63	QMAKE_LIBS_QT_OPENGL= -lqgl	63	QMAKE_LIBS_QT_OPENGL= -lqgl
64	QMAKE_LIBS_QTOPIA= -lqtopia -lqpe	64	QMAKE_LIBS_QTOPIA= -lqtopia -lqpe
65	QMAKE_LIBS_THREAD = -lpthread	65	QMAKE_LIBS_THREAD = -lpthread
66		66