3 files changed, 6 insertions, 6 deletions
diff --git a/mkspecs/qws/linux-arm-g++/qmake.conf b/mkspecs/qws/linux-arm-g++/qmake.conf
index 244f9a8..20d1b63 100644
--- a/mkspecs/qws/linux-arm-g++/qmake.conf
+++ b/mkspecs/qws/linux-arm-g++/qmake.conf
@@ -1,73 +1,73 @@
 #
 # $Id$
 #
 # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler
 #
        MAKEFILE_GENERATOR= UNIX
        TEMPLATE        = app
        CONFIG          += qt link_prl
-        QMAKE_CC        = arm-linux-gcc
+        QMAKE_CC        = $(shell which ccache) $(shell which arm-linux-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       = arm-linux-g++
+        QMAKE_CXX       = $(shell which ccache) $(shell which arm-linux-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_INCDIR_QTOPIA= $(QPEDIR)/include
        QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib
        QMAKE_LINK      = arm-linux-g++
        QMAKE_LINK_SHLIB= arm-linux-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_QTOPIA= -lqtopia -lqpe
 QMAKE_LIBS_THREAD       = -lpthread
        QMAKE_MOC       = $(QTDIR)/bin/moc
        QMAKE_UIC       = $(QTDIR)/bin/uic
        QMAKE_AR        = ar cqs
        QMAKE_RANLIB    =
        QMAKE_TAR       = tar -cf
diff --git a/mkspecs/qws/linux-ipaq-g++/qmake.conf b/mkspecs/qws/linux-ipaq-g++/qmake.conf
index adde72b..83fed4b 100644
--- a/mkspecs/qws/linux-ipaq-g++/qmake.conf
+++ b/mkspecs/qws/linux-ipaq-g++/qmake.conf
@@ -1,73 +1,73 @@
 #
 # $Id$
 #
 # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler
 #
        MAKEFILE_GENERATOR= UNIX
        TEMPLATE        = app
        CONFIG          += qt link_prl
-        QMAKE_CC        = arm-linux-gcc
+        QMAKE_CC        = $(shell which ccache) $(shell which arm-linux-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       = arm-linux-g++ -DQT_QWS_IPAQ
+        QMAKE_CXX       = $(shell which ccache) $(shell which arm-linux-g++) -DQT_QWS_IPAQ
        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_INCDIR_QTOPIA= $(QPEDIR)/include
        QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib
        QMAKE_LINK      = arm-linux-g++
        QMAKE_LINK_SHLIB= arm-linux-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-link,
        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_QTOPIA= -lqtopia -lqpe
 QMAKE_LIBS_THREAD       = -lpthread
        QMAKE_MOC       = $(QTDIR)/bin/moc
        QMAKE_UIC       = $(QTDIR)/bin/uic
        QMAKE_AR        = ar cqs
        QMAKE_RANLIB    =
        QMAKE_TAR       = tar -cf
diff --git a/qmake/Makefile b/qmake/Makefile
index 5a72210..3045766 100644
--- a/qmake/Makefile
+++ b/qmake/Makefile
@@ -1,52 +1,52 @@
 QMAKESPECSDIR=$(OPIEDIR)/mkspecs
-        CC      = gcc
+        CC      = $(shell which ccache) gcc
-        CXX     = g++
+        CXX     = $(shell which ccache) g++
 #qmake code
 OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o \
     borland_bmake.o mingw_make.o msvc_dsp.o msvc_vcproj.o option.o \
     winmakefile.o projectgenerator.o metrowerks_xml.o  pbuilder_pbx.o \
     msvc_objectmodel.o meta.o qtmd5.o
 #qt code
 QOBJS=qstring.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o \
      qdatastream.o qgarray.o qbuffer.o qglist.o qptrcollection.o qfile.o \
      qfile_unix.o qregexp.o qgvector.o qgcache.o qbitarray.o qdir.o quuid.o \
      qfileinfo_unix.o qdir_unix.o qfileinfo.o qdatetime.o qstringlist.o qmap.o \
      qconfig.o qunicodetables.o qsettings.o qlocale.o 
 #all sources, used for the depend target
 DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makefile.cpp generators/unix/unixmake2.cpp \
           generators/unix/unixmake.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \
           generators/win32/winmakefile.cpp generators/projectgenerator.cpp generators/mac/metrowerks_xml.cpp \
           generators/mac/pbuilder_pbx.cpp generators/win32/msvc_objectmodel.cpp \
           $(OPIEDIR)/qmake/tools/qstring.cpp $(OPIEDIR)/qmake/tools/qtextstream.cpp \
           $(OPIEDIR)/qmake/tools/qiodevice.cpp $(OPIEDIR)/qmake/tools/qglobal.cpp \
           $(OPIEDIR)/qmake/tools/qgdict.cpp $(OPIEDIR)/qmake/tools/qcstring.cpp \
           $(OPIEDIR)/qmake/tools/qdatastream.cpp $(OPIEDIR)/qmake/src/tools/qgarray.cpp \
           $(OPIEDIR)/qmake/tools/qbuffer.cpp $(OPIEDIR)/qmake/tools/qglist.cpp \
           $(OPIEDIR)/qmake/tools/qptrcollection.cpp $(OPIEDIR)/qmake/tools/qfile.cpp \
           $(OPIEDIR)/qmake/tools/qfile_unix.cpp $(OPIEDIR)/qmake/tools/qregexp.cpp \
           $(OPIEDIR)/qmake/tools/qgvector.cpp $(OPIEDIR)/qmake/tools/qgcache.cpp \
           $(OPIEDIR)/qmake/tools/qbitarray.cpp $(OPIEDIR)/qmake/tools/qdir.cpp \
           $(OPIEDIR)/qmake/tools/quuid.cpp $(OPIEDIR)/qmake/tools/qfileinfo_unix.cpp \
           $(OPIEDIR)/qmake/tools/qdir_unix.cpp $(OPIEDIR)/qmake/tools/qfileinfo.cpp \
           $(OPIEDIR)/qmake/tools/qdatetime.cpp $(OPIEDIR)/qmake/tools/qstringlist.cpp \
           $(OPIEDIR)/qmake/tools/qmap.cpp $(OPIEDIR)/qmake/tools/qconfig.cpp \
           $(OPIEDIR)/qmake/tools/qsettings.cpp $(OPIEDIR)/qmake/tools/qurl.cpp \
           $(OPIEDIR)/qmake/tools/qsettings_mac.cpp $(OPIEDIR)/qmake/tools/qlocale.cpp
 CXXFLAGS=  \
        -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
        -I$(OPIEDIR)/qmake/include/qmake -I$(OPIEDIR)/qmake/include -I$(OPIEDIR)/qmake/include/private \
        -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \
        -DQT_NO_COMPRESS -I$(QMAKESPECSDIR)/default -DHAVE_QCONFIG_CPP
 LFLAGS=
 qmake: $(OBJS) $(QOBJS)
        $(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
        $(if $(OPIEDIR),rm -f $(OPIEDIR)/bin/$@)
        $(if $(OPIEDIR),ln -s ../qmake/$@ $(OPIEDIR)/bin/$@)
 install: qmake

diff --git a/mkspecs/qws/linux-arm-g++/qmake.conf b/mkspecs/qws/linux-arm-g++/qmake.conf index 244f9a8..20d1b63 100644 --- a/mkspecs/qws/linux-arm-g++/qmake.conf +++ b/mkspecs/qws/linux-arm-g++/qmake.conf
@@ -1,73 +1,73 @@
1	#	1	#
2	# $Id$	2	# $Id$
3	#	3	#
4	# qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler	4	# qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler
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 = arm-linux-gcc	11	QMAKE_CC = $(shell which ccache) $(shell which arm-linux-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
18	QMAKE_CFLAGS_WARN_OFF=	18	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 = arm-linux-g++	25	QMAKE_CXX = $(shell which ccache) $(shell which arm-linux-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
45		45
46	QMAKE_LINK = arm-linux-g++	46	QMAKE_LINK = arm-linux-g++
47	QMAKE_LINK_SHLIB= arm-linux-g++	47	QMAKE_LINK_SHLIB= arm-linux-g++
48	QMAKE_LFLAGS = $(LFLAGS_EXTRA)	48	QMAKE_LFLAGS = $(LFLAGS_EXTRA)
49	QMAKE_LFLAGS_RELEASE=	49	QMAKE_LFLAGS_RELEASE=
50	QMAKE_LFLAGS_DEBUG=	50	QMAKE_LFLAGS_DEBUG=
51	QMAKE_LFLAGS_SHLIB = -shared	51	QMAKE_LFLAGS_SHLIB = -shared
52	QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB	52	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
67	QMAKE_MOC = $(QTDIR)/bin/moc	67	QMAKE_MOC = $(QTDIR)/bin/moc
68	QMAKE_UIC = $(QTDIR)/bin/uic	68	QMAKE_UIC = $(QTDIR)/bin/uic
69		69
70	QMAKE_AR = ar cqs	70	QMAKE_AR = ar cqs
71	QMAKE_RANLIB =	71	QMAKE_RANLIB =
72		72
73	QMAKE_TAR = tar -cf	73	QMAKE_TAR = tar -cf


diff --git a/mkspecs/qws/linux-ipaq-g++/qmake.conf b/mkspecs/qws/linux-ipaq-g++/qmake.conf index adde72b..83fed4b 100644 --- a/mkspecs/qws/linux-ipaq-g++/qmake.conf +++ b/mkspecs/qws/linux-ipaq-g++/qmake.conf
@@ -1,73 +1,73 @@
1	#	1	#
2	# $Id$	2	# $Id$
3	#	3	#
4	# qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler	4	# qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler
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 = arm-linux-gcc	11	QMAKE_CC = $(shell which ccache) $(shell which arm-linux-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
18	QMAKE_CFLAGS_WARN_OFF=	18	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 = arm-linux-g++ -DQT_QWS_IPAQ	25	QMAKE_CXX = $(shell which ccache) $(shell which arm-linux-g++) -DQT_QWS_IPAQ
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
45		45
46	QMAKE_LINK = arm-linux-g++	46	QMAKE_LINK = arm-linux-g++
47	QMAKE_LINK_SHLIB= arm-linux-g++	47	QMAKE_LINK_SHLIB= arm-linux-g++
48	QMAKE_LFLAGS = $(LFLAGS_EXTRA)	48	QMAKE_LFLAGS = $(LFLAGS_EXTRA)
49	QMAKE_LFLAGS_RELEASE=	49	QMAKE_LFLAGS_RELEASE=
50	QMAKE_LFLAGS_DEBUG=	50	QMAKE_LFLAGS_DEBUG=
51	QMAKE_LFLAGS_SHLIB = -shared	51	QMAKE_LFLAGS_SHLIB = -shared
52	QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB	52	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-link,	55	QMAKE_RPATH = -Wl,-rpath-link,
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
67	QMAKE_MOC = $(QTDIR)/bin/moc	67	QMAKE_MOC = $(QTDIR)/bin/moc
68	QMAKE_UIC = $(QTDIR)/bin/uic	68	QMAKE_UIC = $(QTDIR)/bin/uic
69		69
70	QMAKE_AR = ar cqs	70	QMAKE_AR = ar cqs
71	QMAKE_RANLIB =	71	QMAKE_RANLIB =
72		72
73	QMAKE_TAR = tar -cf	73	QMAKE_TAR = tar -cf


diff --git a/qmake/Makefile b/qmake/Makefile index 5a72210..3045766 100644 --- a/qmake/Makefile +++ b/qmake/Makefile
@@ -1,52 +1,52 @@
1	QMAKESPECSDIR=$(OPIEDIR)/mkspecs	1	QMAKESPECSDIR=$(OPIEDIR)/mkspecs
2		2
3	CC = gcc	3	CC = $(shell which ccache) gcc
4	CXX = g++	4	CXX = $(shell which ccache) g++
5		5
6	#qmake code	6	#qmake code
7	OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o \	7	OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o \
8	borland_bmake.o mingw_make.o msvc_dsp.o msvc_vcproj.o option.o \	8	borland_bmake.o mingw_make.o msvc_dsp.o msvc_vcproj.o option.o \
9	winmakefile.o projectgenerator.o metrowerks_xml.o pbuilder_pbx.o \	9	winmakefile.o projectgenerator.o metrowerks_xml.o pbuilder_pbx.o \
10	msvc_objectmodel.o meta.o qtmd5.o	10	msvc_objectmodel.o meta.o qtmd5.o
11		11
12	#qt code	12	#qt code
13	QOBJS=qstring.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o \	13	QOBJS=qstring.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o \
14	qdatastream.o qgarray.o qbuffer.o qglist.o qptrcollection.o qfile.o \	14	qdatastream.o qgarray.o qbuffer.o qglist.o qptrcollection.o qfile.o \
15	qfile_unix.o qregexp.o qgvector.o qgcache.o qbitarray.o qdir.o quuid.o \	15	qfile_unix.o qregexp.o qgvector.o qgcache.o qbitarray.o qdir.o quuid.o \
16	qfileinfo_unix.o qdir_unix.o qfileinfo.o qdatetime.o qstringlist.o qmap.o \	16	qfileinfo_unix.o qdir_unix.o qfileinfo.o qdatetime.o qstringlist.o qmap.o \
17	qconfig.o qunicodetables.o qsettings.o qlocale.o	17	qconfig.o qunicodetables.o qsettings.o qlocale.o
18		18
19	#all sources, used for the depend target	19	#all sources, used for the depend target
20	DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makefile.cpp generators/unix/unixmake2.cpp \	20	DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makefile.cpp generators/unix/unixmake2.cpp \
21	generators/unix/unixmake.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \	21	generators/unix/unixmake.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \
22	generators/win32/winmakefile.cpp generators/projectgenerator.cpp generators/mac/metrowerks_xml.cpp \	22	generators/win32/winmakefile.cpp generators/projectgenerator.cpp generators/mac/metrowerks_xml.cpp \
23	generators/mac/pbuilder_pbx.cpp generators/win32/msvc_objectmodel.cpp \	23	generators/mac/pbuilder_pbx.cpp generators/win32/msvc_objectmodel.cpp \
24	$(OPIEDIR)/qmake/tools/qstring.cpp $(OPIEDIR)/qmake/tools/qtextstream.cpp \	24	$(OPIEDIR)/qmake/tools/qstring.cpp $(OPIEDIR)/qmake/tools/qtextstream.cpp \
25	$(OPIEDIR)/qmake/tools/qiodevice.cpp $(OPIEDIR)/qmake/tools/qglobal.cpp \	25	$(OPIEDIR)/qmake/tools/qiodevice.cpp $(OPIEDIR)/qmake/tools/qglobal.cpp \
26	$(OPIEDIR)/qmake/tools/qgdict.cpp $(OPIEDIR)/qmake/tools/qcstring.cpp \	26	$(OPIEDIR)/qmake/tools/qgdict.cpp $(OPIEDIR)/qmake/tools/qcstring.cpp \
27	$(OPIEDIR)/qmake/tools/qdatastream.cpp $(OPIEDIR)/qmake/src/tools/qgarray.cpp \	27	$(OPIEDIR)/qmake/tools/qdatastream.cpp $(OPIEDIR)/qmake/src/tools/qgarray.cpp \
28	$(OPIEDIR)/qmake/tools/qbuffer.cpp $(OPIEDIR)/qmake/tools/qglist.cpp \	28	$(OPIEDIR)/qmake/tools/qbuffer.cpp $(OPIEDIR)/qmake/tools/qglist.cpp \
29	$(OPIEDIR)/qmake/tools/qptrcollection.cpp $(OPIEDIR)/qmake/tools/qfile.cpp \	29	$(OPIEDIR)/qmake/tools/qptrcollection.cpp $(OPIEDIR)/qmake/tools/qfile.cpp \
30	$(OPIEDIR)/qmake/tools/qfile_unix.cpp $(OPIEDIR)/qmake/tools/qregexp.cpp \	30	$(OPIEDIR)/qmake/tools/qfile_unix.cpp $(OPIEDIR)/qmake/tools/qregexp.cpp \
31	$(OPIEDIR)/qmake/tools/qgvector.cpp $(OPIEDIR)/qmake/tools/qgcache.cpp \	31	$(OPIEDIR)/qmake/tools/qgvector.cpp $(OPIEDIR)/qmake/tools/qgcache.cpp \
32	$(OPIEDIR)/qmake/tools/qbitarray.cpp $(OPIEDIR)/qmake/tools/qdir.cpp \	32	$(OPIEDIR)/qmake/tools/qbitarray.cpp $(OPIEDIR)/qmake/tools/qdir.cpp \
33	$(OPIEDIR)/qmake/tools/quuid.cpp $(OPIEDIR)/qmake/tools/qfileinfo_unix.cpp \	33	$(OPIEDIR)/qmake/tools/quuid.cpp $(OPIEDIR)/qmake/tools/qfileinfo_unix.cpp \
34	$(OPIEDIR)/qmake/tools/qdir_unix.cpp $(OPIEDIR)/qmake/tools/qfileinfo.cpp \	34	$(OPIEDIR)/qmake/tools/qdir_unix.cpp $(OPIEDIR)/qmake/tools/qfileinfo.cpp \
35	$(OPIEDIR)/qmake/tools/qdatetime.cpp $(OPIEDIR)/qmake/tools/qstringlist.cpp \	35	$(OPIEDIR)/qmake/tools/qdatetime.cpp $(OPIEDIR)/qmake/tools/qstringlist.cpp \
36	$(OPIEDIR)/qmake/tools/qmap.cpp $(OPIEDIR)/qmake/tools/qconfig.cpp \	36	$(OPIEDIR)/qmake/tools/qmap.cpp $(OPIEDIR)/qmake/tools/qconfig.cpp \
37	$(OPIEDIR)/qmake/tools/qsettings.cpp $(OPIEDIR)/qmake/tools/qurl.cpp \	37	$(OPIEDIR)/qmake/tools/qsettings.cpp $(OPIEDIR)/qmake/tools/qurl.cpp \
38	$(OPIEDIR)/qmake/tools/qsettings_mac.cpp $(OPIEDIR)/qmake/tools/qlocale.cpp	38	$(OPIEDIR)/qmake/tools/qsettings_mac.cpp $(OPIEDIR)/qmake/tools/qlocale.cpp
39		39
40	CXXFLAGS= \	40	CXXFLAGS= \
41	-I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \	41	-I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
42	-I$(OPIEDIR)/qmake/include/qmake -I$(OPIEDIR)/qmake/include -I$(OPIEDIR)/qmake/include/private \	42	-I$(OPIEDIR)/qmake/include/qmake -I$(OPIEDIR)/qmake/include -I$(OPIEDIR)/qmake/include/private \
43	-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \	43	-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \
44	-DQT_NO_COMPRESS -I$(QMAKESPECSDIR)/default -DHAVE_QCONFIG_CPP	44	-DQT_NO_COMPRESS -I$(QMAKESPECSDIR)/default -DHAVE_QCONFIG_CPP
45	LFLAGS=	45	LFLAGS=
46		46
47	qmake: $(OBJS) $(QOBJS)	47	qmake: $(OBJS) $(QOBJS)
48	$(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)	48	$(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
49	$(if $(OPIEDIR),rm -f $(OPIEDIR)/bin/$@)	49	$(if $(OPIEDIR),rm -f $(OPIEDIR)/bin/$@)
50	$(if $(OPIEDIR),ln -s ../qmake/$@ $(OPIEDIR)/bin/$@)	50	$(if $(OPIEDIR),ln -s ../qmake/$@ $(OPIEDIR)/bin/$@)
51		51
52	install: qmake	52	install: qmake