Add Qt3 development HEAD version

60 files changed, 24244 insertions, 0 deletions

diff --git a/qmake/CHANGES b/qmake/CHANGES
new file mode 100644
index 0000000..ca786ee
--- /dev/null
+++ b/qmake/CHANGES
@@ -0,0 +1,68 @@
+1.07a -
+
+   support for precompiled headers added
+
+1.06b -
+  
+   support for reading and writing libtool (.la) files
+   support for reading pkgconfig (.pkg) files
+
+   PWD added as an automatic variable to mean the directory
+   the file being parsed is in (this change required that the
+   directory be set to the file being parsed as well, function
+   tests that query relative paths will need to be relative the
+   file being parsed).
+
+   persistant data cache introduced
+
+1.05a -
+
+  caching of more information (speed ups)
+  $$list() added to be used as a lambda function in qmake
+  $$files() added to allow regular expression matching
+  $$fromfile() added to grab one single variable value from a parsed file
+  $$prompt() added to allow querying for user input from qmake
+  include() modified to support specifying which variables to import
+  equals() test added to test for equality
+  MSVC.net generator added [partial solution files in vcsubdirs]
+
+1.04a -
+
+  subdirs supports multiple project files in a single directory.
+
+1.03a -
+
+  New function $$system() to extract the value of a shell call.
+
+1.02a -
+
+  Dependency / Mocable caching. qmake can cache these expensive operations with qmake_cache
+  CONFIG.
+
+  The parser has been improved to cover more error cases, as well as more forgiving 
+
+  qmake now includes a special else scope to invert the previous test
+
+  Ability to add user defined targets to UnixMakefiles.
+
+1.01a -
+
+ New system for library linking. This system allows a user several different features:
+
+ 1) libtool like library dependencies to static libraries build with qmake
+ 2) library dependencies, when on .pro depends on another library - it will
+    automatically build that other library (unix makefiles only)
+ 3) automatic detection of configurations for Qt, if CONFIG qt is specified
+    it will find the settings for the most recent Qt itself.
+
+ Project Builder for Mac OS X is now a supported backend for qmake.
+
+ qmake now offers a 'make uninstall' feature, to reverse the actions of a 'make install'.
+
+ qmake can now do recursive searches in project-file mode (-r option).
+
+1.00a -
+
+ First release, shipped with Qt 3.0.
+
+ qmake ships with support for Unix make, MSVC (both dsp and nmake), Borland make.
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
new file mode 100644
index 0000000..f73370f
--- /dev/null
+++ b/qmake/Makefile.unix
@@ -0,0 +1,218 @@
+#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 @QMAKE_QTOBJS@
+
+#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 \
+	   @SOURCE_PATH@/src/tools/qstring.cpp @SOURCE_PATH@/src/tools/qtextstream.cpp \
+	   @SOURCE_PATH@/src/tools/qiodevice.cpp @SOURCE_PATH@/src/tools/qglobal.cpp \
+	   @SOURCE_PATH@/src/tools/qgdict.cpp @SOURCE_PATH@/src/tools/qcstring.cpp \
+	   @SOURCE_PATH@/src/tools/qdatastream.cpp @SOURCE_PATH@/src/tools/qgarray.cpp \
+	   @SOURCE_PATH@/src/tools/qbuffer.cpp @SOURCE_PATH@/src/tools/qglist.cpp \
+	   @SOURCE_PATH@/src/tools/qptrcollection.cpp @SOURCE_PATH@/src/tools/qfile.cpp \
+	   @SOURCE_PATH@/src/tools/qfile_unix.cpp @SOURCE_PATH@/src/tools/qregexp.cpp \
+	   @SOURCE_PATH@/src/tools/qgvector.cpp @SOURCE_PATH@/src/tools/qgcache.cpp \
+	   @SOURCE_PATH@/src/tools/qbitarray.cpp @SOURCE_PATH@/src/tools/qdir.cpp \
+	   @SOURCE_PATH@/src/tools/quuid.cpp @SOURCE_PATH@/src/tools/qfileinfo_unix.cpp \
+	   @SOURCE_PATH@/src/tools/qdir_unix.cpp @SOURCE_PATH@/src/tools/qfileinfo.cpp \
+	   @SOURCE_PATH@/src/tools/qdatetime.cpp @SOURCE_PATH@/src/tools/qstringlist.cpp \
+	   @SOURCE_PATH@/src/tools/qmap.cpp @SOURCE_PATH@/src/tools/qconfig.cpp \
+	   @SOURCE_PATH@/src/tools/qsettings.cpp @SOURCE_PATH@/src/tools/qurl.cpp \
+	   @SOURCE_PATH@/src/tools/qsettings_mac.cpp @SOURCE_PATH@/src/tools/qlocale.cpp
+
+CXXFLAGS= @QMAKE_CXXFLAGS@ \
+	-I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
+	-I@BUILD_PATH@/include/qmake -I@BUILD_PATH@/include -I@SOURCE_PATH@/include \
+	-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \
+	-DQT_NO_COMPRESS -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP
+LFLAGS=@QMAKE_LFLAGS@
+
+qmake: $(OBJS) $(QOBJS)
+	$(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
+	rm -f @BUILD_PATH@/bin/$@
+	ln -s ../qmake/$@ @BUILD_PATH@/bin/$@
+
+install: qmake
+	[ -d @QT_INSTALL_BINS@ ] || mkdir -p @QT_INSTALL_BINS@
+	-cp -f @BUILD_PATH@/bin/qmake @QT_INSTALL_BINS@
+	[ -d @QT_INSTALL_DATA@ ] || mkdir -p @QT_INSTALL_DATA@
+	-cp -R -f @SOURCE_PATH@/mkspecs @QT_INSTALL_DATA@
+	-ln -s -f @QMAKESPEC@ @QT_INSTALL_DATA@/mkspecs/default
+
+clean::
+	rm -f $(OBJS) $(QOBJS)
+
+distclean:: clean
+	rm -rf qmake .deps
+
+depend:
+	makedepend $(CXXFLAGS) -D__MAKEDEPEND__ $(DEPEND_SRC)
+
+# don't use optimization for these
+qtextstream.o: @SOURCE_PATH@/src/tools/qtextstream.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qtextstream.cpp
+
+qiodevice.o: @SOURCE_PATH@/src/tools/qiodevice.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qiodevice.cpp
+
+qglobal.o: @SOURCE_PATH@/src/tools/qglobal.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qglobal.cpp
+
+qgdict.o: @SOURCE_PATH@/src/tools/qgdict.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qgdict.cpp
+
+qcstring.o: @SOURCE_PATH@/src/tools/qcstring.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qcstring.cpp
+
+qsettings.o: @SOURCE_PATH@/src/tools/qsettings.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qsettings.cpp
+
+qsettings_mac.o: @SOURCE_PATH@/src/tools/qsettings_mac.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qsettings_mac.cpp
+
+qurl.o: @SOURCE_PATH@/src/kernel/qurl.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/kernel/qurl.cpp
+
+qstring.o: @SOURCE_PATH@/src/tools/qstring.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qstring.cpp
+
+qlocale.o: @SOURCE_PATH@/src/tools/qlocale.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qlocale.cpp
+
+qdatastream.o: @SOURCE_PATH@/src/tools/qdatastream.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qdatastream.cpp
+
+qunicodetables.o: @SOURCE_PATH@/src/tools/qunicodetables.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qunicodetables.cpp
+
+qgarray.o: @SOURCE_PATH@/src/tools/qgarray.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qgarray.cpp
+
+qbuffer.o: @SOURCE_PATH@/src/tools/qbuffer.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qbuffer.cpp
+
+qglist.o: @SOURCE_PATH@/src/tools/qglist.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qglist.cpp
+
+qptrcollection.o: @SOURCE_PATH@/src/tools/qptrcollection.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qptrcollection.cpp
+
+qfile.o: @SOURCE_PATH@/src/tools/qfile.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qfile.cpp
+
+qfile_unix.o: @SOURCE_PATH@/src/tools/qfile_unix.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qfile_unix.cpp
+
+qregexp.o: @SOURCE_PATH@/src/tools/qregexp.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qregexp.cpp
+
+qgvector.o: @SOURCE_PATH@/src/tools/qgvector.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qgvector.cpp
+
+qgcache.o: @SOURCE_PATH@/src/tools/qgcache.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qgcache.cpp
+
+qbitarray.o: @SOURCE_PATH@/src/tools/qbitarray.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qbitarray.cpp
+
+qdir.o: @SOURCE_PATH@/src/tools/qdir.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qdir.cpp
+
+quuid.o: @SOURCE_PATH@/src/tools/quuid.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/quuid.cpp
+
+qfileinfo_unix.o: @SOURCE_PATH@/src/tools/qfileinfo_unix.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qfileinfo_unix.cpp
+
+qdir_unix.o: @SOURCE_PATH@/src/tools/qdir_unix.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qdir_unix.cpp
+
+qfileinfo.o: @SOURCE_PATH@/src/tools/qfileinfo.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qfileinfo.cpp
+
+qdatetime.o: @SOURCE_PATH@/src/tools/qdatetime.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qdatetime.cpp
+
+qstringlist.o: @SOURCE_PATH@/src/tools/qstringlist.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qstringlist.cpp
+
+qmap.o: @SOURCE_PATH@/src/tools/qmap.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qmap.cpp
+
+qconfig.o: @BUILD_PATH@/src/tools/qconfig.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @BUILD_PATH@/src/tools/qconfig.cpp
+
+winmakefile.o: generators/win32/winmakefile.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) generators/win32/winmakefile.cpp
+
+project.o: project.cpp project.h option.h
+	$(CXX) -c -o $@ $(CXXFLAGS) project.cpp
+
+property.o: property.cpp project.h option.h
+	$(CXX) -c -o $@ $(CXXFLAGS) property.cpp
+
+meta.o: meta.cpp project.h option.h
+	$(CXX) -c -o $@ $(CXXFLAGS) meta.cpp
+
+main.o: main.cpp project.h
+	$(CXX) -c -o $@ $(CXXFLAGS) main.cpp
+
+option.o: option.cpp option.h
+	$(CXX) -c -o $@ $(CXXFLAGS) option.cpp
+
+qtmd5.o: qtmd5.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) qtmd5.cpp
+
+makefile.o: generators/makefile.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) generators/makefile.cpp
+
+unixmake.o: generators/unix/unixmake.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) generators/unix/unixmake.cpp
+
+unixmake2.o: generators/unix/unixmake2.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) generators/unix/unixmake2.cpp
+
+borland_bmake.o: generators/win32/borland_bmake.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) generators/win32/borland_bmake.cpp
+
+mingw_make.o: generators/win32/mingw_make.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) generators/win32/mingw_make.cpp
+
+msvc_objectmodel.o: generators/win32/msvc_objectmodel.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp
+
+msvc_vcproj.o: generators/win32/msvc_vcproj.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_vcproj.cpp
+
+msvc_nmake.o: generators/win32/msvc_nmake.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_nmake.cpp
+
+metrowerks_xml.o: generators/mac/metrowerks_xml.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) generators/mac/metrowerks_xml.cpp
+
+pbuilder_pbx.o: generators/mac/pbuilder_pbx.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) generators/mac/pbuilder_pbx.cpp
+
+msvc_dsp.o: generators/win32/msvc_dsp.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_dsp.cpp
+
+projectgenerator.o: generators/projectgenerator.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) generators/projectgenerator.cpp
+
+#default rules
+.cpp.o:
+	$(CXX) -c -o $@ $(CXXFLAGS) $<
+
+# DO NOT DELETE THIS LINE -- make depend depends on it
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
new file mode 100644
index 0000000..aafe9ed
--- /dev/null
+++ b/qmake/Makefile.win32-g++
@@ -0,0 +1,200 @@
+#
+# specific stuff for mingw g++ make
+#
+CXX	    =	g++
+CFLAGS	    =	-c -o$@ -O \
+		-I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -I..\include -I..\src\tools \
+		-I..\mkspecs\win32-g++ \
+		-DUNICODE -DQT_NO_TEXTCODEC -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS
+CXXFLAGS    =   $(CFLAGS)
+LFLAGS	    =	
+LIBS	    = -lole32 -luuid 
+LINKQMAKE   =	g++ $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS)
+ADDCLEAN    =	
+
+
+#qmake code
+OBJS=project.o main.o makefile.o unixmake.o unixmake2.o borland_bmake.o mingw_make.o \
+	msvc_nmake.o msvc_dsp.o msvc_vcproj.o option.o winmakefile.o projectgenerator.o \
+ 	metrowerks_xml.o pbuilder_pbx.o msvc_objectmodel.o property.o meta.o qtmd5.o
+
+#qt code
+QTOBJS=qstring.o quuid.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o qdatastream.o \
+ 	qgarray.o qbuffer.o qglist.o qptrcollection.o qfile.o qfile_win.o qregexp.o qgvector.o \
+ 	qgcache.o qbitarray.o qdir.o qfileinfo_win.o qdir_win.o qfileinfo.o qdatetime.o \
+ 	qstringlist.o qmap.o qlibrary.o qlibrary_win.o qconfig.o qsettings.o qsettings_win.o qunicodetables.o \
+	qlocale.o
+
+
+
+qmake.exe: $(OBJS) $(QTOBJS)
+	$(LINKQMAKE)
+	-copy qmake.exe ..\bin\qmake.exe
+
+clean::
+	-del $(OBJS) $(QTOBJS) $(ADDCLEAN)
+
+distclean:: clean
+	-del qmake
+
+.c.o:
+	$(CXX) $(CFLAGS) $<
+
+.cpp.o:
+	$(CXX) $(CXXFLAGS) $<
+
+qconfig.o: ..\src\tools\qconfig.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qconfig.cpp
+
+qlibrary.o: ..\src\tools\qlibrary.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qlibrary.cpp
+
+qlibrary_win.o: ..\src\tools\qlibrary_win.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qlibrary_win.cpp
+
+qtextstream.o: ..\src\tools\qtextstream.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qtextstream.cpp
+
+qiodevice.o: ..\src\tools\qiodevice.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qiodevice.cpp
+
+qglobal.o: ..\src\tools\qglobal.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qglobal.cpp
+
+qgdict.o: ..\src\tools\qgdict.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qgdict.cpp
+
+qcstring.o: ..\src\tools\qcstring.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qcstring.cpp
+
+qstring.o: ..\src\tools\qstring.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qstring.cpp
+
+qlocale.o: ..\src\tools\qlocale.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qlocale.cpp
+
+quuid.o: ..\src\tools\quuid.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\quuid.cpp
+
+qdatastream.o: ..\src\tools\qdatastream.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qdatastream.cpp
+
+qgarray.o: ..\src\tools\qgarray.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qgarray.cpp
+
+qbuffer.o: ..\src\tools\qbuffer.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qbuffer.cpp
+
+qglist.o: ..\src\tools\qglist.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qglist.cpp
+
+qptrcollection.o: ..\src\tools\qptrcollection.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qptrcollection.cpp
+
+qfile.o: ..\src\tools\qfile.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qfile.cpp
+
+qfile_win.o: ..\src\tools\qfile_win.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qfile_win.cpp
+
+qtextcodec.o: ..\src\codecs\qtextcodec.cpp
+	$(CXX) $(CXXFLAGS) ..\src\codecs\qtextcodec.cpp
+
+qregexp.o: ..\src\tools\qregexp.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qregexp.cpp
+
+qgvector.o: ..\src\tools\qgvector.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qgvector.cpp
+
+qgcache.o: ..\src\tools\qgcache.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qgcache.cpp
+
+qbitarray.o: ..\src\tools\qbitarray.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qbitarray.cpp
+
+qdir.o: ..\src\tools\qdir.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qdir.cpp
+
+qsettings.o: ..\src\tools\qsettings.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qsettings.cpp
+
+qsettings_win.o: ..\src\tools\qsettings_win.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qsettings_win.cpp
+
+qfileinfo_win.o: ..\src\tools\qfileinfo_win.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qfileinfo_win.cpp
+
+qdir_win.o: ..\src\tools\qdir_win.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qdir_win.cpp
+
+qfileinfo.o: ..\src\tools\qfileinfo.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qfileinfo.cpp
+
+qdatetime.o: ..\src\tools\qdatetime.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qdatetime.cpp
+
+qstringlist.o: ..\src\tools\qstringlist.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qstringlist.cpp
+
+qmap.o: ..\src\tools\qmap.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qmap.cpp
+
+qunicodetables.o: ..\src\tools\qunicodetables.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\qunicodetables.cpp
+
+makefile.o: generators\makefile.cpp
+	$(CXX) $(CXXFLAGS) generators\makefile.cpp
+
+unixmake.o: generators\unix\unixmake.cpp
+	$(CXX) $(CXXFLAGS) generators\unix\unixmake.cpp
+
+unixmake2.o: generators\unix\unixmake2.cpp
+	$(CXX) $(CXXFLAGS) generators\unix\unixmake2.cpp
+
+winmakefile.o: generators/win32/winmakefile.cpp
+	$(CXX) $(CXXFLAGS) generators/win32/winmakefile.cpp
+
+borland_bmake.o: generators/win32/borland_bmake.cpp
+	$(CXX) $(CXXFLAGS) generators/win32/borland_bmake.cpp
+
+mingw_make.o: generators/win32/mingw_make.cpp
+	$(CXX) $(CXXFLAGS) generators/win32/mingw_make.cpp
+
+msvc_nmake.o: generators/win32/msvc_nmake.cpp
+	$(CXX) $(CXXFLAGS) generators/win32/msvc_nmake.cpp
+
+msvc_dsp.o: generators/win32/msvc_dsp.cpp
+	$(CXX) $(CXXFLAGS) generators/win32/msvc_dsp.cpp
+
+msvc_vcproj.o: generators/win32/msvc_vcproj.cpp
+	$(CXX) $(CXXFLAGS) generators/win32/msvc_vcproj.cpp
+
+msvc_objectmodel.o: generators/win32/msvc_objectmodel.cpp
+	$(CXX) $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp
+
+qtmd5.o: qtmd5.cpp
+	$(CXX) $(CXXFLAGS) qtmd5.cpp
+
+project.o: project.cpp project.h option.h
+	$(CXX) $(CXXFLAGS) project.cpp
+
+meta.o: meta.cpp project.h option.h
+	$(CXX) $(CXXFLAGS) meta.cpp
+
+property.o: property.cpp property.h option.h
+	$(CXX) $(CXXFLAGS) property.cpp
+	
+main.o: main.cpp project.h
+	$(CXX) $(CXXFLAGS) main.cpp
+
+option.o: option.cpp option.h
+	$(CXX) $(CXXFLAGS) option.cpp
+
+projectgenerator.o: generators/projectgenerator.cpp
+	$(CXX) $(CXXFLAGS) generators/projectgenerator.cpp
+
+metrowerks_xml.o: generators/mac/metrowerks_xml.cpp
+	$(CXX) $(CXXFLAGS) generators/mac/metrowerks_xml.cpp
+
+pbuilder_pbx.o: generators/mac/pbuilder_pbx.cpp
+	$(CXX) $(CXXFLAGS) generators/mac/pbuilder_pbx.cpp
diff --git a/qmake/book/qmake-advanced.leaf b/qmake/book/qmake-advanced.leaf
new file mode 100644
index 0000000..d1b8c4b
--- /dev/null
+++ b/qmake/book/qmake-advanced.leaf
@@ -0,0 +1,401 @@
+\chapter qmake's Advanced Concepts
+
+\section1 qmake's Advanced Concepts
+
+The \e qmake project files we've seen up to now have been very simple,
+just a list of \e{name = value} and \e{name += value} lines. \e qmake
+provides a lot more power, for example you can use a single project
+file to produce makefiles for multiple platforms.
+
+\section1 Operators
+
+So far, you have seen the \e = operator and \e += operator being used
+in a project file.  There are more operators available for use; but
+some of these should be used carefully as they may change more than
+you expect them to.
+
+\section2 The '=' operator
+
+This operator simply assigns a value to a variable, it is used like
+this:
+
+\code
+    TARGET = myapp
+\endcode
+
+This sets the TARGET variable to \e myapp.  This will remove any
+previously set TARGET.
+
+\section2 The '+=' operator
+
+This operator appends a value to the list of values in a variable.  It
+is used like this:
+
+\code
+    DEFINES += QT_DLL
+\endcode
+
+This appends QT_DLL to the list of pre-processor defines to be put in the
+makefile.
+
+\section2 The '-=' operator
+
+This operator removes a value from the list of values in a variable.
+It is used like this:
+
+\code
+    DEFINES -= QT_DLL
+\endcode
+
+This removes QT_DLL from the list of pre-processor defines to be put
+in the makefile.
+
+\section2 The '*=' operator
+
+This operator only adds a value to the list of values in a variable if
+it doesn't already exist.  It is used like this:
+
+\code
+    DEFINES *= QT_DLL
+\endcode
+
+QT_DLL will only be added to the list of pre-processor defines if it
+is not already defined.
+
+\section2 The '~=' operator
+
+This operator replaces any values that match the regexp with the
+specified value.  It is used like this:
+
+\code
+    DEFINES ~= s/QT_[DT].+/QT
+\endcode
+
+This removes any values in the list that start with QT_D or QT_T with
+QT.
+
+\section1 Scopes
+
+A scope are similar to 'if' statements, if a certain condition is
+true, the settings inside the scope are processed.  A scope is written
+like this:
+
+\code
+    win32 {
+	DEFINES += QT_DLL
+    }
+\endcode
+
+The above code will add the QT_DLL define to the makefile if \e qmake
+is used on a Windows platform.  If \e qmake is used on a different
+platform than Windows, the define will be ignored. You may also perform
+single line conditionals/assignments with qmake like this:
+
+\code
+    win32:DEFINES += QT_DLL
+\endcode
+
+For example, suppose we want to process something on all platforms
+\e except for Windows. We can achieve this by negating the scope like
+this:
+
+\code
+    !win32 {
+	DEFINES += QT_DLL
+    }
+\endcode
+
+Any entry on the CONFIG line is also a scope. For example, if you
+write this:
+\code
+    CONFIG += warn_on
+\endcode
+you will have a scope called 'warn_on'. This makes it easy to change
+the configuration for a project without losing all the custom settings
+that might be needed for a specific configuration.  Since it is
+possible to put your own values on the CONFIG line, this provides you
+with a very powerful configuration tool for your makefiles. For
+example:
+
+\code
+    CONFIG += qt warn_on debug
+    debug {
+	TARGET = myappdebug
+    }
+    release {
+	TARGET = myapp
+    }
+\endcode
+
+In the above code, two scopes are created which depend on what
+is put on the CONFIG line.  In the example, \e debug is on the config
+line, so the TARGET variable is set to \e myappdebug.  If \e release
+was on the config line, then the TARGET variable would be set to \e
+myapp.
+
+It is also possible to check for two things before processing some
+settings.  For instance, if you want to check if the platform is
+Windows and that the thread configuration is set, you would write
+this:
+
+\code
+    win32 {
+	thread {
+	    DEFINES += QT_THREAD_SUPPORT
+	}
+    }
+\endcode
+
+To save writing many nested scopes, you can nest scopes using a colon
+like this:
+
+\code
+    win32:thread {
+	DEFINES += QT_THREAD_SUPPORT
+    }
+\endcode
+
+Once a test has been performed you may also do else/elseif operations. With
+this you may easily write complicated tests. This can be done with the
+special 'else' scope, it can be combined with other scopes (separated by
+colons as above) for example:
+
+\code
+    win32:thread {
+	DEFINES += QT_THREAD_SUPPORT
+    } else:debug {
+	DEFINES += QT_NOTHREAD_DEBUG
+    } else {
+	message("Unknown configuration")
+    }
+\endcode
+
+\section1 Variables
+
+The variables that we have encountered so far are system variables,
+such as \e DEFINES, \e SOURCES and \e HEADERS.  It is possible for you
+to create your own variables so that you use them in scopes.  It's
+easy to create your own variable; just name it and assign something to
+it. For example:
+
+\code
+    MY_VARIABLE = value
+\endcode
+
+There are no restricitions on what you do to your own variables, as \e
+qmake will just ignore them unless it needs to look at them for a
+scope.  
+
+You can also assign the value of a current variable to another
+variable by prefixing $$ to the variable name. For example:
+
+\code
+    MY_DEFINES = $$DEFINES
+\endcode
+
+Now the MY_DEFINES variable contains what is in the DEFINES variable at
+this point in the project file.  This is also equivalent to:
+
+\code 
+    MY_DEFINES = $${DEFINES}
+\endcode
+
+The second notation allows you to adjoin the variable expansion to another
+value without separating by space. \e qmake will allow a variable to
+contain anything (including $(VALUE), which will be placed directly into
+the Makefile, and allow it to expand as appropriate, usually an environment
+variable). However, if you require an environment variable to be replaced
+immediately then you may use the $$() notation. For example:
+
+\code
+    MY_DEFINES = $$(ENV_DEFINES)
+\endcode
+
+This will set MY_DEFINES to the value of the evironment variable
+ENV_DEFINES as it parses the .pro file. Additionally you may call built-in
+functions in variable replacing. These functions (not to be confused with
+Test Functions as enumerated in the next section) are listed below:
+
+\section2 join( variablename, glue, before, after )
+
+This will join the value of \e variablename with glue. If this value is
+non-empty it will prefix the value with \e before and suffix it with \e
+after. \e variablename is the only required field, the others will default
+to empty strings. If you need to encode spaces in \e glue, \e before, or \e
+after you must quote them.
+
+\section2 prompt( question )
+
+This will display \e question, and read from stdin as a return value.
+
+\section2 member( variablename, position )
+
+This will place the value in \e variablename in position \e position of the
+list. If the value of \e variablename is not long this will return an empty
+string. \e variablename is the only required field, if not specified
+position will default to the first value in the list (0).
+
+\section2 find( variablename, substr )
+
+This will place all the values in \e variablename that match \e substr. \e
+substr may be a regular expression as well, and will be matched
+accordingly.
+
+\code
+    MY_VAR = one two three four
+    MY_VAR2 = $$join(MY_VAR, " -L", -L) -Lfive
+    MY_VAR3 = $$member(MY_VAR, 2) $$find(MY_VAR, t.*)
+\endcode
+
+MY_VAR2 will contain '-Lone -Ltwo -Lthree -Lfour -Lfive', and MYVAR3 will
+contains 'three two three'.
+
+\section2 system( program_and_args )
+
+This will return the stdout/stderr of the program executed, and parse it as
+normally expected. You can use this to interrogate information about the
+platform for example.
+
+\code
+    UNAME = $$system(uname -s)
+    contains( UNAME, [lL]inux ):message( This looks like Linux ($$UNAME) to me )
+\endcode
+
+\section1 Test Functions
+
+\e qmake provides built-in functions that perform simple, yet powerful
+tests. These tests may be used in place of scopes (as described above), in
+some cases it is more usefull to use the test function by itself ignoring
+its test value.
+
+\section2 contains( variablename, value )
+
+If \e value is in the list of values stored in the variable called \e
+variablename, then the settings inside the scope will be processed.
+For example:
+
+\code
+    contains( CONFIG, thread ) {
+	DEFINES += QT_THREAD_SUPPORT
+    }
+\endcode
+
+If \e thread is in the list of values for the \e CONFIG variable, then
+QT_THREAD_SUPPORT will be added to the list of values in the \e
+DEFINES variable.
+
+\section2 count( variablename, number )
+
+If \e number matches the number of values stored in the variable
+called \e variablename, then the settings inside the scope will be
+processed.  For example:
+
+\code
+    count( DEFINES, 5 ) {
+	CONFIG += debug
+    }
+\endcode
+
+\section2 error( string )
+
+This function outputs the string given and then makes \e qmake exit.
+For example:
+
+\code
+    error( "An error has occured" )
+\endcode
+
+The text "An error has occured" will be displayed on the console and
+\e qmake will exit.
+
+\section2 exists( filename )
+
+If the specified file exists, then the settings inside the scope will
+be processed.  For example:
+
+\code
+    exists( /local/qt/qmake/main.cpp ) {
+	SOURCES += main.cpp
+    }
+\endcode
+
+If \e /local/qt/qmake/main.cpp exists then main.cpp is added to the
+list of source files.
+
+Note that "/" can be used as a directory separator regardless of the
+platform.
+
+
+\section2 equals( variable, value )
+
+If the specified variable is equal to the value passed the scope will
+be processed.  For example:
+
+\code
+    NUMBERS = 1 2 3
+    equals( NUMBERS, 3 4 5 ) {
+         message("The numbers are equal")
+    }
+\endcode
+
+The message will not be displayed because "1 2 3" does not equal "1 2
+3".  As with all functions you can pass an expanded variable as the
+value argument (ie, $$NUMBERS).
+
+\section2 include( filename )
+
+The contents of filename are included at this point in the project
+file, so any settings in the specified file will be processed.  An
+example of this is:
+
+\code 
+    include( myotherapp.pro )
+\endcode
+
+Any settings in the \e myotherapp.pro project file are now processed.
+
+\section2 isEmpty( variablename )
+
+This is the equivalent of using count( variablename, 0 ).  If the
+variable called \e variablename has no elements, then the settings
+inside the scope will be processed.  An example of this is:
+
+\code
+    isEmpty( CONFIG ) {
+	CONFIG += qt warn_on debug
+    }
+\endcode
+
+\section2 message( string ) 
+
+This function simply outputs a message on the console.
+
+\code
+    message( "This is a message" )
+\endcode
+
+The text "This is a message" is output to the console and
+processing of the project file carries on.
+
+\section2 system( command )
+
+The specified command is performed and if it returns an exit code of
+1, the settings inside the scope are processed.  For example:
+
+\code
+    system( ls /bin ) {
+	SOURCES += bin/main.cpp
+	HEADERS += bin/main.h
+    }
+\endcode
+
+So if the command \e {ls /bin} returns 1 then \e bin/main.cpp is added
+to the list of sources and \e bin/main.h is added to the list of
+headers.
+
+\section2 infile( filename, var, val )
+
+This function will succeed if the file \e filename (when parsed
+by qmake itself) contains the variable \e var with a value of 
+\e val. You may also not pass in a third argument (\e val) and the
+function will only test if \e var has been assigned to in the file.
diff --git a/qmake/book/qmake-commandreference.leaf b/qmake/book/qmake-commandreference.leaf
new file mode 100644
index 0000000..549fd5a
--- /dev/null
+++ b/qmake/book/qmake-commandreference.leaf
@@ -0,0 +1,2156 @@
+\chapter qmake Command Reference
+
+\section1 qmake Command Reference
+
+\list
+\i \link #About About This Reference \endlink
+\i \link #Commands Command Line Options \endlink
+\i \link #SystemVariables System Variables \endlink
+\i \link #Functions Functions \endlink
+\i \link #Properties Properties \endlink
+\i \link #Environment Environment Variables and Configuration \endlink
+\i \link #Extensions File Extensions \endlink
+\i \link #Customizing Customizing Makefile Output \endlink
+\endlist
+
+
+\target About
+\section1 About This Reference
+
+This reference is a detailed index of all command line options,
+configurations and internal variables used by the cross-platform
+makefile generation utility \e qmake.
+
+In addition to the variables and functions described in the following
+sections, \e qmake project files may also include comments. 
+Comments begin with the '#' symbol and run to the end of the line.
+
+\target Commands
+\section1 Command Line Options
+
+\section2 Syntax
+
+\code
+qmake [options] files
+\endcode
+
+\section2 Options
+
+The following options can be specified on the command line to \e qmake:
+
+\list
+\i \c -o file \BR
+	\e qmake output will be directed to \e file. if this argument
+	is not specified, then \e qmake will try to guess a suitable name.  If '-' is
+	specified, output is directed to stdout. 
+\i \c -unix \BR
+	\e qmake will run in unix mode.  In this mode, Unix file
+	naming and path conventions will be used, additionally testing for unix 
+	(as a scope) will succeed. This is the default mode on all Unices. 
+\i \c -macx \BR
+	\e qmake will run in Mac OS X mode.  In this mode, Unix file
+	naming and path conventions will be used, additionally testing for macx
+	(as a scope) will succeed. This is the default mode on Mac OS X. 
+\i \c -win32 \BR
+	\e qmake will run in win32 mode.  In this mode, Windows file naming and path
+	conventions will be used, additionally testing for win32 (as a scope) will succeed. 
+	This is the default mode on Windows.
+\i \c -d \BR
+	\e qmake will output (hopefully) useful debugging information.
+\i \c -t tmpl \BR
+	\e qmake will override any set TEMPLATE variables with tmpl, but only
+	\e after the .pro file has been processed.
+\i \c -tp prefix \BR
+	\e qmake will add the prefix to the TEMPLATE variable.
+\i \c -help \BR
+	\e qmake will go over these features and give some useful help.
+\endlist
+
+There are also warning options that can help to find problems in your
+project file:
+
+\list
+\i \c -Wall \BR
+      With this \e qmake will turn on all known warnings.
+\i \c -Wnone \BR
+      No warning information will be generated by \e qmake.
+\i \c -Wparser \BR
+      \e qmake will only generate parser warnings, this will alert
+      you to common pitfalls, and potential problems in the parsing of your .pro
+      files.
+\i \c -Wlogic \BR
+      Again \e qmake will warn of common pitfalls, and potential problems. This can
+      include (but not limited to) checking if a file is placed into a list of files
+      multiple times, if a file cannot be found, etc.
+\endlist
+
+\e qmake supports two different modes of operation. The first mode,
+which is the default is makefile generation.  In this mode, \e qmake
+will take a .pro file and turn it into a makefile.  Creating makefiles
+is covered by this reference guide, there is another mode which
+generates .pro files.
+
+To toggle between these modes you must specify in the first argument
+what mode you want to use.  If no mode is specified, \e qmake will
+assume you want makefile mode.  The available modes are:
+
+\list
+\i \c -makefile \BR
+	\e qmake output will be a makefile (\link #MakefileMode Makefile mode \endlink).
+\i \c -project \BR
+	\e qmake output will be a project file (\link #ProjectfileMode Project file mode \endlink).
+\endlist
+
+\target MakefileMode
+\section3 Makefile Mode
+
+In Makefile mode \e qmake will generate a makefile. Additionally you may
+supply the following arguments in this mode:
+
+\list
+\i \c -after \BR
+        \e qmake will process assignments given on the commandline after
+        the specified files.
+\i \c -nocache \BR
+	\e qmake will ignore the .qmake.cache file.
+\i \c -nodepend \BR
+	\e qmake will not generate any dependency information.
+\i \c -cache file \BR
+	\e qmake will use \e file as the cache file, ignoring any other .qmake.cache file found
+\i \c -spec spec \BR
+	\e qmake will use \e spec as a path to platform-compiler information and QMAKESPEC will be ignored.
+\endlist
+
+The \c files argument can be a list of one or more project files, separated
+by spaces. You may also pass qmake assignments on the command line here and
+they will be processed before all files specified, for example:
+
+qmake -makefile -unix -o Makefile "CONFIG+=test" test.pro 
+
+If however you are certain you want your variables processed after the
+the files specified, then you may pass the -after argument. When this
+is specified all assignments on the commandline after the -after
+option will be postponed until after the specified files are parsed.
+
+This will generate a Makefile, from test.pro with Unix pathnames.  However
+many of these arguments aren't necessary as they are the default.  Therefore
+the line can be simplified on Unix to:
+
+qmake "CONFIG+=test" test.pro 
+
+
+\target ProjectfileMode
+\section3 Projectfile Mode
+
+In Projectfile mode \e qmake will generate a project file. Additionally, you may
+supply the following arguments in this mode:
+
+\list
+\i \c -r \BR
+        \e qmake will look through supplied directories recursively
+\i \c -nopwd \BR
+	\e qmake will not look in your current working directory for
+	source code and only use the specified \c files
+\endlist
+
+The \c files argument can be a list of files or directories.  If a
+directory is specified, then it will be included in the \link
+#DEPENDPATH DEPENDPATH \endlink variable and relevant code from there
+will be included in the generated project file, if a file is given it
+will go into the correct variable depending on extension (i.e. .ui
+files go into FORMS, .cpp files go into SOURCES, etc). Here too you
+may pass assignments on the commandline, when doing so these
+assignments will be placed last in the generated .pro file.
+
+\target SystemVariables
+\section1 System Variables
+
+\list
+\i \link #FrequentlyUsedSystemVariables Frequently Used System Variables \endlink
+\i \link #RarelyUsedSystemVariables Rarely Used System Variables \endlink
+\endlist
+
+
+\target FrequentlyUsedSystemVariables
+\section2 Frequently Used System Variables
+
+The following variables are recognized by \e qmake and are used
+most frequently when creating project files.
+
+
+\target CONFIG
+\section3 CONFIG
+
+ The \c CONFIG variable specifies project configuration and
+compiler options.  The values will be recognized internally by
+\e qmake and have special meaning.  They are as follows.
+
+These \c CONFIG values control compilation flags: 
+
+\list
+\i release - Compile with optimization enabled, ignored if
+    "debug" is specified
+\i debug - Compile with debug options enabled
+\i warn_on - The compiler should emit more warnings than normally, ignored if
+     "warn_off" is specified
+\i warn_off - The compiler should only emit severe warnings.
+\endlist
+
+These options define the application/library type:
+
+\list
+\i qt - The target is a Qt application/library and requires the Qt header
+     files/library.  The proper include and library paths for the Qt
+     library will automatically be added to the project.
+\i opengl - The target requires the OpenGL (or Mesa)
+    headers/libraries. The proper include and library paths for
+    these libraries will automatically be added to the project.
+\i thread - The target is a multi-threaded application or library.  The
+    proper defines and compiler flags will automatically be added to
+    the project.
+\i x11 - The target is a X11 application or library.  The proper
+    include paths and libraries will automatically be added to the
+    project.
+\i windows - The target is a Win32 window application (app only). The
+    proper include paths,compiler flags and libraries will
+    automatically be added to the project.
+\i console - The target is a Win32 console application (app only). The
+    proper include paths, compiler flags and libraries will
+    automatically be added to the
+    project.
+\i dll - The target is a shared object/DLL.The proper
+    include paths, compiler flags and libraries will automatically be
+    added to the project.
+\i staticlib - The target is a static library (lib only).  The proper
+    compiler flags will automatically be added to the project.
+\i plugin - The target is a plugin (lib only). This enables dll as well.
+\endlist
+
+These options are used to set the compiler flags:
+
+\list
+\i exceptions - Exception support is enabled
+\i rtti - RTTI support is enabled
+\i stl - STL support is enabled
+\endlist
+
+These options define specific things depending on the platform and/or template:
+
+\list
+\i flat - When using the vcapp template this will put all the source files into the source group and 
+	the header files into the header group regardless of what directory they reside in.  Turning this
+	option off will group the files within the source/header group depending on the directory they 
+	reside.  This is turned on by default.
+\endlist
+
+The \c CONFIG variable will also be checked when resolving
+scopes.  You may assign anything to this variable.  
+
+For example:
+
+\code
+CONFIG += qt console newstuff
+...
+newstuff {
+	SOURCES += new.cpp
+	HEADERS += new.h
+}
+\endcode
+
+
+\target DEFINES
+\section3 DEFINES
+
+\e qmake adds the values of this variable as compiler C
+preprocessor macros (-D option).  
+
+For example:
+
+\code 
+DEFINES += USE_MY_STUFF QT_DLL
+\endcode
+
+
+\target DEF_FILE
+\section3 DEF_FILE
+
+\e {This is only used on Windows when using the 'app' template}.
+
+Specifies a .def file to be included in the project.
+
+
+\target DESTDIR
+\section3 DESTDIR
+
+Specifies where to put the \link #TARGET target \endlink file. 
+
+For example:
+
+\code 
+  DESTDIR = ../../lib
+\endcode
+
+\target DLLDESTDIR
+\section3 DLLDESTDIR
+
+Specifies where to copy the \link #TARGET target \endlink dll.
+
+\target HEADERS
+\section3 HEADERS
+
+Defines the header files for the project.  
+
+\e qmake will generate dependency information (unless -nodepend
+is specified on the \link #Commands command line \endlink) for the
+specified headers.  \e qmake will also automatically detect if
+\e moc is required by the classes in these headers, and add the
+appropriate dependencies and files to the project for generating and
+linking the moc files. 
+
+For example:
+
+\code
+HEADERS	= myclass.h \
+	  login.h \
+	  mainwindow.h
+\endcode
+
+See also \link #SOURCES SOURCES \endlink.
+
+
+\target INCLUDEPATH
+\section3 INCLUDEPATH
+
+This variable specifies the #include directories which should be
+searched when compiling the project. Use ';' or a space as the
+directory separator. 
+
+For example:
+
+\code
+  INCLUDEPATH = c:\msdev\include d:\stl\include
+\endcode
+
+
+\target FORMS
+\section3 FORMS
+
+This variable specifies the .ui files (see \link
+designer-manual.book Qt Designer \endlink) to be processed through \e uic
+before compiling.  All dependencies, headers and source files required
+to build these .ui files will automatically be added to the project.
+
+For example:
+
+\code
+FORMS = mydialog.ui \
+	mywidget.ui \
+        myconfig.ui
+\endcode
+
+Note that forms should not be specified using the \c += operator because
+this syntax is not fully supported by \QD.
+
+
+\target LEXSOURCES
+\section3 LEXSOURCES
+
+This variable contains a list of lex source files.  All
+dependencies, headers and source files will automatically be added to
+the project for building these lex files.  
+
+For example:
+
+\code
+LEXSOURCES = lexer.l
+\endcode
+ 
+
+\target LIBS
+\section3 LIBS
+
+This variable contains a list of libraries to be linked into the project.
+If you are more comfortable with the Unix convension of -L/-l flags you are
+free to use them in a cross-platform manner and qmake will do the correct
+thing with these libraries on Windows (namely this means passing the full
+path of the library to the linker). The only limitation to this is the
+library must exist, for qmake to find which directory a -l lib lives in.
+
+For example:
+
+\code
+unix:LIBS += -lmath -L/usr/local/lib
+win32:LIBS += c:\mylibs\math.lib
+\endcode
+
+
+\target MOC_DIR
+\section3 MOC_DIR
+
+This variable specifies the directory where all intermediate moc
+files should be placed.  
+
+For example:
+
+\code
+unix:MOC_DIR = ../myproject/tmp
+win32:MOC_DIR = c:\myproject\tmp
+\endcode
+
+
+\target OBJECTS_DIR
+\section3 OBJECTS_DIR
+
+This variable specifies the directory where all intermediate
+objects should be placed.  
+
+For example:
+
+\code
+unix:OBJECTS_DIR = ../myproject/tmp
+win32:OBJECTS__DIR = c:\myproject\tmp
+\endcode
+
+
+\target UI_DIR
+\section3 UI_DIR
+
+This variable specifies the directory where all intermediate files from uic
+should be placed. This variable overrides both UI_SOURCES_DIR and
+UI_HEADERS_DIR.
+
+For example:
+
+\code
+unix:UI_DIR = ../myproject/ui
+win32:UI_DIR = c:\myproject\ui
+\endcode
+
+\target UI_HEADERS_DIR
+\section3 UI_HEADERS_DIR
+
+This variable specifies the directory where all declaration files (as
+generated by uic) should be placed.
+
+For example:
+
+\code
+unix:UI_HEADERS_DIR = ../myproject/ui/include
+win32:UI_HEADERS_DIR = c:\myproject\ui\include
+\endcode
+
+\target UI_SOURCES_DIR
+\section3 UI_SOURCES_DIR
+
+This variable specifies the directory where all implementation files (as generated
+by uic) should be placed.
+
+For example:
+
+\code
+unix:UI_SOURCES_DIR = ../myproject/ui/src
+win32:UI_SOURCES_DIR = c:\myproject\ui\src
+\endcode
+
+
+\target REQUIRES
+\section3 REQUIRES
+
+This is a special variable processed by \e qmake.  If the
+contents of this variable do not appear in CONFIG by the time this
+variable is assigned, then a minimal makefile will be generated that
+states what dependencies (the values assigned to REQUIRES) are
+missing.
+
+This is mainly used in Qt's build system for building the examples.
+
+\target SOURCES
+\section3 SOURCES
+
+This variable contains the name of all source files in the project.  
+
+For example:
+
+\code
+SOURCES	= myclass.cpp \
+	  login.cpp \
+	  mainwindow.cpp
+
+\endcode
+
+See also \link #HEADERS HEADERS \endlink
+
+
+\section3 SUBDIRS
+
+This variable, when used with the 'subdirs'
+\link #TEMPLATE TEMPLATE \endlink contains the names of all subdirectories
+to look for a project file.
+
+For example:
+
+\code
+SUBDIRS = kernel \
+	  tools
+\endcode
+
+
+\target TARGET
+\section3 TARGET
+
+This specifies the name of the target file.
+
+For example:
+
+\code
+TEMPLATE = app
+TARGET = myapp
+SOURCES = main.cpp
+\endcode
+
+The project file above would produce an executable named 'myapp' on
+unix and 'myapp.exe' on windows.
+
+
+
+\target TEMPLATE
+\section3 TEMPLATE
+
+This variable contains the name of the template to use when
+generating the project.  The allowed values are:
+
+\list
+\i app - Creates a makefile for building applications (the default)
+\i lib - Creates a makefile for building libraries
+\i subdirs - Creates a makefile for building targets in subdirectories
+\i vcapp - \e {win32 only}  Creates an application project file for
+Visual Studio
+\i vclib - \e {win32 only}  Creates a library project file for Visual
+Studio
+
+\endlist
+
+For example:
+
+\code
+TEMPLATE = lib
+SOURCES = main.cpp
+TARGET = mylib
+\endcode
+
+The template can be overridden by specifying a new template type with the
+\c -t command line option. This overrides the template type \e after the .pro
+file has been processed. With .pro files that use the template type to
+determine how the project is built, it is necessary to declare TEMPLATE on
+the command line rather than use the \c -t option.
+
+
+
+\section3 VERSION
+
+This variable contains the version number of the library if the
+'lib' \link #TEMPLATE TEMPLATE \endlink is specified.
+
+For example:
+
+\code
+VERSION = 1.2.3
+\endcode
+
+\section3 DISTFILES
+
+This variable contains a list of files to be included in the dist
+target. This feature is supported by UnixMake specs only.
+
+For example:
+
+\code
+DISTFILES += ../program.txt
+\endcode
+
+
+\target YACCSOURCES
+\section3 YACCSOURCES
+
+This variable contains a list of yacc source files to be included
+in the project.  All dependencies, headers and source files will
+automatically be included in the project.
+
+For example:
+
+\code
+YACCSOURCES = moc.y
+\endcode
+
+
+
+\target RarelyUsedSystemVariables
+\section2 Rarely Used System Variables
+
+The following variables are also recognized by \e qmake but are
+either internal or very rarely used.
+
+
+
+\target DESTDIR_TARGET
+\section3 DESTDIR_TARGET
+
+This variable is set internally by \e qmake, which is basically the DESTDIR variable with
+the TARGET variable appened at the end.  The value of this variable
+is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be
+modified.
+
+
+\target DSP_TEMPLATE
+\section3 DSP_TEMPLATE
+
+This variable is set internally by \e qmake, which specifies where the dsp template file for
+basing generated dsp files is stored.  The value of this variable
+is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be
+modified.
+
+
+\target LEXIMPLS
+\section3 LEXIMPLS
+
+This variable contains a list of lex implementation files.  The value
+of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely
+needs to be modified.
+
+
+
+\target LEXOBJECTS
+\section3 LEXOBJECTS
+
+This variable contains the names of intermediate lex object
+files.The value of this variable is typically handled by
+\e qmake and rarely needs to be modified.
+
+
+\target LITERAL_HASH
+\section3 LITERAL_HASH
+
+This variable is used whenever a literal hash character (\c{#}) is needed in
+a variable declaration, perhaps as part of a file name or in a string passed
+to some external application.
+
+For example:
+
+\code
+# To include a literal hash character, use the $$LITERAL_HASH variable:
+urlPieces = http://doc.trolltech.com/3.3/qmake-manual-8.html LITERAL_HASH
+message($$join(urlPieces, $$LITERAL_HASH))
+\endcode
+
+By using \c LITERAL_HASH in this way, the \c # character can be used
+to construct a URL for the \c message() function to print to the console.
+
+
+\target MAKEFILE
+\section3 MAKEFILE
+
+This variable specifies the name of the makefile which
+\e qmake should use when outputting the dependency information
+for building a project.  The value of this variable is typically
+handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+\target MAKEFILE_GENERATOR
+\section3 MAKEFILE_GENERATOR
+
+This variable contains the name of the makefile generator to use
+when generating a makefile.  The value of this variable is typically
+handled internally by \e qmake and rarely needs to be modified.
+
+
+\target OBJECTS
+\section3 OBJECTS
+
+This variable is generated from the \link #SOURCES SOURCES
+\endlink variable.  The extension of each source file will have been 
+replaced by .o (Unix) or .obj (Win32).  The value of this variable is 
+typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and
+rarely needs to be modified.
+
+\target OBJMOC
+\section3 OBJMOC
+
+This variable is set by \e qmake if files can be found that
+contain the Q_OBJECT macro.  \c OBJMOC contains the
+name of all intermediate moc object files. The value of this variable
+is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be
+modified.
+
+\target PRECOMPILED_HEADER
+\section3 PRECOMPILED_HEADER
+
+This variable indicates the header file for creating a precompiled
+header file, to increase the compilation speed of a project.
+Precompiled headers are currently only supported on some platforms
+(Windows - all MSVC project types, Mac OS X - Xcode, Makefile,
+UNIX - gcc 3.3 and up).
+
+On other platforms, this variable has different meaning, as noted
+below.
+
+This variable contains a list of header files that require some
+sort of pre-compilation step (such as with moc). The value of this
+variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be
+modified.  
+
+\target QMAKE
+\section3 QMAKE
+
+This variable contains the name of the \e qmake program
+itself and is placed in generated makefiles.  The value of this
+variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be
+modified.
+
+
+
+\target QMAKESPEC_systemvariable
+\section3 QMAKESPEC
+
+This variable contains the name of the \e qmake
+configuration to use when generating makefiles.  The value of this
+variable is typically handled by \e qmake and rarely needs to be modified.
+Use the \link #QMAKESPEC QMAKESPEC \endlink environment variable instead.
+
+
+
+
+\target QMAKE_APP_FLAG
+\section3 QMAKE_APP_FLAG
+
+This variable is empty unless the 'app'
+\link #TEMPLATE TEMPLATE \endlink is specified.  The value of this
+variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be
+modified.  Use the following instead:
+
+\code
+app {
+	#conditional code for 'app' template here
+}
+\endcode
+
+
+
+
+\target QMAKE_APP_OR_DLL
+\section3 QMAKE_APP_OR_DLL
+
+This variable is empty unless the 'app' or 'dll'
+\link #TEMPLATE TEMPLATE \endlink is specified.  The value of this
+variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be
+modified.  
+
+
+
+\target QMAKE_AR_CMD
+\section3 QMAKE_AR_CMD
+
+\e {This is used on Unix platforms only}
+
+This variable contains the command for invoking the program which
+creates, modifies and extracts archives. The value of this variable is
+typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink 
+and rarely needs to be modified.
+
+
+
+\target QMAKE_CFLAGS_DEBUG
+\section3 QMAKE_CFLAGS_DEBUG
+
+This variable contains the flags for the C compiler in debug mode.The value of this variable is
+typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink 
+and rarely needs to be modified.
+
+
+
+
+\target QMAKE_CFLAGS_MT
+\section3 QMAKE_CFLAGS_MT
+
+This variable contains the compiler flags for creating a
+multi-threaded application or when the version of Qt that you link
+against is a multi-threaded statically linked library.  The value of 
+this variable is typically handled by \e qmake or 
+\link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+\target QMAKE_CFLAGS_MT_DBG
+\section3 QMAKE_CFLAGS_MT_DBG
+
+This variable contains the compiler flags for creating a debuggable
+multi-threaded application or when the version of Qt that you link
+against is a debuggable multi-threaded statically linked library.  The 
+value of this variable is typically handled by \e qmake or 
+\link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+\target QMAKE_CFLAGS_MT_DLL
+\section3 QMAKE_CFLAGS_MT_DLL
+
+\e {This is used on Windows only}
+
+This variable contains the compiler flags for creating a 
+multi-threaded dll or when the version of Qt that you link
+against is a multi-threaded dll.  The value of this variable is typically
+handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and
+rarely needs to be modified.
+
+
+
+
+\target QMAKE_CFLAGS_MT_DLLDBG
+\section3 QMAKE_CFLAGS_MT_DLLDBG
+
+\e {This is used on Windows only}
+
+This variable contains the compiler flags for creating a debuggable
+multi-threaded dll or when the version of Qt that you link
+against is a debuggable multi-threaded statically linked library. 
+The value of this variable is typically handled by \e qmake or 
+\link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+\target QMAKE_CFLAGS_RELEASE
+\section3 QMAKE_CFLAGS_RELEASE
+
+This variable contains the compiler flags for creating a non-debuggable
+application.  The value of this variable is typically
+handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and
+rarely needs to be modified.
+
+
+
+
+\target QMAKE_CFLAGS_SHLIB
+\section3 QMAKE_CFLAGS_SHLIB
+
+\e {This is used on Unix platforms only}
+
+This variable contains the compiler flags for creating a shared
+library. The value of this variable is typically handled by
+\e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs
+to be modified.
+
+
+
+
+\target QMAKE_CFLAGS_THREAD
+\section3 QMAKE_CFLAGS_THREAD
+
+This variable contains the compiler flags for creating a multi-threaded
+application. The value of this variable is typically handled by
+\e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs
+to be modified.
+
+
+
+
+\target QMAKE_CFLAGS_WARN_OFF
+\section3 QMAKE_CFLAGS_WARN_OFF
+
+This variable is not empty if the warn_off
+\link #TEMPLATE TEMPLATE \endlink option is specified.  The value of this 
+variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink 
+and rarely needs to be modified.
+
+
+
+\target QMAKE_CFLAGS_WARN_ON
+\section3 QMAKE_CFLAGS_WARN_ON
+
+This variable is not empty if the warn_on
+\link #TEMPLATE TEMPLATE \endlink option is specified.
+The value of this variable is typically handled by
+\e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs
+to be modified.
+
+
+
+
+\target QMAKE_CLEAN
+\section3 QMAKE_CLEAN
+
+This variable contains any files which are not generated files (such as moc and uic 
+generated files) and object files that should be removed when using "make clean".
+
+
+
+\target QMAKE_CXXFLAGS_DEBUG
+\section3 QMAKE_CXXFLAGS_DEBUG
+
+This variable contains the C++ compiler flags for creating a debuggable
+application. The value of this variable is typically handled by
+\e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs
+to be modified.
+
+
+
+\target QMAKE_CXXFLAGS_MT
+\section3 QMAKE_CXXFLAGS_MT
+
+This variable contains the C++ compiler flags for creating a multi-threaded
+application. The value of this variable is typically handled by
+\e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs
+to be modified.
+
+
+
+
+\target QMAKE_CXXFLAGS_MT_DBG
+\section3 QMAKE_CXXFLAGS_MT_DBG
+
+This variable contains the C++ compiler flags for creating a debuggable multi-threaded
+application. The value of this variable is typically handled by
+\e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs
+to be modified.
+
+
+
+
+\target QMAKE_CXXFLAGS_MT_DLL
+\section3 QMAKE_CXXFLAGS_MT_DLL
+
+\c {This is used on Windows only}
+
+This variable contains the C++ compiler flags for creating a multi-threaded
+dll. The value of this variable is typically handled by
+\e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs
+to be modified.
+
+
+
+
+\target QMAKE_CXXFLAGS_MT_DLLDBG
+\section3 QMAKE_CXXFLAGS_MT_DLLDBG
+
+\c {This is used on Windows only}
+
+This variable contains the C++ compiler flags for creating a multi-threaded debuggable
+dll. The value of this variable is typically handled by
+\e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs
+to be modified.
+
+
+
+
+\target QMAKE_CXXFLAGS_RELEASE
+\section3 QMAKE_CXXFLAGS_RELEASE
+
+This variable contains the C++ compiler flags for creating an 
+application. The value of this variable is typically handled by
+\e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs
+to be modified.
+
+
+
+
+\target QMAKE_CXXFLAGS_SHLIB
+\section3 QMAKE_CXXFLAGS_SHLIB
+
+This variable contains the C++ compiler flags for creating a
+shared library.  The value of this variable is typically handled by
+\e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs
+to be modified.
+
+
+
+
+\target QMAKE_CXXFLAGS_THREAD
+\section3 QMAKE_CXXFLAGS_THREAD
+
+This variable contains the C++ compiler flags for creating a
+multi-threaded application.  The value of this variable is typically handled by
+\e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs
+to be modified.
+
+
+
+
+\target QMAKE_CXXFLAGS_WARN_OFF
+\section3 QMAKE_CXXFLAGS_WARN_OFF
+
+This variable contains the C++ compiler flags for suppressing compiler warnings.
+ The value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+\target QMAKE_CXXFLAGS_WARN_ON
+\section3 QMAKE_CXXFLAGS_WARN_ON
+
+This variable contains C++ compiler flags for generating compiler warnings.
+ The value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+\target QMAKE_EXTENSION_SHLIB
+\section3 QMAKE_EXTENSION_SHLIB
+
+This variable contains the extention for shared libraries.  The value of this 
+variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink 
+and rarely needs to be modified.
+
+
+
+
+\target QMAKE_FAILED_REQUIREMENTS
+\section3 QMAKE_FAILED_REQUIREMENTS
+
+This variable contains the list of requirements that were failed to be met when
+\e qmake was used.  For example, the sql module is needed and wasn't compiled into Qt.  The 
+value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink 
+and rarely needs to be modified.
+
+
+
+
+\target QMAKE_FILETAGS
+\section3 QMAKE_FILETAGS
+
+This variable contains the file tags needed to be entered into the makefile, such as SOURCES
+and HEADERS.  The value of this variable is typically handled by \e qmake or 
+\link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+\target QMAKE_INCDIR
+\section3 QMAKE_INCDIR
+
+This variable contains the location of all known header files to be added to 
+INCLUDEPATH when building an application.  The value of this variable is 
+typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely 
+needs to be modified.
+
+
+\target POST_TARGETDEPS
+\section3 POST_TARGETDEPS
+
+All libraries that the \link #TARGET target \endlink depends on can be
+listed in this variable. Some backends do not support this, these include
+MSVC Dsp, and ProjectBuilder .pbproj files. Generally this is support
+internally by these build tools, this is usefull for explicitly listing
+dependant static libraries.
+
+This list will go after all builtin (and \link #PRE_TARGETDEPS
+$$PRE_TARGETDEPS \endlink) dependencies.
+
+
+\target PRE_TARGETDEPS
+\section3 PRE_TARGETDEPS
+
+All libraries that the \link #TARGET target \endlink depends on can be
+listed in this variable. Some backends do not support this, these include
+MSVC Dsp, and ProjectBuilder .pbproj files. Generally this is support
+internally by these build tools, this is usefull for explicitly listing
+dependant static libraries.
+
+This list will go before all builtin dependencies.
+
+
+\target QMAKE_INCDIR_OPENGL
+\section3 QMAKE_INCDIR_OPENGL
+
+This variable contains the location of OpenGL header files to be added
+to INCLUDEPATH when building an application with OpenGL support. The
+value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+\target QMAKE_INCDIR_QT
+\section3 QMAKE_INCDIR_QT
+
+This variable contains the location of all known header file
+paths to be added to INCLUDEPATH when building a Qt application. The value 
+of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+\target QMAKE_INCDIR_THREAD
+\section3 QMAKE_INCDIR_THREAD
+
+This variable contains the location of all known header file
+paths to be added to INCLUDEPATH when building a multi-threaded application. 
+The value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+\target QMAKE_INCDIR_X11
+\section3 QMAKE_INCDIR_X11
+
+\e {This is used on Unix platforms only}
+
+This variable contains the location of X11 header file paths to be
+added to INCLUDEPATH when building a X11 application.  The
+value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+\target QMAKE_LFLAGS_CONSOLE
+\section3 QMAKE_LFLAGS_CONSOLE
+
+\e {This is used on Windows only}
+
+This variable contains link flags when building console
+programs.  The value of this variable is typically handled by
+\e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+\section3 QMAKE_LFLAGS_CONSOLE_DLL
+
+\e {This is used on Windows only}
+
+This variable contains link flags when building console
+dlls.  The value of this variable is typically handled by
+\e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 QMAKE_LFLAGS_DEBUG
+
+This variable contains link flags when building debuggable applications.  The
+value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 QMAKE_LFLAGS_PLUGIN
+
+This variable contains link flags when building plugins. The value
+of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 QMAKE_LFLAGS_QT_DLL
+
+This variable contains link flags when building programs that
+use the Qt library built as a dll. The value of this variable is
+typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 QMAKE_LFLAGS_RELEASE
+
+This variable contains link flags when building applications for 
+release. The value of this variable is typically handled by
+\e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 QMAKE_LFLAGS_SHAPP
+
+This variable contains link flags when building applications which are using
+the 'app' template.  The value of this variable is typically handled by
+\e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 QMAKE_LFLAGS_SHLIB
+
+This variable contains link flags when building shared libraries
+The value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 QMAKE_LFLAGS_SONAME
+
+This variable specifies the link flags to set the name of shared objects,
+such as .so or .dll.  The value of this variable is typically handled by \e
+qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+\section3 QMAKE_LFLAGS_THREAD
+
+This variable contains link flags when building multi-threaded projects.
+The value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 QMAKE_LFLAGS_WINDOWS
+
+\e {This is used on Windows only}
+
+This variable contains link flags when building windows projects.
+The value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+\section3 QMAKE_LFLAGS_WINDOWS_DLL
+
+\e {This is used on Windows only}
+
+This variable contains link flags when building windows dll projects.
+The value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+\section3 QMAKE_LIBDIR
+
+This variable contains the location of all known library
+directories.The value of this variable is typically handled by
+\e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 QMAKE_LIBDIR_FLAGS
+
+\e {This is used on Unix platforms only}
+
+This variable contains the location of all library
+directory with -L prefixed.  The value of this variable is typically handled by
+\e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+\section3 VPATH
+
+This variable tells \e qmake where to search for files it cannot
+open. With this you may tell \e qmake where it may look for things
+like SOURCES, and if it finds an entry in SOURCES that cannot be
+opened it will look through the entire VPATH list to see if it can
+find the file on its own.
+
+See also \link #DEPENDPATH DEPENDPATH \endlink.
+
+\target DEPENDPATH
+\section3 DEPENDPATH
+
+This variable contains the list of all directories to look in to
+resolve dependencies. This will be used when crawling through
+'included' files.
+
+
+\section3 QMAKE_LIBDIR_OPENGL
+
+This variable contains the location of the OpenGL library
+directory.The value of this variable is typically handled by
+\e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 QMAKE_LIBDIR_QT
+
+This variable contains the location of the Qt library
+directory.The value of this variable is typically handled by
+\e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 QMAKE_LIBDIR_X11
+
+\e {This is used on Unix platforms only}
+
+This variable contains the location of the X11 library
+directory.The value of this variable is typically handled by
+\e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+\section3 QMAKE_LIBS
+
+This variable contains all project libraries.  The value of this
+variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+\section3 QMAKE_LIBS_CONSOLE
+
+\e {This is used on Windows only}
+
+This variable contains all project libraries that should be linked against
+when building a console application.  The value of this
+variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+\section3 QMAKE_LIBS_OPENGL
+
+This variable contains all OpenGL libraries.  The value of this
+variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 QMAKE_LIBS_OPENGL_QT
+
+This variable contains all OpenGL Qt libraries.The value of this
+variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 QMAKE_LIBS_QT
+
+This variable contains all Qt libraries.The value of this
+variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 QMAKE_LIBS_QT_DLL
+
+\e {This is used on Windows only}
+
+This variable contains all Qt libraries when Qt is built as a dll.  The 
+value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 QMAKE_LIBS_QT_OPENGL
+
+This variable contains all the libraries needed to link against if 
+OpenGL support is turned on. The 
+value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+\section3 QMAKE_LIBS_QT_THREAD
+
+This variable contains all the libraries needed to link against if 
+thread support is turned on.  The 
+value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 QMAKE_LIBS_RT
+
+\e {This is used with Borland compilers only}
+
+This variable contains the runtime library needed to link against when
+building an application.  The 
+value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 QMAKE_LIBS_RTMT
+
+\e {This is used with Borland compilers only}
+
+This variable contains the runtime library needed to link against when
+building a multi-threaded application.  The 
+value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+\section3 QMAKE_LIBS_THREAD
+
+\e {This is used on Unix platforms only}
+
+This variable contains all libraries that need to be linked against
+when building a multi-threaded application.  The 
+value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 QMAKE_LIBS_WINDOWS
+
+\e {This is used on Windows only}
+
+This variable contains all windows libraries.The value of this
+variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 QMAKE_LIBS_X11
+
+\e {This is used on Unix platforms only}
+
+This variable contains all X11 libraries.The value of this
+variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 QMAKE_LIBS_X11SM
+
+\e {This is used on Unix platforms only}
+
+This variable contains all X11 session management libraries.  The
+value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 QMAKE_LIB_FLAG
+
+This variable is not empty if the 'lib' template is specified.  The
+value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+\section3 QMAKE_LINK_SHLIB_CMD
+
+This variable contains the command to execute when creating a
+shared library. The
+value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+\section3 QMAKE_POST_LINK
+
+This variable contains the command to execute after linking the TARGET
+together. This variable is normally empty and therefore nothing is
+executed, additionally some backends will not support this - mostly only
+Makefile backends.
+
+
+
+\section3 QMAKE_PRE_LINK
+
+This variable contains the command to execute before linking the TARGET
+together. This variable is normally empty and therefore nothing is
+executed, additionally some backends will not support this - mostly only
+Makefile backends.
+
+
+
+\section3 QMAKE_LN_SHLIB
+
+This variable contains the command to execute when creating a link
+to a shared library. The
+value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 QMAKE_MAKEFILE
+
+This variable contains the name of the makefile to create. The
+value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+
+\section3 QMAKE_MOC_SRC
+
+This variable contains the names of all moc source files to
+generate and include in the project. The value of this variable is
+typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+\section3 QMAKE_QMAKE
+
+This variable contains the location of qmake if it is not in the path.  
+The value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 QMAKE_QT_DLL
+
+This variable is not empty if Qt was built as a dll.  The
+value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+\section3 QMAKE_RUN_CC
+
+This variable specifies the individual rule needed to build an object.
+The value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+\section3 QMAKE_RUN_CC_IMP
+
+This variable specifies the individual rule needed to build an object.
+The value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+\section3 QMAKE_RUN_CXX
+
+This variable specifies the individual rule needed to build an object.
+The value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+\section3 QMAKE_RUN_CXX_IMP
+
+This variable specifies the individual rule needed to build an object.
+The value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+\section3 QMAKE_TARGET
+
+This variable contains the name of the project target.  The value of
+this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+\section3 QMAKE_UIC
+
+This variable contains the location of uic if it is not in the path.  
+The value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+It can be used to specify arguments to uic as well, such as additional plugin 
+paths.  For example:
+
+\code
+	QMAKE_UIC = uic -L /path/to/plugin
+\endcode
+
+
+
+\section3 RC_FILE
+
+This variable contains the name of the resource file for the application.  
+The value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+
+\section3 RES_FILE
+
+This variable contains the name of the resource file for the application.  
+The value of this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+\section3 SRCMOC
+
+This variable is set by \e qmake if files can be found that
+contain the Q_OBJECT macro.  \c SRCMOC contains the
+name of all the generated moc files. The value of this variable
+is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be
+modified.
+
+\section3 TARGET_EXT
+
+This variable specifies the target's extension.  The value of this variable
+is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be
+modified.
+
+
+
+\section3 TARGET_x
+
+This variable specifies the target's extension with a major version number.  The value of this variable
+is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be
+modified.
+
+
+\section3 TARGET_x.y.z
+
+This variable specifies the target's extension with version number.  The value of this variable
+is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be
+modified.
+
+
+\section3 UICIMPLS
+
+This variable contains a list of the generated implementation files by UIC.  
+The value of this variable
+is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be
+modified.
+
+
+
+
+
+\section3 UICOBJECTS
+
+This variable is generated from the UICIMPLS variable.  The extension of each 
+file will have been replaced by .o (Unix) or .obj (Win32).  The value of this variable is 
+typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and
+rarely needs to be modified.
+
+
+
+\section3 VER_MAJ
+
+This variable contains the major version number of the library, if the
+'lib' \link #TEMPLATE template \endlink is specified.
+
+
+
+
+
+\section3 VER_MIN
+
+This variable contains the minor version number of the library, if the
+'lib' \link #TEMPLATE template \endlink is specified.
+
+
+
+
+
+\section3 VER_PAT
+
+This variable contains the patch version number of the library, if the
+'lib' \link #TEMPLATE template \endlink is specified.
+
+
+
+\section3 QMAKE_EXT_MOC
+
+This variable changes the extention used on included moc files. 
+
+See also \link #Extensions File Extensions \endlink.
+
+
+
+\section3 QMAKE_EXT_UI
+
+This variable changes the extention used on /e Designer UI files. 
+
+See also \link #Extensions File Extensions \endlink.
+
+
+
+\section3 QMAKE_EXT_PRL
+
+This variable changes the extention used on created PRL files. 
+
+See also \link #Extensions File Extensions \endlink, 
+         \link #LibDepend Library Dependencies \endlink.
+
+
+
+\section3 QMAKE_EXT_LEX
+
+This variable changes the extention used on files given to lex.
+
+See also \link #Extensions File Extensions \endlink,
+         \link #LEXSOURCES LEXSOURCES \endlink.
+
+
+
+\section3 QMAKE_EXT_YACC
+This variable changes the extention used on files given to yacc.
+
+See also \link #Extensions File Extensions \endlink,
+         \link #LEXSOURCES YACCSOURCES \endlink.
+
+
+
+\section3 QMAKE_EXT_OBJ
+
+This variable changes the extention used on generated object files. 
+
+See also \link #Extensions File Extensions \endlink.
+
+
+\section3 QMAKE_EXT_CPP
+
+This variable changes the interpretation of all suffixes in this
+list of values as files of type C++ source code.
+
+See also \link #Extensions File Extensions \endlink.
+
+
+\section3 QMAKE_EXT_H
+
+This variable changes the interpretation of all suffixes in this
+list of values as files of type C header files.
+
+See also \link #Extensions File Extensions \endlink.
+
+
+\section3 YACCIMPLS
+
+This variable contains a list of yacc source files. The value of
+this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+
+
+\section3 YACCOBJECTS
+
+This variable contains a list of yacc object files. The value of
+this variable is typically handled by \e qmake or
+ \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
+
+
+\target Functions
+\section1 Functions
+
+\e qmake recognizes the following functions:
+
+
+
+\section2 include( filename )
+
+This function will include the contents of \e filename into the
+current project at the point where was included.  The function succeeds
+if \e filename was included, otherwise it fails. You can check the
+return value of this function using a
+scope.
+
+For example:
+
+\code
+include( shared.pri )
+OPTIONS = standard custom
+!include( options.pri ) {
+	message( "No custom build options specified" )
+	OPTIONS -= custom
+}
+\endcode
+
+\section2 exists( file )
+
+This function will test if \e file exists.  If the file exists, then it will succeed; otherwise it will
+fail. 
+You can specify a regular expression in file and it will succeed if any file
+matches the regular expression specified.
+
+For example:
+\code
+exists( $(QTDIR)/lib/libqt-mt* ) {
+      message( "Configuring for multi-threaded Qt..." )
+      CONFIG += thread
+}
+\endcode
+
+\section2 contains( variablename, value )
+
+This function will succeed if the variable \e variablename
+contains the value \e value.  You can check the return value of this
+function using a scope.
+
+For example:
+
+\code
+contains( drivers, network ) {
+	# drivers contains 'network'
+	message( "Configuring for network build..." )
+	HEADERS += network.h
+	SOURCES += network.cpp
+}
+\endcode
+
+\section2 count( variablename, number )
+
+This function will succeed if the variable \e variablename
+contains \e number elements, otherwise it will fail.  You can check
+the return value of this function using a
+scope.
+
+For example:
+
+\code
+MYVAR = one two three
+count( MYVAR, 3 ) {
+	# always true
+}
+\endcode
+
+\section2 infile( filename, var, val )
+
+This function will succeed if the file \e filename (when parsed
+by qmake itself) contains the variable \e var with a value of 
+\e val. You may also not pass in a third argument (\e val) and the
+function will only test if \e var has been assigned to in the file.
+
+\section2 isEmpty( variablename )
+
+This function will succeed if the variable \e variablename is
+empty (same as \c count(variable, 0)).
+
+\section2 system( command )
+
+This function will execute \c command in a secondary shell and will
+succeed if the command exits with an exit status of 1.  You can check the
+return value of this function using a scope.
+
+For example:
+
+\code
+  system(ls /bin):HAS_BIN=FALSE
+\endcode
+
+\section2 message( string )
+
+This function will always succeed, and will display the given
+\e string to the user.
+
+\section2 error( string )
+
+This function will never return a value.  It will display the given \e
+string to the user, and then exit \e qmake. This function should
+only be used for very fatal configurations.
+
+For example:
+
+\code
+  release:debug:error(You can't have release and debug at the same time!)
+\endcode
+
+\target Properties
+\section1 Properties
+
+\e qmake has a system of persistant information, this allows you to
+'set' a variable in qmake once, and each time qmake is invoked this
+value can be queried. Use the following to set a property in qmake:
+
+\code
+qmake -set VARIABLE VALUE
+\endcode
+
+To retrieve this information back from qmake you can do:
+
+\code
+qmake -query VARIABLE
+qmake -query #queries all current VARIABLE/VALUE pairs..
+\endcode
+
+This information will be saved into a QSettings object (meaning it
+will be stored in different places for different platforms). As
+VARIABLE is versioned as well, you can set one value in an older
+version of qmake, and newer versions will retrieve this value, however
+if you -set VARIABLE into a newer version of qmake the older version
+will not use this value. You can however query a specific version of a
+variable if you prefix that version of qmake to VARIABLE, as in:
+
+\code
+qmake -query "1.06a/VARIABLE"
+\endcode
+
+qmake also has the notion of 'builtin' properties, for example you can
+query the installation of Qt for this version of qmake with the
+QT_INSTALL_PREFIX property:
+
+\code
+qmake -query "QT_INSTALL_PREFIX"
+\endcode
+
+These builtin properties cannot have a version prefixed to them as
+they are not versioned and each qmake will have its own notion of
+these values. The list below outlines the builtin properties:
+
+\list
+\i QT_INSTALL_PREFIX - Where the version of Qt this qmake is built for resides
+\i QT_INSTALL_DATA - Where data for this version of Qt resides
+\i QMAKE_VERSION - The current version of qmake
+\endlist
+
+Finally, these values can be queried in a project file with a special
+notation such as:
+
+\code
+QMAKE_VERS = $$[QMAKE_VERSION]
+\endcode
+
+\target Environment
+\section1 Environment Variables and Configuration
+
+\target QMAKESPEC
+\section2 QMAKESPEC
+
+\e qmake requires a platform and compiler description file which
+contains many default values used to generate appropriate makefiles.
+The standard Qt distribution comes with many of these files, located
+in the 'mkspecs' subdirectory of the Qt installation.
+
+The QMAKESPEC environment variable can contain any of the following:
+
+\list
+\i A complete path to a directory containing a qmake.conf file.  In this case \e qmake will open the qmake.conf file from within that directory.  If the file does not exist, \e qmake will exit with an error.
+\i The name of a platform-compiler combination.  In this case, \e qmake will search in the directory specified by the QTDIR environment variable.
+\endlist
+
+Note: the QMAKESPEC path will automatically be added to the
+\link #INCLUDEPATH INCLUDEPATH \endlink system variable.
+
+\target INSTALLS
+\section2 INSTALLS
+
+It is common on UNIX to be able to install from the same utility as
+you build with (e.g make install). For this \e qmake has introduce the
+concept of an install set. The notation for this is quite simple,
+first you fill in an "object" in qmake for example:
+
+\code
+  documentation.path = /usr/local/program/doc
+  documentation.files = docs/*
+\endcode
+
+In this way you are telling \e qmake several things about this
+install, first that you plan to install to /usr/local/program/doc (the
+path member), second that you plan to copy everything in the docs
+directory. Once this is done you may insert it in the install list:
+
+\code
+  INSTALLS += documentation
+\endcode
+
+Now \e qmake will take over making sure the correct things are copied
+to the specified places. If however you require greater control you
+may use the 'extra' member of the object:
+
+\code
+  unix:documentation.extra = create_docs; mv master.doc toc.doc
+\endcode
+
+Then qmake will run the things in extra (this is of course platform
+specific, so you may need to test for your platform first, this case
+we test for unix). Then it will do the normal processings of the files
+member. Finally if you appened a builtin install to INSTALLS \e qmake
+(and do not specify a files or extra member) will decide what needs to
+be copied for you, currently the only supported builtin is target:
+
+\code
+  target.path = /usr/local/myprogram
+  INSTALLS += target
+\endcode
+
+With this \e qmake will know what you plan need copied, and do this
+for you.
+
+\target cache
+\section2 Cache File
+
+The cache file (mentioned above in the options) is a special file \e qmake
+will read to find settings not specified in the \c qmake.conf file, the
+.pro file, or the command line. If \c -nocache is not specified, \e qmake
+will try to find a file called \c .qmake.cache in parent directories.  If
+it fails to find this file, it will silently ignore this step of
+processing.
+
+\target LibDepend
+\section2 Library Dependencies
+
+Often when linking against a library \e qmake relies on the underlying
+platform to know what other libraries this library links against, and
+lets the platform pull them in. In many cases, however, this is not
+sufficent. For example when statically linking a library there are no
+libraries linked against, and therefore no dependencies to those
+libraries are created - however an application that later links
+against this library will need to know where to find the symbols that
+the linked in library will require. To help with this situation \e
+qmake will follow a library's dependencies when it feels appropriate,
+however this behaviour must be enabled in \e qmake. To enable requires
+two steps. First, you must enable it in the library - to do this you
+must tell \e qmake to save information about this library:
+
+\code
+  CONFIG += create_prl
+\endcode
+
+This is only relevant to the lib template, and will be ignored for all
+others. When this option is enabled \e qmake will create a file
+(called a .prl file) which will save some meta information about the
+library. This metafile is itself just a qmake project file, but with
+all internal variables. You are free to view this file, and if deleted
+\e qmake will know to recreate it when necesary (either when the .pro
+file is later read, or if a dependent library (described below) has
+changed). When installing this library (by using target in INSTALLS,
+above) \e qmake will automatically copy the .prl file to your install
+path.
+
+The second step to enabling this processing is to turn on reading of
+the meta information created above:
+
+\code
+  CONFIG += link_prl
+\endcode
+
+When this is turned on \e qmake will process all libraries linked to,
+and find their meta information. With this meta information \e qmake
+will figure out what is relevant to linking, specifically it will add
+to your list of DEFINES as well as LIBS. Once \e qmake has processed
+this file, it will then look through the newly introduced LIBS and
+find their dependent .prl files, and continue until all libraries have
+been resolved. At this point the makefile is created as usual, and the
+libraries are linked explicity against your program.
+
+The internals of the .prl file are left closed so they can easily
+change later. It is not designed to be changed by hand however, and
+should only be created by \e qmake - these .prl files should also not
+be transfered from operating system to operating system as they may be
+platform dependent (like a makefile).
+
+\target Extensions
+\section2 File Extensions
+
+Under normal circumstances \e qmake will try to use appropriate file extensions
+for your platform. There may be times, however, that you would like to override
+the behavior of these extensions. To do this, you must modify builtin variables 
+in your .pro file, which will in turn changes \e qmake's interpretation of these
+files. You may do this as:
+
+\code
+  QMAKE_EXT_MOC = .mymoc
+\endcode
+
+The variables are as follows:
+
+\list
+\i QMAKE_EXT_MOC - This modifies the extension placed on included moc files.
+\i QMAKE_EXT_UI - This modifies the extension used for designer UI files (usually in FORMS).
+\i QMAKE_EXT_PRL - This modifies the extension placed on 
+                   \link #LibDepend library dependency files \endlink.
+\i QMAKE_EXT_LEX - This changes the suffix used in files (usually in LEXSOURCES).
+\i QMAKE_EXT_YACC - This changes the suffix used in files (usually in YACCSOURCES).
+\i QMAKE_EXT_OBJ - This changes the suffix used on generated object files.
+\endlist
+
+All the above accept just the first value, so you must assign to it one value that
+will be used through your makefile. There are two variables that accept a list of values, 
+they are:
+
+\list
+\i QMAKE_EXT_CPP - Changes interpretation all files with these suffixes to be
+                   C++ source files. 
+\i QMAKE_EXT_H - Changes interpretation all files with these suffixes to be
+                   C header files. 
+\endlist
+
+
+\target Customizing
+\section2 Customizing Makefile Output
+
+qmake often tries to be all things to all build tools, this is often less
+than ideal when you really need to run special platform dependent
+commands. This can be achieved with specific instructions to the different
+qmake backends (currently this is only supported by the UNIX \link
+#MAKEFILE_GENERATOR generator \endlink). 
+
+The interfaces to customizing the Makefile are done through "objects" as in
+other places in qmake. The notation for this is quite simple, first you
+fill in an "object" in qmake for example:
+
+\code
+  mytarget.target = .buildfile
+  mytarget.commands = touch $$mytarget.target
+  mytarget.depends = mytarget2
+
+  mytarget2.commands = @echo Building $$mytarget.target
+\endcode
+
+The information above defines a qmake target called mytarget which contains
+a Makefile target called .buildfile, .buildfile is generated by 'touch
+.buildfile', and finally that this Makefile target depends on the qmake
+target mytarget2. Additionally we've defined the qmake target mytarget2
+which simply echo's something to stdout.
+
+The final step to making use of the above is to instruct qmake that this is
+actually an object used by the target building parts of qmake by:
+
+\code
+QMAKE_EXTRA_UNIX_TARGETS += mytarget mytarget2
+\endcode
+
+This is all you need to do to actually build custom targets in qmake, of
+course you may want to tie one of these targets to actually building the
+\link #TARGET qmake build target \endlink. To do this, you simply need to
+include your Makefile target in the list of \link #PRE_TARGETDEPS PRE_TARGETDEPS
+\endlink.
+
+For convenience there is also a method of customizing (UNIX) projects
+for generic new compilers (or even preprocessors).
+
+\code
+new_moc.output  = moc_${QMAKE_FILE_BASE}.cpp
+new_moc.commands = moc ${QMAKE_FILE_NAME} -o ${QMAKE_FILE_OUT}
+new_moc.depends = g++ -E -M ${QMAKE_FILE_NAME} | sed "s,^.*: ,,"
+new_moc.input = NEW_HEADERS
+QMAKE_EXTRA_UNIX_COMPILERS += new_moc
+\endcode
+
+With this you can create a new moc for qmake, the commands will be
+executed over all arguments given to a NEW_HEADERS variable (from the
+input variable), and write to output (and automatically hand this
+filename to the compiler to be linked into your target). Additionally
+qmake will execute depends to generate dependency information and
+place this in the project as well.
+
+These commands can easily be placed into a cache file, and subsequent
+.pro files can give several arguments to NEW_HEADERS.
diff --git a/qmake/book/qmake-concepts.leaf b/qmake/book/qmake-concepts.leaf
new file mode 100644
index 0000000..8275a23
--- /dev/null
+++ b/qmake/book/qmake-concepts.leaf
@@ -0,0 +1,187 @@
+\chapter qmake Concepts
+
+\section1 Introducing qmake
+
+\e qmake is an easy-to-use tool from Trolltech that creates makefiles
+for development projects across different platforms.  \e qmake
+simplifies the generation of makefiles so that only a few lines of
+information are needed to create a makefile.  \e qmake can be used for
+any software project whether it is written in Qt or not, although it
+also contains additional features to support Qt development.
+
+\e qmake generates a makefile based on the information in a project
+file.  Project files are created by the developer. Project files are
+usually simple, but can be quite sophisticated if required.
+\e qmake can also generate projects for Microsoft Visual studio
+without having to change the project file.  
+
+\section1 qmake's Concepts
+
+\section2 The QMAKESPEC environment variable
+
+Before \e qmake can be used to build makefiles, the QMAKESPEC
+environment variable must be set to the platform-compiler combination
+that is being used on the system.  The QMAKESPEC environment variable
+tells qmake where to look to find platform and compiler specific
+information.  This ensures that the right libraries are used, and that
+the generated makefile uses the correct syntax.  A list of the
+currently supported platform-compiler combinations can be found in
+qt/mkspecs.  Just set your environment variable to one of the
+directories listed.
+
+For example, if you are using Microsoft Visual Studio on Windows, then
+you would set the QMAKESPEC environment variable to \e win32-msvc.
+If you are using gcc on Solaris then you would set your QMAKESPEC
+environment variable to \e solaris-g++.
+
+Inside each of the directories in qt/mkspecs, there is a \e qmake.conf
+file which contains the platform and compiler specific information.
+These settings are applied to any project that is built using \e
+qmake and should not be modified unless you're an expert. For example,
+if all your applications had to link against a particular library, you
+might add this information to the relevant \e qmake.conf file.
+
+\section2 Project (.pro) files
+
+A project file is used to tell \e qmake the details it needs to know
+about creating a makefile for the application.  For instance, a list
+of source files and header files that should be put into the project
+file; any application specific configuration, such as an extra library
+that should be linked against, or an extra include path.
+
+\section3 '#' comments
+
+You can add comments to project files. Comments begin with the '#'
+symbol and run to the end of the line.
+
+\section2 Templates
+
+The template variable tells \e qmake what sort of makefile should be
+generated for the application. The following choices are available:
+
+\list
+\i app - Creates a makefile that builds an application.  This is the
+default, so if a template is not specified, this is used.
+\i lib - Creates a makefile that builds a library.
+\i vcapp - Creates a Visual Studio Project file which builds an application.
+\i vclib - Creates a Visual Studio Project file which builds a library.
+\i subdirs - This is a special template which creates a makefile which
+will go into the specified directories and create a makefile for the
+project file and call make on it.
+\endlist
+
+\section3 The 'app' template
+
+The 'app' template tells \e qmake to generate a makefile that will build
+an application.  When using this template the following \e qmake
+system variables are recognized.  You should use these in your .pro
+file to specify information about your application.
+
+\list
+\i HEADERS - A list of all the header files for the application.
+\i SOURCES - A list of all the source files for the application.
+\i FORMS - A list of all the .ui files (created using \e{Qt Designer})
+for the application.
+\i LEXSOURCES - A list of all the lex source files for the application.
+\i YACCSOURCES - A list of all the yacc source files for the application.
+\i TARGET - Name of the executable for the application. This defaults
+to the name of the project file. (The extension, if any, is added
+automatically).
+\i DESTDIR - The directory in which the target executable is placed.
+\i DEFINES - A list of any additional pre-processor defines needed for the application.
+\i INCLUDEPATH - A list of any additional include paths needed for the application.
+\i DEPENDPATH - The dependency search path for the application.
+\i VPATH - The search path to find supplied files. 
+\i DEF_FILE - Windows only: A .def file to be linked against for the application.
+\i RC_FILE - Windows only: A resource file for the application.
+\i RES_FILE - Windows only: A resource file to be linked against for the application.
+\endlist
+
+You only need to use the system variables that you have values for,
+for instance, if you don't have any extra INCLUDEPATHs then you don't
+need to specify any, \e qmake will add in the default ones needed.
+For instance, an example project file might look like this:
+
+\code
+TEMPLATE = app
+DESTDIR  = c:\helloapp
+HEADERS += hello.h
+SOURCES += hello.cpp 
+SOURCES += main.cpp
+DEFINES += QT_DLL
+CONFIG  += qt warn_on release
+\endcode
+
+For items that are single valued, e.g. the template or the destination
+directory, we use "="; but for multi-valued items we use "+=" to \e
+add to the existing items of that type. Using "=" replaces the item's
+value with the new value, for example if we wrote \c{DEFINES=QT_DLL},
+all other definitions would be deleted.
+
+\section3 The 'lib' template
+
+The 'lib' template tells \e qmake to generate a makefile that will
+build a library.  When using this template, in addition to the system variables
+mentioned above for the 'app' template the \e VERSION variable is
+supported.  You should use these in your .pro file to specify
+information about the library.
+
+\list
+\i VERSION - The version number of the target library, for example, 2.3.1.
+\endlist
+
+\section3 The 'subdirs' template
+
+The 'subdirs' template tells qmake to generate a makefile that will go
+into the specified subdirectories and generate a makefile for the
+project file in the directory and call make on it.
+
+The only system variable that is recognised for this template is the
+\e SUBDIRS variable.  This variable contains a list of all the
+subdirectories that contain project files to be processed.  It is
+essential that the project file in the sub directory has the same name
+as the subdirectory, so that \e qmake can find it.  For
+example, if the subdirectory is called 'myapp' then the project file
+in that directory should be called \e myapp.pro in that directory.
+
+\section2 The CONFIG variable
+
+The config variable specifies the options that the compiler should use
+and the libraries that should be linked against.  Anything can be
+added to the config variable, but the options covered below are
+recognised by qmake internally.
+
+The following options control what compiler flags are used:
+
+\list
+\i release - The application is to be built in release mode.  This is ignored if 'debug' is specified.
+\i debug - The application is to be built in debug mode.
+\i warn_on - The compiler should output as many warnings as possible.  This is ignored if 'warn_off' is specified.
+\i warn_off - The compiler should output as few warnings as possible.
+\endlist
+
+The following options define the type of library/application to be built:
+
+\list
+\i qt - The application is a Qt application and should link against the Qt library.
+\i thread - The application is a multi-threaded application.
+\i x11 - The application is an X11 application or library.
+\i windows - 'app' template only: the application is a Windows window application.
+\i console - 'app' template only: the application is a Windows console application.
+\i dll - 'lib' template only: The library is a shared library (dll).
+\i staticlib - 'lib' template only: The library is a static library.
+\i plugin - 'lib' template only: The library is a plugin; this enables the dll option.
+\endlist
+
+For example, if your application uses the Qt library and you want to
+build it as a debuggable multi-threaded application, your project file
+will have the following line:
+
+\code
+    CONFIG += qt thread debug
+\endcode
+
+Note, that you must use "+=", not "=", or \e qmake will not be able to
+use the settings used to build Qt as a guide as what type of Qt
+library was built.
+
diff --git a/qmake/book/qmake-install.leaf b/qmake/book/qmake-install.leaf
new file mode 100644
index 0000000..5a661d9
--- /dev/null
+++ b/qmake/book/qmake-install.leaf
@@ -0,0 +1,52 @@
+\chapter Installing qmake
+
+\section1 Installing qmake
+
+\e qmake is built by default when Qt is built.  
+
+This section explains how to build \e qmake manually. Skip ahead to
+\l{The 10 minute guide to using qmake}, if you already have \e qmake.
+
+\section2 Installing qmake manually
+
+Before building Qt manually the following environment variables must
+be set:
+
+\list
+\i QMAKESPEC \BR This must be set to the platform and compiler
+combination that you are using on your system.  \BR For example, if
+you are using Windows and Microsoft Visual Studio, you would set this
+environment variable to \e win32-msvc.  If you are using Solaris and
+g++, you would set this environment variable to \e solaris-g++.
+
+The following is a list of environment variables available to choose
+from when setting QMAKESPEC:
+
+aix-64       hpux-cc    irix-032      netbsd-g++  solaris-cc   unixware7-g++
+aix-g++      hpux-g++   linux-cxx     openbsd-g++ solaris-g++  win32-borland    
+aix-xlc      hpux-n64   linux-g++     openunix-cc sunos-g++    win32-g++ 
+bsdi-g++     hpux-o64   linux-icc     qnx-g++     tru64-cxx    win32-msvc 
+dgux-g++     hurd-g++   linux-kcc     reliant-64  tru64-g++    win32-watc
+freebsd-g++  irix-64    macx-pbuilder reliant-cds ultrix-g++   win32-visa    
+hpux-acc     irix-g++   macx-g++      sco-g++     unixware-g        	
+hpux-acc     irix-n32   solaris-64    unixware7-cc 
+
+The environment variable should be set to qws/envvar where envvar is
+one of the following:
+
+linux-arm-g++      linux-generic-g++  linux-mips-g++     linux-x86-g++
+linux-freebsd-g++  linux-ipaq-g++     linux-solaris-g++  qnx-rtp-g++
+
+\i QTDIR \BR This must be set to where Qt is (or will be) installed.
+For example, \e {c:\\qt} and \e {\\local\\qt} 
+\endlist
+
+Once the environment variables are set go into the qmake directory, \e
+$QTDIR/qmake, e.g. \e{C:\\qt\\qmake}. Now run \e make or \e nmake
+depending on your compiler.
+
+When the make has completed, \e qmake is ready for use.
+
+
+
+
diff --git a/qmake/book/qmake-manual.book b/qmake/book/qmake-manual.book
new file mode 100644
index 0000000..68eb0e6
--- /dev/null
+++ b/qmake/book/qmake-manual.book
@@ -0,0 +1,12 @@
+\title qmake User Guide
+
+\granularity chapter
+
+\input qmake-preface.leaf
+\input qmake-install.leaf
+\input qmake-quick.leaf
+\input qmake-tutorial.leaf
+\input qmake-concepts.leaf
+\input qmake-advanced.leaf
+\input qmake-pch.leaf
+\input qmake-commandreference.leaf
diff --git a/qmake/book/qmake-pch.leaf b/qmake/book/qmake-pch.leaf
new file mode 100644
index 0000000..60ea1f4
--- /dev/null
+++ b/qmake/book/qmake-pch.leaf
@@ -0,0 +1,136 @@
+\chapter Using Precompiled Headers
+
+\target About
+\section1 About Precompiled Headers
+\index About Precompiled Headers
+\index Using Precompiled Headers
+\index Precompiled Headers
+\index PCH
+
+Precompiled headers are a performance feature supported by some
+compilers to compile a stable body of code, and store the compiled
+state of the code in a binary file. During subsequent compilations,
+the compiler will load the stored state, and continue compiling the
+specified file. Each subsequent compilation is faster because the
+stable code does not need to be recompiled.
+
+\e qmake supports the use of precompiled headers (PCH) on some
+platforms and build environments, including:
+\list
+\i Windows
+    \list
+    \i nmake
+    \i Dsp projects (VC 6.0)
+    \i Vcproj projects (VC 7.0 \& 7.1)
+    \endlist
+\i Mac OS X
+    \list
+    \i Makefile
+    \i Xcode
+    \i GCC 3.3 and up
+    \endlist
+\i Unix
+    \list
+    \i GCC 3.4 and up
+    \endlist
+\endlist
+
+
+\target ADD_PCH
+\section1 Adding PCH to your project
+
+
+\target PCH_CONTENTS
+\section2 Contents of the precompiled header file
+
+The precompiled header must contain code which is \e stable
+and \e static throughout your project. A typical PCH might look
+like this:
+\section3 stable.h
+
+\code
+	/* Add C includes here */
+	
+	#if defined __cplusplus
+	/* Add C++ includes here */
+	#include <stdlib>
+	#include <iostream>
+	#include <vector>
+	#include <qapplication.h> // Qt includes
+	#include <qpushbutton.h>
+	#include <qlabel.h>
+	#include "thirdparty/include/libmain.h"
+	#include "my_stable_class.h"
+	...
+	#endif
+\endcode
+
+Note that a precompiled header file needs to separate C includes from
+CPP includes, since the precompiled header file for C files may not
+contain C++ code.
+
+
+\target PROJECT_OPTIONS
+\section2 Project options
+
+To make your project use PCH, the only thing you need to change in
+your project settings (.pro), is to include the PRECOMPILED_HEADER option:
+\code
+	PRECOMPILED_HEADER = stable.h
+\endcode
+\e qmake will handle the rest, to ensure the creation and use of the
+precompiled header file. You do not need to include the precompiled
+header file in HEADERS, as qmake will do this if the configuration
+supports PCH.
+
+All platforms that support precompiled headers have the configuration
+option \Bold precompile_header set. Using this option, you may trigger
+conditional blocks in your .pro file, to add settings when using PCH.
+For example:
+\code
+	precompile_header:!isEmpty(PRECOMPILED_HEADER) {
+	    DEFINES += USING_PCH
+	}
+
+\endcode
+
+\target EXAMPLE_PROJECT
+\section1 Example project
+
+You can find the following source code in the
+\e{qt/qmake/examples/precompile} directory:
+
+\Bold mydialog.ui
+\quotefile precompile/mydialog.ui
+\skipto <!
+\printuntil </UI>
+
+\Bold stable.h
+\quotefile precompile/stable.h
+\skipto /*
+\printuntil #endif
+
+\Bold myobject.h
+\quotefile precompile/myobject.h
+\skipto #include
+\printuntil }
+
+\Bold myobject.cpp
+\quotefile precompile/myobject.cpp
+\skipto #include
+\printuntil }
+
+\Bold util.cpp
+\quotefile precompile/util.cpp
+\skipto void
+\printuntil }
+
+\Bold main.cpp
+\quotefile precompile/main.cpp
+\skipto #include
+\printuntil }
+
+\Bold precompile.pro
+\quotefile precompile/precompile.pro
+\skipto #
+\printuntil .ui
diff --git a/qmake/book/qmake-preface.leaf b/qmake/book/qmake-preface.leaf
new file mode 100644
index 0000000..50880f5
--- /dev/null
+++ b/qmake/book/qmake-preface.leaf
@@ -0,0 +1,18 @@
+\chapter Introduction to qmake
+
+\section1 Introduction to qmake
+
+\e qmake is a tool created by Trolltech to write makefiles for
+different compilers and platforms.
+
+Writing makefiles by hand can be difficult and error prone, especially
+if several makefiles are required for different compiler and platform
+combinations. With \e qmake, developers create a simple single
+'project' file and run \e qmake to generate the appropriate
+makefiles. \e qmake takes care of all the compiler and platform
+dependencies, freeing developers to focus on their code. Trolltech
+uses \e qmake as the primary build tool for the Qt library, and for
+the tools supplied with Qt.
+
+\e qmake also takes care of Qt's special requirements, automatically
+including build rules for \link moc.html moc\endlink and \e uic.
diff --git a/qmake/book/qmake-quick.leaf b/qmake/book/qmake-quick.leaf
new file mode 100644
index 0000000..135e9fa
--- /dev/null
+++ b/qmake/book/qmake-quick.leaf
@@ -0,0 +1,114 @@
+\chapter The 10 minute guide to using qmake
+
+\section1 Creating a project file
+
+\e qmake uses information stored in project (.pro) files to determine
+what should go in the makefiles it generates.
+
+A basic project file contains information about the application, for
+example, which files are needed to compile the application, and which
+configuration settings to use.
+
+Here's a simple example project file:
+\code
+    SOURCES = hello.cpp
+    HEADERS = hello.h
+    CONFIG += qt warn_on release
+\endcode
+
+We'll provide a brief line-by-line explanation, deferring the detail
+until later on in the manual.
+
+\code
+    SOURCES = hello.cpp
+\endcode
+
+This line specifies the source files that implement the application. In this
+case there is just one file, \e hello.cpp. Most applications require
+multiple files; this situation is dealt with by listing all the files
+on the same line space separated, like this:
+\code
+    SOURCES = hello.cpp main.cpp
+\endcode
+
+Alternatively, each file can be listed on a separate line, by escaping
+the newlines, like this:
+\code
+    SOURCES = hello.cpp \
+		main.cpp
+\endcode
+
+A more verbose approach is to list each file separately, like this:
+\code
+    SOURCES += hello.cpp
+    SOURCES += main.cpp
+\endcode
+This approach uses "+=" rather than "=" which is safer, because it
+always adds a new file to the existing list rather than replacing the
+list.
+
+The HEADERS line is used to specify the header files created for use
+by the application, e.g. 
+\code 
+    HEADERS += hello.h
+\endcode
+
+Any of the approaches used to list source files may be used for header
+files.
+
+The CONFIG line is used to give \e qmake information about the
+application's configuration.
+\code 
+    CONFIG += qt warn_on release
+\endcode
+
+The "+=" is used here, because we add our configuration options to any
+that are already present. This is safer than using "=" which replaces
+all options with just those specified.
+
+The \e qt part of the CONFIG line tells \e qmake that the application
+is built using Qt.  This means that \e qmake will link against the Qt
+libraries when linking and add in the neccesary include paths for
+compiling.
+
+The \e warn_on part of the CONFIG line tells \e qmake that it should
+set the compiler flags so that warnings are output.
+
+The \e release part of the CONFIG line tells \e qmake that the
+application must be built as a release application. During
+development, programmers may prefer to replace \e release with \e
+debug, which is discussed later.
+
+\omit
+The last line in the project file is the TARGET line:
+\code
+    TARGET = hello
+\endcode
+The target line simply specifies what the name of the target should be
+for the application.  You shouldn't put an extension here because \e
+qmake will do this for you.
+\endomit
+
+Project files are plain text (i.e. use an editor like notepad, vim
+or xemacs) and must be saved with a '.pro' extension. The name of the
+application's executable will be the same as the project file's name,
+but with an extension appropriate to the platform. For example, a
+project file called 'hello.pro' will produce 'hello.exe' on Windows
+and 'hello' on Unix.
+
+\section1 Generating a makefile 
+
+When you have created your project file it is very easy to generate a
+makefile, all you need to do is go to where you have created your
+project file and type:
+
+Makefiles are generated from the '.pro' files like this:
+\code
+    qmake -o Makefile hello.pro 
+\endcode
+
+For Visual Studio users, \e qmake can also generate '.dsp' files, for
+example:
+\code
+    qmake -t vcapp -o hello.dsp hello.pro
+\endcode
diff --git a/qmake/book/qmake-tutorial.leaf b/qmake/book/qmake-tutorial.leaf
new file mode 100644
index 0000000..b300f05
--- /dev/null
+++ b/qmake/book/qmake-tutorial.leaf
@@ -0,0 +1,239 @@
+\chapter qmake Tutorial
+
+\section1 Introduction to the qmake tutorial
+
+This tutorial teaches you how to use \e qmake.  We recommend that
+you read the \e qmake user guide after completing this tutorial.
+
+\section1 Starting off simple
+
+Let's assume that you have just finished a basic implementation of
+your application, and you have created the following files:
+
+\list
+\i hello.cpp
+\i hello.h
+\i main.cpp
+\endlist
+
+You will find these files in \e {qt/qmake/examples/tutorial}.  The
+only other thing you know about the setup of the application is that
+it's written in Qt.  First, using your favorite plain text editor,
+create a file called \e hello.pro in \e {qt/qmake/tutorial}.  The
+first thing you need to do is add the lines that tell \e qmake about
+the source and header files that are part of your development project.  
+
+We'll add the source files to the project file first.  To do this you
+need to use the SOURCES variable.  Just start a new line with \e
+{SOURCES +=} and put hello.cpp after it.  You should have something
+like:
+
+\code
+    SOURCES += hello.cpp
+\endcode
+
+We repeat this for each source file in the project, until we end up
+with:
+
+\code
+    SOURCES += hello.cpp
+    SOURCES += main.cpp
+\endcode
+
+If you prefer to use a Make-like syntax, with all the files listed in
+one go you can use the newline escaping like this:
+
+\code
+    SOURCES = hello.cpp \
+	      main.cpp
+\endcode
+
+Now that the source files are listed in the project file, the header
+files must be added. These are added in exactly the same way as source
+files, except that the variable name is HEADERS:
+
+Once you have done this, your project file should look something like
+this:
+\code
+    HEADERS += hello.h
+    SOURCES += hello.cpp 
+    SOURCES += main.cpp 
+\endcode
+
+The target name is set automatically; it is the same as the project
+file, but with the suffix appropriate to the platform. For example, if
+the project file is called 'hello.pro', the target will be 'hello.exe'
+on Windows and 'hello' on Unix. If you want to use a different name
+you can set it in the project file:
+\code
+    TARGET = helloworld
+\endcode
+
+The final step is to set the \e CONFIG variable. Since this is a Qt
+application, we need to put 'qt' on the CONFIG line so that \e qmake
+will add the relevant libraries to be linked against and ensure that
+build lines for \e moc and \e uic are included in the makefile.
+
+The finished project file should look like this:
+\code
+    CONFIG += qt
+    HEADERS += hello.h
+    SOURCES += hello.cpp
+    SOURCES += main.cpp 
+\endcode
+
+You can now use \e qmake to generate a makefile for your application.
+On the command line, in your application directory, type:
+
+\code
+    qmake -o Makefile hello.pro
+\endcode
+
+Then type \e make or \e nmake depending on the compiler you use.  
+
+\section1 Making an application debuggable
+
+The release version of an application doesn't contain any debugging
+symbols or other debuggin information. During development it is useful
+to produce a debugging version of the application that has the
+relevant information. This is easily achieved by adding 'debug' to the
+CONFIG variable in the project file.
+
+For example:
+\code
+    CONFIG += qt debug
+    HEADERS += hello.h
+    SOURCES += hello.cpp
+    SOURCES += main.cpp 
+\endcode
+
+Use \e qmake as before to generate a makefile and you will be able to
+debug your application.
+
+\section1 Adding platform specific source files
+
+After a few hours of coding, you might have made a start on the
+platform specific part of your application, and decided to keep the
+platform dependent code separate.  So you now have two new files to
+include into your project file - \e hellowin.cpp and \e
+hellounix.cpp.  We can't just add these to the \e SOURCES
+variable since this will put both files in the makefile.  So what we
+need to do here is to use a scope which will be processed depending on
+which platform \e qmake is run on.
+
+A simple scope which will add in the platform dependent file for
+Windows looks like this:
+
+\code
+    win32 {
+	SOURCES += hellowin.cpp
+    }
+\endcode
+
+So if \e qmake is run on Windows, it will add \e hellowin.cpp to the
+list of source files.  If \e qmake is run on any other platform, it
+will simply ignore it.  Now all that is left to be done is to create a
+scope for the unix dependent file.
+
+When you have done that, your project file should now look
+something like this:
+
+\code
+    CONFIG += qt debug
+    HEADERS += hello.h
+    SOURCES += hello.cpp
+    SOURCES += main.cpp 
+    win32 {
+	SOURCES += hellowin.cpp
+    }
+    unix {
+	SOURCES += hellounix.cpp
+    }
+\endcode
+
+Use \e qmake as before to generate a makefile.  
+
+\section1 Stopping qmake if a file doesn't exist
+
+You may not want to create a makefile if a certain file doesn't exist.
+We can check if a file exists by using the exists() function.  We can
+stop \e qmake from processing by using the error() function.  This
+works in the same way as scopes.  Simply replace the scope condition
+with the function. A check for a main.cpp file looks like this:
+
+\code
+    !exists( main.cpp ) {
+	error( "No main.cpp file found" )
+    }
+\endcode
+
+The "!" is used to negate the test, i.e. \c{exists( main.cpp )} is
+true if the file exists and \c{!exists( main.cpp )} is true if the
+file doesn't exist.
+
+\code
+    CONFIG += qt debug
+    HEADERS += hello.h
+    SOURCES += hello.cpp
+    SOURCES += main.cpp 
+    win32 {
+	SOURCES += hellowin.cpp
+    }
+    unix {
+	SOURCES += hellounix.cpp
+    }
+    !exists( main.cpp ) {
+	error( "No main.cpp file found" )
+    }
+\endcode
+
+Use \e qmake as before to generate a makefile.  If you rename \e
+main.cpp temporarily, you will see the message and \e qmake will stop
+processing.
+
+\section1 Checking for more than one condition
+
+Suppose you use Windows and you want to be able to see the qDebug()
+statements when you run your application on the command line.  Unless
+you build your application with the console setting, you won't see the
+output.  We can easily put \e console on the CONFIG line so that on
+Windows the makefile will have this setting.  But let's say that we
+only want to add the CONFIG line if we are running on Windows \e and when
+\e debug is already on the CONFIG line.  This requires using two
+nested scopes; just create one scope, then create the other inside
+that one.  Put the settings to be processed inside the last scope,
+like this:
+
+\code
+    win32 {
+	debug {
+	    CONFIG += console
+	}
+    }
+\endcode
+
+Nested scopes can be joined together using colons, so the final
+project file looks like this:
+
+\code
+    CONFIG += qt debug
+    HEADERS += hello.h
+    SOURCES += hello.cpp
+    SOURCES += main.cpp 
+    win32 {
+	SOURCES += hellowin.cpp
+    }
+    unix {
+	SOURCES += hellounix.cpp
+    }
+    !exists( main.cpp ) {
+	error( "No main.cpp file found" )
+    }
+    win32:debug {
+	CONFIG += console
+    }
+\endcode
+
+
+That's it!  You have now completed the tutorial for \e qmake, and are
+ready to write project files for your development projects.
diff --git a/qmake/examples/precompile/main.cpp b/qmake/examples/precompile/main.cpp
new file mode 100644
index 0000000..74f3c91
--- /dev/null
+++ b/qmake/examples/precompile/main.cpp
@@ -0,0 +1,18 @@
+#include <qapplication.h>
+#include <qpushbutton.h>
+#include <qlabel.h>
+#include "myobject.h"
+#include "mydialog.h"
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    
+    MyObject obj;
+    MyDialog dia;
+    app.setMainWidget( &dia );
+    dia.connect( dia.aButton, SIGNAL(clicked()), SLOT(close()) );
+    dia.show();
+
+    return app.exec();
+}
diff --git a/qmake/examples/precompile/mydialog.ui b/qmake/examples/precompile/mydialog.ui
new file mode 100644
index 0000000..fe90a29
--- /dev/null
+++ b/qmake/examples/precompile/mydialog.ui
@@ -0,0 +1,32 @@
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+<class>MyDialog</class>
+<widget class="QDialog">
+    <property name="name">
+        <cstring>MyDialog</cstring>
+    </property>
+    <property name="caption">
+        <string>Mach 2!</string>
+    </property>
+    <vbox>
+        <widget class="QLabel">
+            <property name="name">
+                <cstring>aLabel</cstring>
+            </property>
+            <property name="text">
+                <string>Join the life in the fastlane; - PCH enable your project today! -</string>
+            </property>
+        </widget>
+        <widget class="QPushButton">
+            <property name="name">
+                <cstring>aButton</cstring>
+            </property>
+            <property name="text">
+                <string>&amp;Quit</string>
+            </property>
+            <property name="accel">
+                <string>Alt+Q</string>
+            </property>
+        </widget>
+    </vbox>
+</widget>
+</UI>
diff --git a/qmake/examples/precompile/myobject.cpp b/qmake/examples/precompile/myobject.cpp
new file mode 100644
index 0000000..4f1d1d8
--- /dev/null
+++ b/qmake/examples/precompile/myobject.cpp
@@ -0,0 +1,14 @@
+#include <iostream>
+#include <qobject.h>
+#include "myobject.h"
+
+MyObject::MyObject()
+    : QObject()
+{
+    std::cout << "MyObject::MyObject()\n";
+}
+
+MyObject::~MyObject()
+{
+    qDebug("MyObject::~MyObject()");
+}
diff --git a/qmake/examples/precompile/myobject.h b/qmake/examples/precompile/myobject.h
new file mode 100644
index 0000000..4b403b4
--- /dev/null
+++ b/qmake/examples/precompile/myobject.h
@@ -0,0 +1,8 @@
+#include <qobject.h>
+
+class MyObject : public QObject
+{
+public:
+    MyObject();
+    ~MyObject();
+};
diff --git a/qmake/examples/precompile/precompile.pro b/qmake/examples/precompile/precompile.pro
new file mode 100644
index 0000000..1f02d1a
--- /dev/null
+++ b/qmake/examples/precompile/precompile.pro
@@ -0,0 +1,19 @@
+#############################################
+#
+# Example for using Precompiled Headers
+#
+#############################################
+TEMPLATE  = app
+LANGUAGE  = C++
+CONFIG	 += console precompile_header
+
+# Use Precompiled headers (PCH)
+PRECOMPILED_HEADER  = stable.h
+
+HEADERS	 += stable.h \
+            myobject.h
+SOURCES	 += main.cpp \
+            myobject.cpp \
+            util.cpp
+FORMS     = mydialog.ui
+
diff --git a/qmake/examples/precompile/stable.h b/qmake/examples/precompile/stable.h
new file mode 100644
index 0000000..76ec45b
--- /dev/null
+++ b/qmake/examples/precompile/stable.h
@@ -0,0 +1,10 @@
+/* Add C includes here */
+
+#if defined __cplusplus
+/* Add C++ includes here */
+
+# include <iostream>
+# include <qapplication.h>
+# include <qpushbutton.h>
+# include <qlabel.h>
+#endif
diff --git a/qmake/examples/precompile/util.cpp b/qmake/examples/precompile/util.cpp
new file mode 100644
index 0000000..6a15452
--- /dev/null
+++ b/qmake/examples/precompile/util.cpp
@@ -0,0 +1,7 @@
+void util_function_does_nothing()
+{
+    // Nothing here...
+    int x = 0;
+    ++x;
+}
+
diff --git a/qmake/examples/tutorial/hello.cpp b/qmake/examples/tutorial/hello.cpp
new file mode 100644
index 0000000..cec428b
--- /dev/null
+++ b/qmake/examples/tutorial/hello.cpp
@@ -0,0 +1,7 @@
+#include "hello.h"
+
+MyPushButton::MyPushButton( const QString& text ) 
+    : QPushButton( text, 0, "mypushbutton" )
+{
+    qDebug( "My PushButton has been constructed" );
+}
diff --git a/qmake/examples/tutorial/hello.h b/qmake/examples/tutorial/hello.h
new file mode 100644
index 0000000..4a292af
--- /dev/null
+++ b/qmake/examples/tutorial/hello.h
@@ -0,0 +1,7 @@
+#include <qpushbutton.h>
+
+class MyPushButton : public QPushButton
+{
+public:
+    MyPushButton( const QString& );
+};
diff --git a/qmake/examples/tutorial/hellounix.cpp b/qmake/examples/tutorial/hellounix.cpp
new file mode 100644
index 0000000..0abf10e
--- /dev/null
+++ b/qmake/examples/tutorial/hellounix.cpp
@@ -0,0 +1,2 @@
+// This file does nothing, but check your makefile to see if there is a
+// reference to hello_win.cpp...there shouldn't be if qmake is used on X11.
diff --git a/qmake/examples/tutorial/hellowin.cpp b/qmake/examples/tutorial/hellowin.cpp
new file mode 100644
index 0000000..54c8d5d
--- /dev/null
+++ b/qmake/examples/tutorial/hellowin.cpp
@@ -0,0 +1,2 @@
+// This file does nothing, but check your makefile to see if there is a
+// reference to hello_x11.cpp...there shouldn't be if qmake is used on Windows.
diff --git a/qmake/examples/tutorial/main.cpp b/qmake/examples/tutorial/main.cpp
new file mode 100644
index 0000000..064c206
--- /dev/null
+++ b/qmake/examples/tutorial/main.cpp
@@ -0,0 +1,14 @@
+#include <qapplication.h>
+#include "hello.h"
+
+int main( int argc, char **argv )
+{
+    QApplication a( argc, argv );
+
+    MyPushButton* hello = new MyPushButton( "Hello world!" );
+    hello->resize( 100, 30 );
+
+    a.setMainWidget( hello );
+    hello->show();
+    return a.exec();
+}
diff --git a/qmake/generators/mac/metrowerks_xml.cpp b/qmake/generators/mac/metrowerks_xml.cpp
new file mode 100644
index 0000000..5e1ca0f
--- /dev/null
+++ b/qmake/generators/mac/metrowerks_xml.cpp
@@ -0,0 +1,822 @@
+/****************************************************************************
+**
+** Implementation of MetrowerksMakefileGenerator class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#include "metrowerks_xml.h"
+#include "option.h"
+#include <qdir.h>
+#include <qdict.h>
+#include <qregexp.h>
+#include <stdlib.h>
+#include <time.h>
+#if !defined(QWS) && defined(Q_OS_MAC)
+#include <Carbon/Carbon.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#endif
+
+MetrowerksMakefileGenerator::MetrowerksMakefileGenerator(QMakeProject *p) : MakefileGenerator(p), init_flag(FALSE)
+{
+
+}
+
+bool
+MetrowerksMakefileGenerator::writeMakefile(QTextStream &t)
+{
+    if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
+	/* for now just dump, I need to generated an empty xml or something.. */
+	fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n",
+		var("QMAKE_FAILED_REQUIREMENTS").latin1());
+	return TRUE;
+    }
+
+    if(project->first("TEMPLATE") == "app" ||
+       project->first("TEMPLATE") == "lib") {
+	return writeMakeParts(t);
+    }
+    else if(project->first("TEMPLATE") == "subdirs") {
+	writeHeader(t);
+	qDebug("Not supported!");
+	return TRUE;
+    }
+    return FALSE;
+}
+
+bool
+MetrowerksMakefileGenerator::writeMakeParts(QTextStream &t)
+{
+    //..grrr.. libs!
+    QStringList extra_objs;
+    bool do_libs = TRUE;
+    if(project->first("TEMPLATE") == "app") 
+	extra_objs += project->variables()["QMAKE_CRT_OBJECTS"];
+    else if(project->first("TEMPLATE") == "lib" && project->isActiveConfig("staticlib"))
+	do_libs = FALSE;
+    if(do_libs)
+	extra_objs += project->variables()["QMAKE_LIBS"];
+    for(QStringList::Iterator val_it = extra_objs.begin(); 
+	val_it != extra_objs.end(); ++val_it) {
+	if((*val_it).startsWith("-L")) {
+	    QString dir((*val_it).right((*val_it).length() - 2));
+	    fixEnvVariables(dir);
+	    if(project->variables()["DEPENDPATH"].findIndex(dir) == -1 &&
+	       project->variables()["INCLUDEPATH"].findIndex(dir) == -1)
+		project->variables()["INCLUDEPATH"].append(dir);
+	} else if((*val_it).startsWith("-l")) {
+	    QString lib("lib" + (*val_it).right((*val_it).length() - 2)  + "." + 
+			project->first("QMAKE_EXTENSION_SHLIB"));
+	    if(project->variables()["LIBRARIES"].findIndex(lib) == -1)
+		project->variables()["LIBRARIES"].append(lib);
+	} else 
+	    if((*val_it) == "-framework") {
+	    ++val_it;
+	    if(val_it == extra_objs.end())
+		break;
+	    QString frmwrk = (*val_it) + ".framework";
+	    if(project->variables()["FRAMEWORKS"].findIndex(frmwrk) == -1)
+		project->variables()["FRAMEWORKS"].append(frmwrk);
+	} else if((*val_it).left(1) != "-") {
+	    QString lib=(*val_it);
+	    int s = lib.findRev('/');
+	    if(s != -1) {
+		QString dir = lib.left(s);
+		lib = lib.right(lib.length() - s - 1);
+		fixEnvVariables(dir);
+		if(project->variables()["DEPENDPATH"].findIndex(dir) == -1 &&
+		   project->variables()["INCLUDEPATH"].findIndex(dir) == -1)
+		    project->variables()["INCLUDEPATH"].append(dir);
+	    }
+	    project->variables()["LIBRARIES"].append(lib);
+	}
+    }
+    //let metrowerks find the files & set the files to the type I expect
+    QDict<void> seen(293);
+    QString paths[] = { QString("SRCMOC"), QString("FORMS"), QString("UICDECLS"),
+			QString("UICIMPLS"), QString("SOURCES"),QString("HEADERS"),
+			QString::null };
+    for(int y = 0; paths[y] != QString::null; y++) {
+	QStringList &l = project->variables()[paths[y]];
+	for(QStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) {
+	    //establish file types
+	    seen.insert((*val_it), (void *)1);
+	    createFork((*val_it)); //the file itself
+	    QStringList &d = findDependencies((*val_it)); //depends
+	    for(QStringList::Iterator dep_it = d.begin(); dep_it != d.end(); ++dep_it) {
+		if(!seen.find((*dep_it))) {
+		    seen.insert((*dep_it), (void *)1);
+		    createFork((*dep_it));
+		}
+	    }
+	    //now chop it
+	    int s = (*val_it).findRev('/');
+	    if(s != -1) {
+		QString dir = (*val_it).left(s);
+		(*val_it) = (*val_it).right((*val_it).length() - s - 1);
+		QString tmpd=dir, tmpv;
+		if(fixifyToMacPath(tmpd, tmpv)) {
+		    bool add_in = TRUE;
+		    QString deps[] = { QString("DEPENDPATH"), 
+				     QString("INCLUDEPATH"), QString::null }, 
+				     dd, dv;
+		    for(int yy = 0; deps[yy] != QString::null; yy++) {
+			QStringList &l2 = project->variables()[deps[yy]];
+			for(QStringList::Iterator val_it2 = l2.begin(); 
+			    val_it2 != l2.end(); ++val_it2) {
+			    QString dd= (*val_it2), dv;
+			    if(!fixifyToMacPath(dd, dv)) 
+				continue;
+			    if(dd == tmpd && tmpv == dv) {
+				add_in = FALSE;
+				break;
+			    }
+			}
+		    }
+		    if(add_in) 
+			project->variables()["INCLUDEPATH"].append(dir);
+		}
+	    }
+	}
+    }
+    //need a defines file
+    if(!project->isEmpty("DEFINES")) {
+	QString pre_pref = project->first("TARGET_STEM");
+	if(project->first("TEMPLATE") == "lib")
+	    pre_pref += project->isActiveConfig("staticlib") ? "_static" : "_shared";
+	project->variables()["CODEWARRIOR_PREFIX_HEADER"].append(pre_pref + "_prefix.h");
+    }
+
+    QString xmlfile = findTemplate(project->first("QMAKE_XML_TEMPLATE"));
+    QFile file(xmlfile);
+    if(!file.open(IO_ReadOnly )) {
+	fprintf(stderr, "Cannot open XML file: %s\n", 
+		project->first("QMAKE_XML_TEMPLATE").latin1());
+	return FALSE;
+    }
+    QTextStream xml(&file);
+    createFork(Option::output.name());
+
+    int rep;
+    QString line;
+    while ( !xml.eof() ) {
+	line = xml.readLine();
+	while((rep = line.find(QRegExp("\\$\\$[!a-zA-Z0-9_-]*"))) != -1) {
+	    QString torep = line.mid(rep, line.find(QRegExp("[^\\$!a-zA-Z0-9_-]"), rep) - rep);
+	    QString variable = torep.right(torep.length()-2);
+
+	    t << line.left(rep); //output the left side
+	    line = line.right(line.length() - (rep + torep.length())); //now past the variable
+	    if(variable == "CODEWARRIOR_HEADERS" || variable == "CODEWARRIOR_SOURCES" || 
+	       variable == "CODEWARRIOR_LIBRARIES" || variable == "CODEWARRIOR_QPREPROCESS" ||
+		variable == "CODEWARRIOR_QPREPROCESSOUT") {
+		QString outcmd=variable.right(variable.length() - variable.findRev('_') - 1);
+		QStringList args;
+		if(outcmd == "QPREPROCESS")
+		    args << "UICS" << "MOCS";
+		else if(outcmd == "QPREPROCESSOUT")
+		    args << "SRCMOC" << "UICIMPLS" << "UICDELCS";
+		else
+		    args << outcmd;
+		for(QStringList::Iterator arit = args.begin(); arit != args.end(); ++arit) {
+		    QString arg = (*arit);
+		    QString kind = "Text";
+		    if(arg == "LIBRARIES")
+			kind = "Library";
+		    if(!project->variables()[arg].isEmpty()) {
+			QStringList &list = project->variables()[arg];
+			for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+			    QString flag;
+			    if(project->isActiveConfig("debug")) {
+				bool debug = TRUE;
+				if(outcmd == "QPREPROCESS") {
+				    debug = FALSE;
+				} else {
+				    for(QStringList::Iterator hit = Option::h_ext.begin(); hit != Option::h_ext.end(); ++hit) {
+					if((*it).endsWith((*hit))) { 
+					    debug = FALSE;
+					    break;
+					}
+				    }
+				}
+				if(debug)
+				    flag = "Debug";
+			    }
+			    t << "\t\t\t\t<FILE>" << endl
+			      << "\t\t\t\t\t<PATHTYPE>Name</PATHTYPE>" << endl
+			      << "\t\t\t\t\t<PATH>" << (*it) << "</PATH>" << endl
+			      << "\t\t\t\t\t<PATHFORMAT>MacOS</PATHFORMAT>" << endl
+			      << "\t\t\t\t\t<FILEKIND>" << kind << "</FILEKIND>" << endl
+			      << "\t\t\t\t\t<FILEFLAGS>" << flag << "</FILEFLAGS>" << endl
+			      << "\t\t\t\t</FILE>" << endl;
+			}
+		    }
+		}
+	    } else if(variable == "CODEWARRIOR_SOURCES_LINKORDER" || 
+		      variable == "CODEWARRIOR_HEADERS_LINKORDER" ||
+		      variable == "CODEWARRIOR_LIBRARIES_LINKORDER" || 
+		      variable == "CODEWARRIOR_QPREPROCESS_LINKORDER" ||
+		      variable == "CODEWARRIOR_QPREPROCESSOUT_LINKORDER") {
+		QString outcmd=variable.mid(variable.find('_')+1, 
+					    variable.findRev('_')-(variable.find('_')+1));
+		QStringList args;
+		if(outcmd == "QPREPROCESS")
+		    args << "UICS" << "MOCS";
+		else if(outcmd == "QPREPROCESSOUT")
+		    args << "SRCMOC" << "UICIMPLS" << "UICDELCS";
+		else
+		    args << outcmd;
+		for(QStringList::Iterator arit = args.begin(); arit != args.end(); ++arit) {
+		    QString arg = (*arit);
+		    if(!project->variables()[arg].isEmpty()) {
+			QStringList &list = project->variables()[arg];
+			for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+			    t << "\t\t\t\t<FILEREF>" << endl
+			      << "\t\t\t\t\t<PATHTYPE>Name</PATHTYPE>" << endl
+			      << "\t\t\t\t\t<PATH>" << (*it) << "</PATH>" << endl
+			      << "\t\t\t\t\t<PATHFORMAT>MacOS</PATHFORMAT>" << endl
+			      << "\t\t\t\t</FILEREF>" << endl;
+			}
+		    }
+		}
+	    } else if(variable == "CODEWARRIOR_HEADERS_GROUP" || 
+		      variable == "CODEWARRIOR_SOURCES_GROUP" ||
+		      variable == "CODEWARRIOR_LIBRARIES_GROUP" || 
+		      variable == "CODEWARRIOR_QPREPROCESS_GROUP" ||
+		      variable == "CODEWARRIOR_QPREPROCESSOUT_GROUP") {
+		QString outcmd = variable.mid(variable.find('_')+1, 
+					      variable.findRev('_')-(variable.find('_')+1));
+		QStringList args;
+		if(outcmd == "QPREPROCESS")
+		    args << "UICS" << "MOCS";
+		else if(outcmd == "QPREPROCESSOUT")
+		    args << "SRCMOC" << "UICIMPLS" << "UICDELCS";
+		else
+		    args << outcmd;
+		for(QStringList::Iterator arit = args.begin(); arit != args.end(); ++arit) {
+		    QString arg = (*arit);
+		    if(!project->variables()[arg].isEmpty()) {
+			QStringList &list = project->variables()[arg];
+			for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+			    t << "\t\t\t\t<FILEREF>" << endl
+			      << "\t\t\t\t\t<TARGETNAME>" << var("TARGET_STEM") << "</TARGETNAME>" 
+			      << endl
+			      << "\t\t\t\t\t<PATHTYPE>Name</PATHTYPE>" << endl
+			      << "\t\t\t\t\t<PATH>" << (*it) << "</PATH>" << endl
+			      << "\t\t\t\t\t<PATHFORMAT>MacOS</PATHFORMAT>" << endl
+			      << "\t\t\t\t</FILEREF>" << endl;
+			}
+		    }
+		}
+	    } else if(variable == "CODEWARRIOR_FRAMEWORKS") {
+		if(!project->isEmpty("FRAMEWORKS")) {
+		    QStringList &list = project->variables()["FRAMEWORKS"];
+		    for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+			t << "\t\t\t\t<FRAMEWORK>" << endl
+			  << "\t\t\t\t\t<FILEREF>" << endl
+			  << "\t\t\t\t\t\t<PATHTYPE>Name</PATHTYPE>" << endl
+			  << "\t\t\t\t\t\t<PATH>" << (*it) << "</PATH>" << endl
+			  << "\t\t\t\t\t\t<PATHFORMAT>MacOS</PATHFORMAT>" << endl
+			  << "\t\t\t\t\t</FILEREF>" << endl
+			  << "\t\t\t\t</FRAMEWORK>" << endl;
+		    }
+		}
+	    } else if(variable == "CODEWARRIOR_DEPENDPATH" || variable == "CODEWARRIOR_INCLUDEPATH" ||
+		variable == "CODEWARRIOR_FRAMEWORKPATH") {	
+		QString arg=variable.right(variable.length()-variable.find('_')-1);
+		QStringList list;
+		if(arg == "INCLUDEPATH") {
+		    list = project->variables()[arg];
+		    list << Option::mkfile::qmakespec;
+		    list << QDir::current().currentDirPath();
+
+		    QStringList &l = project->variables()["QMAKE_LIBS_PATH"];
+		    for(QStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) {
+			QString p = (*val_it), v;
+			if(!fixifyToMacPath(p, v))
+			    continue;
+
+			t << "\t\t\t\t\t<SETTING>" << endl
+			  << "\t\t\t\t\t\t<SETTING><NAME>SearchPath</NAME>" << endl
+			  << "\t\t\t\t\t\t\t<SETTING><NAME>Path</NAME>"
+			  << "<VALUE>" << p << "</VALUE></SETTING>" << endl
+			  << "\t\t\t\t\t\t\t<SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>" << endl
+			  << "\t\t\t\t\t\t\t<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>" << endl
+			  << "\t\t\t\t\t\t</SETTING>" << endl
+			  << "\t\t\t\t\t\t<SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>" << endl
+			  << "\t\t\t\t\t\t<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>" << endl
+			  << "\t\t\t\t\t</SETTING>" << endl;
+		    }
+		} else if(variable == "DEPENDPATH") {
+		    QStringList &l = project->variables()[arg];
+		    for(QStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it)
+		    {
+			//apparently tmake used colon separation...
+			QStringList damn = QStringList::split(':', (*val_it));
+			if(!damn.isEmpty())
+			    list += damn;
+			else
+			    list.append((*val_it));
+		    }
+		} else {
+		    list = project->variables()[arg];
+		}
+		for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+		    QString p = (*it), v, recursive = "false", framework = "false";
+		    if(p.startsWith("recursive--")) {
+			p = p.right(p.length() - 11);
+			recursive = "true";
+		    } 
+		    if(!fixifyToMacPath(p, v))
+			continue;
+		    if(arg == "FRAMEWORKPATH")
+			framework = "true";
+
+		    t << "\t\t\t\t\t<SETTING>" << endl
+		      << "\t\t\t\t\t\t<SETTING><NAME>SearchPath</NAME>" << endl
+		      << "\t\t\t\t\t\t\t<SETTING><NAME>Path</NAME>"
+		      << "<VALUE>" << p << "</VALUE></SETTING>" << endl
+		      << "\t\t\t\t\t\t\t<SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>" << endl
+		      << "\t\t\t\t\t\t\t<SETTING><NAME>PathRoot</NAME><VALUE>" << v << "</VALUE></SETTING>" << endl
+		      << "\t\t\t\t\t\t</SETTING>" << endl
+		      << "\t\t\t\t\t\t<SETTING><NAME>Recursive</NAME><VALUE>" << recursive << "</VALUE></SETTING>" << endl
+		    << "\t\t\t\t\t\t<SETTING><NAME>FrameworkPath</NAME><VALUE>" << framework << "</VALUE></SETTING>" << endl
+		    << "\t\t\t\t\t\t<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>" << endl
+		      << "\t\t\t\t\t</SETTING>" << endl;
+		}
+	    } else if(variable == "CODEWARRIOR_WARNING" || variable == "!CODEWARRIOR_WARNING") {
+		bool b = ((!project->isActiveConfig("warn_off")) && 
+			  project->isActiveConfig("warn_on"));
+		if(variable.startsWith("!"))
+		    b = !b;
+		t << (int)b;
+	    } else if(variable == "CODEWARRIOR_TEMPLATE") {
+		if(project->first("TEMPLATE") == "app" ) {
+		    t << "Executable";
+		} else if(project->first("TEMPLATE") == "lib") {
+		    if(project->isActiveConfig("staticlib"))
+		       t << "Library";
+		    else
+			t << "SharedLibrary";
+		}
+	    } else if(variable == "CODEWARRIOR_OUTPUT_DIR") {
+		QString outdir = "{Project}/", volume;
+		if(!project->isEmpty("DESTDIR"))
+		    outdir = project->first("DESTDIR");
+		if(project->first("TEMPLATE") == "app" && !project->isActiveConfig("console"))
+		    outdir += var("TARGET") + ".app/Contents/MacOS/";
+		if(fixifyToMacPath(outdir, volume, FALSE)) {
+                    t << "\t\t\t<SETTING><NAME>Path</NAME><VALUE>" << outdir << "</VALUE></SETTING>" 
+		      << endl
+		      << "\t\t\t<SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>" << endl
+		      << "\t\t\t<SETTING><NAME>PathRoot</NAME><VALUE>" << volume << "</VALUE></SETTING>" 
+		      << endl;
+		}
+	    } else if(variable == "CODEWARRIOR_PACKAGER_PANEL") {
+		if(project->first("TEMPLATE") == "app" && !project->isActiveConfig("console")) {
+		    QString outdir = "{Project}/", volume;
+		    if(!project->isEmpty("DESTDIR"))
+			outdir = project->first("DESTDIR");
+		    outdir += var("TARGET") + ".app";
+		    if(fixifyToMacPath(outdir, volume, FALSE)) {
+			t << "\t\t<SETTING><NAME>MWMacOSPackager_UsePackager</NAME>"
+			  << "<VALUE>1</VALUE></SETTING>" << "\n"
+			  << "\t\t<SETTING><NAME>MWMacOSPackager_FolderToPackage</NAME>" << "\n"
+			  << "\t\t\t<SETTING><NAME>Path</NAME><VALUE>" << outdir 
+			  << "</VALUE></SETTING>" << "\n"
+			  << "\t\t\t<SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>" 
+			  << "\n"
+			  << "\t\t\t<SETTING><NAME>PathRoot</NAME><VALUE>" << volume 
+			  << "</VALUE></SETTING>" << "\n"
+			  << "\t\t</SETTING>" << "\n"
+			  << "\t\t<SETTING><NAME>MWMacOSPackager_CreateClassicAlias</NAME>"
+			  << "<VALUE>0</VALUE></SETTING>" << "\n"
+			  << "\t\t<SETTING><NAME>MWMacOSPackager_ClassicAliasMethod</NAME>"
+			  << "<VALUE>UseTargetOutput</VALUE></SETTING>" << "\n"
+			  << "\t\t<SETTING><NAME>MWMacOSPackager_ClassicAliasPath</NAME>"
+			  << "<VALUE></VALUE></SETTING>" << "\n"
+			  << "\t\t<SETTING><NAME>MWMacOSPackager_CreatePkgInfo</NAME>"
+			  << "<VALUE>1</VALUE></SETTING>" << "\n"
+			  << "\t\t<SETTING><NAME>MWMacOSPackager_PkgCreatorType</NAME>" 
+			  << "<VALUE>CUTE</VALUE></SETTING>" << "\n"
+			  << "\t\t<SETTING><NAME>MWMacOSPackager_PkgFileType</NAME>" 
+			  << "<VALUE>APPL</VALUE></SETTING>" << endl;
+		    }
+		}
+	    } else if(variable == "CODEWARRIOR_FILETYPE") {
+		if(project->first("TEMPLATE") == "lib")
+			t << "MYDL";
+		else
+			t << "MEXE";
+	    } else if(variable == "CODEWARRIOR_QTDIR") {
+		t << getenv("QTDIR");
+	    } else if(variable == "CODEWARRIOR_CACHEMODDATES") {
+		t << "true";
+	    } else {
+		t << var(variable);
+	    }
+	}
+	t << line << endl;
+    }
+    t << endl;
+    file.close();
+
+    if(mocAware()) { 
+	QString mocs = project->first("MOCS");
+	QFile mocfile(mocs);
+	if(!mocfile.open(IO_WriteOnly)) {
+	    fprintf(stderr, "Cannot open MOCS file: %s\n", mocs.latin1());
+	} else {
+	    createFork(mocs);
+	    QTextStream mocs(&mocfile);
+	    QStringList &list = project->variables()["SRCMOC"];
+	    for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+		QString src = findMocSource((*it));
+		if(src.findRev('/') != -1)
+		    src = src.right(src.length() - src.findRev('/') - 1);
+		mocs << src << endl;
+	    }
+	    mocfile.close();
+	}
+    }
+
+    if(!project->isEmpty("FORMS")) { 
+	QString uics = project->first("UICS");
+	QFile uicfile(uics);
+	if(!uicfile.open(IO_WriteOnly)) {
+	    fprintf(stderr, "Cannot open UICS file: %s\n", uics.latin1());
+	} else {
+	    createFork(uics);
+	    QTextStream uics(&uicfile);
+	    QStringList &list = project->variables()["FORMS"];
+	    for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+		QString ui = (*it);
+		if(ui.findRev('/') != -1)
+		    ui = ui.right(ui.length() - ui.findRev('/') - 1);
+		uics << ui << endl;
+	    }
+	    uicfile.close();
+	}
+    }
+
+    if(!project->isEmpty("CODEWARRIOR_PREFIX_HEADER")) {
+	QFile prefixfile(project->first("CODEWARRIOR_PREFIX_HEADER"));
+	if(!prefixfile.open(IO_WriteOnly)) {
+	    fprintf(stderr, "Cannot open PREFIX file: %s\n", prefixfile.name().latin1());
+	} else {
+	    createFork(project->first("CODEWARRIOR_PREFIX_HEADER"));
+	    QTextStream prefix(&prefixfile);
+	    QStringList &list = project->variables()["DEFINES"];
+	    for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+		if((*it).find('=') != -1) {
+		    int x = (*it).find('=');
+		    prefix << "#define " << (*it).left(x) << " " << (*it).right((*it).length() - x - 1) << endl;
+		} else {
+		    prefix << "#define " << (*it) << endl;
+		}
+	    }
+	    prefixfile.close();
+	}
+    }
+    return TRUE;
+}
+
+
+
+void
+MetrowerksMakefileGenerator::init()
+{
+    if(init_flag)
+	return;
+    init_flag = TRUE;
+
+    if ( project->isEmpty("QMAKE_XML_TEMPLATE") ) 
+	project->variables()["QMAKE_XML_TEMPLATE"].append("mwerkstmpl.xml");
+
+    QStringList &configs = project->variables()["CONFIG"];
+    if(project->isActiveConfig("qt")) {
+	if(configs.findIndex("moc")) configs.append("moc");
+	if ( !( (project->first("TARGET") == "qt") || (project->first("TARGET") == "qte") ||
+		(project->first("TARGET") == "qt-mt") ) ) 
+	    project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"];
+	if(configs.findIndex("moc")) 
+	    configs.append("moc");
+	if ( !project->isActiveConfig("debug") ) 
+	    project->variables()["DEFINES"].append("QT_NO_DEBUG");
+    }
+
+    //version handling
+    if(project->variables()["VERSION"].isEmpty())
+	project->variables()["VERSION"].append("1.0." + 
+					       (project->isEmpty("VER_PAT") ? QString("0") : 
+						project->first("VER_PAT")) );
+    QStringList ver = QStringList::split('.', project->first("VERSION"));
+    ver << "0" << "0"; //make sure there are three
+    project->variables()["VER_MAJ"].append(ver[0]);
+    project->variables()["VER_MIN"].append(ver[1]);
+    project->variables()["VER_PAT"].append(ver[2]);
+
+    if( !project->isEmpty("LIBS") )
+	project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
+    if( project->variables()["QMAKE_EXTENSION_SHLIB"].isEmpty() )
+	project->variables()["QMAKE_EXTENSION_SHLIB"].append( "dylib" );
+
+    if ( project->isActiveConfig("moc") ) {
+	QString mocfile = project->first("TARGET");
+	if(project->first("TEMPLATE") == "lib")
+	    mocfile += project->isActiveConfig("staticlib") ? "_static" : "_shared";
+	project->variables()["MOCS"].append(mocfile + ".mocs");
+	setMocAware(TRUE);
+    }
+    if(!project->isEmpty("FORMS")) {
+	QString uicfile = project->first("TARGET");
+	if(project->first("TEMPLATE") == "lib")
+	    uicfile += project->isActiveConfig("staticlib") ? "_static" : "_shared";
+	project->variables()["UICS"].append(uicfile + ".uics");
+    }
+    if(project->isEmpty("DESTDIR"))
+	project->variables()["DESTDIR"].append(QDir::currentDirPath());
+    MakefileGenerator::init();
+
+    if ( project->isActiveConfig("opengl") ) {
+	project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_OPENGL"];
+	if ( (project->first("TARGET") == "qt") || (project->first("TARGET") == "qte") ||
+	     (project->first("TARGET") == "qt-mt") )
+	    project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL_QT"];
+	else 
+	    project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"];
+    }
+
+    if(project->isActiveConfig("qt"))
+	project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QT"];
+    if(project->isEmpty("FRAMEWORKPATH"))
+	project->variables()["FRAMEWORKPATH"].append("/System/Library/Frameworks/");
+
+    //set the target up
+    project->variables()["TARGET_STEM"] = project->variables()["TARGET"];
+    if(project->first("TEMPLATE") == "lib") {
+	if(project->isActiveConfig("staticlib"))
+	    project->variables()["TARGET"].first() =  "lib" + project->first("TARGET") + ".lib";
+	else
+	    project->variables()["TARGET"].first() =  "lib" + project->first("TARGET") + "." +
+						      project->first("QMAKE_EXTENSION_SHLIB");
+
+	project->variables()["CODEWARRIOR_VERSION"].append(project->first("VER_MAJ") +
+							  project->first("VER_MIN") +
+							  project->first("VER_PAT"));
+    } else {
+	project->variables()["CODEWARRIOR_VERSION"].append("0");
+	if(project->isEmpty("QMAKE_ENTRYPOINT"))
+	   project->variables()["QMAKE_ENTRYPOINT"].append("start");
+	project->variables()["CODEWARRIOR_ENTRYPOINT"].append(
+	    project->first("QMAKE_ENTRYPOINT"));
+    }
+}
+
+
+QString
+MetrowerksMakefileGenerator::findTemplate(const QString &file)
+{
+    QString ret;
+    if(!QFile::exists(ret = file) && 
+       !QFile::exists((ret = Option::mkfile::qmakespec + QDir::separator() + file)) && 
+       !QFile::exists((ret = QString(getenv("QTDIR")) + "/mkspecs/mac-mwerks/" + file)) &&
+       !QFile::exists((ret = (QString(getenv("HOME")) + "/.tmake/" + file))))
+	return "";
+    return ret;
+}
+
+bool
+MetrowerksMakefileGenerator::createFork(const QString &f)
+{
+#if !defined(QWS) && defined(Q_OS_MACX)
+    FSRef fref;
+    FSSpec fileSpec;
+    if(QFile::exists(f)) {
+	mode_t perms = 0;
+	{
+	    struct stat s;
+	    stat(f.latin1(), &s);
+	    if(!(s.st_mode & S_IWUSR)) {
+		perms = s.st_mode;
+		chmod(f.latin1(), perms | S_IWUSR);
+	    }
+	}
+	FILE *o = fopen(f.latin1(), "a");
+	if(!o)
+	    return FALSE;
+	if(FSPathMakeRef((const UInt8 *)f.latin1(), &fref, NULL) == noErr) {
+	    if(FSGetCatalogInfo(&fref, kFSCatInfoNone, NULL, NULL, &fileSpec, NULL) == noErr) 
+		FSpCreateResFile(&fileSpec, 'CUTE', 'TEXT', smSystemScript);
+	    else 
+		qDebug("bogus %d", __LINE__);
+	} else 
+	    qDebug("bogus %d", __LINE__);
+	fclose(o);
+	if(perms)
+	    chmod(f.latin1(), perms);
+    }
+#else
+    Q_UNUSED(f)
+#endif
+    return TRUE;
+}
+
+bool
+MetrowerksMakefileGenerator::fixifyToMacPath(QString &p, QString &v, bool )
+{
+    v = "Absolute";
+    if(p.find(':') != -1) //guess its macish already
+	return TRUE;
+
+    static QString st_volume;
+    if(st_volume.isEmpty()) {
+	st_volume = var("QMAKE_VOLUMENAME");
+#if !defined(QWS) && defined(Q_OS_MACX)
+	if(st_volume.isEmpty()) {
+	    uchar foo[512];
+	    HVolumeParam pb;
+	    memset(&pb, '\0', sizeof(pb));
+	    pb.ioVRefNum = 0;
+	    pb.ioNamePtr = foo;
+	    if(PBHGetVInfoSync((HParmBlkPtr)&pb) == noErr) {
+		int len = foo[0];
+		memcpy(foo,foo+1, len);
+		foo[len] = '\0';
+		st_volume = (char *)foo;
+	    }
+	}
+#endif
+    }
+    QString volume = st_volume;
+
+    fixEnvVariables(p);
+    if(p.startsWith("\"") && p.endsWith("\""))
+	p = p.mid(1, p.length() - 2);
+    if(p.isEmpty()) 
+	return FALSE;
+    if(!p.endsWith("/"))
+	p += "/";
+    if(QDir::isRelativePath(p)) {
+	if(p.startsWith("{")) {
+	    int eoc = p.find('}');
+	    if(eoc == -1)
+		return FALSE;
+	    volume = p.mid(1, eoc - 1);
+	    p = p.right(p.length() - eoc - 1);
+	} else {
+	    QFileInfo fi(p);
+	    if(fi.convertToAbs()) //strange
+		return FALSE;
+	    p = fi.filePath();
+	} 
+    } 
+    p = QDir::cleanDirPath(p);
+    if(!volume.isEmpty()) 
+	v = volume;
+    p.replace("/", ":");
+    if(p.right(1) != ":")
+	p += ':';
+    return TRUE;
+}
+
+void
+MetrowerksMakefileGenerator::processPrlFiles()
+{
+    QPtrList<MakefileDependDir> libdirs;
+    libdirs.setAutoDelete(TRUE);
+    const QString lflags[] = { "QMAKE_LIBS", QString::null };
+    for(int i = 0; !lflags[i].isNull(); i++) {
+	for(bool ret = FALSE; TRUE; ret = FALSE) {
+	    QStringList l_out;
+	    QStringList &l = project->variables()[lflags[i]];
+	    for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+		QString opt = (*it);
+		if(opt.startsWith("-")) {
+		    if(opt.startsWith("-L")) {
+			QString r = opt.right(opt.length() - 2), l = r;
+			fixEnvVariables(l);
+			libdirs.append(new MakefileDependDir(r.replace( "\"", ""),
+							     l.replace( "\"", "")));
+		    } else if(opt.left(2) == "-l") {
+			QString lib = opt.right(opt.length() - 2), prl;
+			for(MakefileDependDir *mdd = libdirs.first(); mdd; mdd = libdirs.next() ) {
+			    prl = mdd->local_dir + Option::dir_sep + "lib" + lib;
+			    if(processPrlFile(prl)) {
+				if(prl.startsWith(mdd->local_dir))
+				    prl.replace(0, mdd->local_dir.length(), mdd->real_dir);
+				QRegExp reg("^.*lib(" + lib + "[^.]*)\\." + 
+					    project->first("QMAKE_EXTENSION_SHLIB") + "$");
+				if(reg.exactMatch(prl))
+				    prl = "-l" + reg.cap(1);
+				opt = prl;
+				ret = TRUE;
+				break;
+			    }
+			}
+		    } else if(opt == "-framework") {
+			l_out.append(opt);
+			++it;
+			opt = (*it);
+			QString prl = "/System/Library/Frameworks/" + opt +
+				      ".framework/" + opt;
+			if(processPrlFile(prl))
+			    ret = TRUE;
+		    }
+		    if(!opt.isEmpty())
+			l_out.append(opt);
+		} else {
+		    if(processPrlFile(opt))
+			ret = TRUE;
+		    if(!opt.isEmpty())
+			l_out.append(opt);
+		}
+	    }
+	    if(ret)
+		l = l_out;
+	    else
+		break;
+	}
+    }
+}
+
+void
+MetrowerksMakefileGenerator::processPrlVariable(const QString &var, const QStringList &l)
+{
+    if(var == "QMAKE_PRL_LIBS") {
+	QStringList &out = project->variables()["QMAKE_LIBS"];
+	for(QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
+	    bool append = TRUE;
+	    if((*it).startsWith("-")) {
+		if((*it).startsWith("-l") || (*it).startsWith("-L")) {
+		    append = out.findIndex((*it)) == -1;
+		} else if((*it).startsWith("-framework")) {
+		    ++it;
+		    for(QStringList::ConstIterator outit = out.begin(); 
+			outit != out.end(); ++it) {
+			if((*outit) == "-framework") {
+			    ++outit;
+			    if((*outit) == (*it)) {
+				append = FALSE;
+				break;
+			    }
+			}
+		    }
+		}
+	    } else if(QFile::exists((*it))) {
+		append = out.findIndex((*it));
+	    }
+	    if(append)
+		out.append((*it));
+	}
+    } else {
+	MakefileGenerator::processPrlVariable(var, l);
+    }
+}
+
+
+bool
+MetrowerksMakefileGenerator::openOutput(QFile &file) const
+{
+    QString outdir;
+    if(!file.name().isEmpty()) {
+	QFileInfo fi(file);
+	if(fi.isDir())
+	    outdir = file.name() + QDir::separator();
+    }
+    if(!outdir.isEmpty() || file.name().isEmpty()) 
+	file.setName(outdir + project->first("TARGET") + ".xml");
+    return MakefileGenerator::openOutput(file);
+}
diff --git a/qmake/generators/mac/metrowerks_xml.h b/qmake/generators/mac/metrowerks_xml.h
new file mode 100644
index 0000000..9baaf03
--- /dev/null
+++ b/qmake/generators/mac/metrowerks_xml.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Definition of MetrowerksMakefileGenerator class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#ifndef __METROWERKS_XML_H__
+#define __METROWERKS_XML_H__
+
+#include "makefile.h"
+
+class MetrowerksMakefileGenerator : public MakefileGenerator
+{
+    bool createFork(const QString &f);
+    bool fixifyToMacPath(QString &c, QString &v, bool exists=TRUE);
+
+    bool init_flag;
+
+    bool writeMakeParts(QTextStream &);
+    bool writeSubDirs(QTextStream &);
+
+    bool writeMakefile(QTextStream &);
+    QString findTemplate(const QString &file);
+    void init();
+public:
+    MetrowerksMakefileGenerator(QMakeProject *p);
+    ~MetrowerksMakefileGenerator();
+
+    bool openOutput(QFile &file) const;
+protected:
+    virtual void processPrlFiles();
+    virtual void processPrlVariable(const QString &var, const QStringList &l);
+    virtual bool doDepends() const { return FALSE; } //never necesary
+};
+
+inline MetrowerksMakefileGenerator::~MetrowerksMakefileGenerator()
+{ }
+
+#endif /* __METROWERKS_XML_H__ */
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
new file mode 100644
index 0000000..10a43d7
--- /dev/null
+++ b/qmake/generators/mac/pbuilder_pbx.cpp
@@ -0,0 +1,1428 @@
+/****************************************************************************
+**
+** Implementation of ProjectBuilderMakefileGenerator class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#include "pbuilder_pbx.h"
+#include "option.h"
+#include "meta.h"
+#include <qdir.h>
+#include <qdict.h>
+#include <qregexp.h>
+#include <stdlib.h>
+#include <time.h>
+#include "qtmd5.h"
+#ifdef Q_OS_UNIX
+#  include <sys/types.h>
+#  include <sys/stat.h>
+#endif
+
+// Note: this is fairly hacky, but it does the job...
+
+ProjectBuilderMakefileGenerator::ProjectBuilderMakefileGenerator(QMakeProject *p) : UnixMakefileGenerator(p)
+{
+
+}
+
+bool
+ProjectBuilderMakefileGenerator::writeMakefile(QTextStream &t)
+{
+    if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
+	/* for now just dump, I need to generated an empty xml or something.. */
+	fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n",
+		var("QMAKE_FAILED_REQUIREMENTS").latin1());
+	return TRUE;
+    }
+
+    project->variables()["MAKEFILE"].clear();
+    project->variables()["MAKEFILE"].append("Makefile");
+    if(project->first("TEMPLATE") == "app" || project->first("TEMPLATE") == "lib")
+	return writeMakeParts(t);
+    else if(project->first("TEMPLATE") == "subdirs")
+	return writeSubdirs(t, FALSE);
+    return FALSE;
+}
+
+bool
+ProjectBuilderMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
+{
+    QString mkwrap = fileFixify(pbx_dir + Option::dir_sep + ".." + Option::dir_sep + project->first("MAKEFILE"),
+				QDir::currentDirPath());
+    QFile mkwrapf(mkwrap);
+    if(mkwrapf.open(IO_WriteOnly | IO_Translate)) {
+	debug_msg(1, "pbuilder: Creating file: %s", mkwrap.latin1());
+	QTextStream mkwrapt(&mkwrapf);
+	UnixMakefileGenerator::writeSubdirs(mkwrapt, direct);
+    }
+
+    //HEADER
+    const int pbVersion = pbuilderVersion();
+    t << "// !$*UTF8*$!" << "\n"
+      << "{" << "\n"
+      << "\t" << "archiveVersion = 1;" << "\n"
+      << "\t" << "classes = {" << "\n" << "\t" << "};" << "\n"
+      << "\t" << "objectVersion = " << pbVersion << ";" << "\n"
+      << "\t" << "objects = {" << endl;
+
+    //SUBDIRS
+    QStringList subdirs = project->variables()["SUBDIRS"];
+    QString oldpwd = QDir::currentDirPath();
+    QMap<QString, QStringList> groups;
+    for(QStringList::Iterator it = subdirs.begin(); it != subdirs.end(); ++it) {
+	QFileInfo fi(Option::fixPathToLocalOS((*it), TRUE));
+	if(fi.exists()) {
+	    if(fi.isDir()) {
+		QString profile = (*it);
+		if(!profile.endsWith(Option::dir_sep))
+		    profile += Option::dir_sep;
+		profile += fi.baseName() + ".pro";
+		subdirs.append(profile);
+	    } else {
+		QMakeProject tmp_proj;
+		QString dir = fi.dirPath(), fn = fi.fileName();
+		if(!dir.isEmpty()) {
+		    if(!QDir::setCurrent(dir))
+			fprintf(stderr, "Cannot find directory: %s\n", dir.latin1());
+		}
+		if(tmp_proj.read(fn, oldpwd)) {
+		    if(Option::debug_level) {
+			QMap<QString, QStringList> &vars = tmp_proj.variables();
+			for(QMap<QString, QStringList>::Iterator it = vars.begin();
+			    it != vars.end(); ++it) {
+			    if(it.key().left(1) != "." && !it.data().isEmpty())
+				debug_msg(1, "%s: %s === %s", fn.latin1(), it.key().latin1(),
+					  it.data().join(" :: ").latin1());
+			}
+		    }
+		    if(tmp_proj.first("TEMPLATE") == "subdirs") {
+			subdirs += fileFixify(tmp_proj.variables()["SUBDIRS"]);
+		    } else if(tmp_proj.first("TEMPLATE") == "app" || tmp_proj.first("TEMPLATE") == "lib") {
+			QString pbxproj = QDir::currentDirPath() + Option::dir_sep + tmp_proj.first("TARGET") + projectSuffix();
+			if(!QFile::exists(pbxproj)) {
+			    warn_msg(WarnLogic, "Ignored (not found) '%s'", pbxproj.latin1());
+			    goto nextfile; // # Dirty!
+			}
+			project->variables()["QMAKE_PBX_SUBDIRS"] += pbxproj;
+			//PROJECTREF
+			{
+			    bool in_root = TRUE;
+			    QString name = QDir::currentDirPath();
+			    QString project_key = keyFor(pbxproj + "_PROJECTREF");
+			    if(project->isActiveConfig("flat")) {
+				QString flat_file = fileFixify(name, oldpwd, Option::output_dir, TRUE);
+				if(flat_file.find(Option::dir_sep) != -1) {
+				    QStringList dirs = QStringList::split(Option::dir_sep, flat_file);
+				    name = dirs.back();
+				}
+			    } else {
+				QString flat_file = fileFixify(name, oldpwd, Option::output_dir, TRUE);
+				if(QDir::isRelativePath(flat_file) && flat_file.find(Option::dir_sep) != -1) {
+				    QString last_grp("QMAKE_PBX_HEIR_GROUP");
+				    QStringList dirs = QStringList::split(Option::dir_sep, flat_file);
+				    name = dirs.back();
+				    for(QStringList::Iterator dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) {
+					QString new_grp(last_grp + Option::dir_sep + (*dir_it)), new_grp_key(keyFor(new_grp));
+					if(dir_it == dirs.begin()) {
+					    if(!groups.contains(new_grp))
+						project->variables()["QMAKE_PBX_GROUPS"].append(new_grp_key);
+					} else {
+					    if(!groups[last_grp].contains(new_grp_key))
+						groups[last_grp] += new_grp_key;
+					}
+					last_grp = new_grp;
+				    }
+				    groups[last_grp] += project_key;
+				    in_root = FALSE;
+				}
+			    }
+			    if(in_root)
+				project->variables()["QMAKE_PBX_GROUPS"] += project_key;
+			    t << "\t\t" << project_key << " = {" << "\n"
+			      << "\t\t\t" << "isa = PBXFileReference;" << "\n"
+			      << "\t\t\t" << "name = " << tmp_proj.first("TARGET") << ";" << "\n"
+			      << "\t\t\t" << "path = " << pbxproj << ";" << "\n"
+			      << "\t\t\t" << "refType = 0;" << "\n"
+			      << "\t\t\t" << "sourceTree = \"<absolute>\";" << "\n"
+			      << "\t\t" << "};" << "\n";
+			    //PRODUCTGROUP
+			    t << "\t\t" << keyFor(pbxproj + "_PRODUCTGROUP") << " = {" << "\n"
+			      << "\t\t\t" << "children = (" << "\n"
+			      << "\t\t\t" << ");" << "\n"
+			      << "\t\t\t" << "isa = PBXGroup;" << "\n"
+			      << "\t\t\t" << "name = Products;" << "\n"
+			      << "\t\t\t" << "refType = 4;" << "\n"
+			      << "\t\t\t" << "sourceTree = \"<group>\";" << "\n"
+			      << "\t\t" << "};" << "\n";
+			}
+		    }
+		}
+nextfile:
+		QDir::setCurrent(oldpwd);
+	    }
+	}
+    }
+    for(QMap<QString, QStringList>::Iterator grp_it = groups.begin(); grp_it != groups.end(); ++grp_it) {
+	t << "\t\t" << keyFor(grp_it.key()) << " = {" << "\n"
+	  << "\t\t\t" << "isa = PBXGroup;" << "\n"
+	  << "\t\t\t" << "children = (" << "\n"
+	  << valGlue(grp_it.data(), "\t\t\t\t", ",\n\t\t\t\t", "\n")
+	  << "\t\t\t" << ");" << "\n"
+	  << "\t\t\t" << "name = \"" << grp_it.key().section(Option::dir_sep, -1) << "\";" << "\n"
+	  << "\t\t\t" << "refType = 4;" << "\n"
+	  << "\t\t" << "};" << "\n";
+    }
+
+    //DUMP EVERYTHING THAT TIES THE ABOVE TOGETHER
+    //BUILDSTYLE
+    QString active_buildstyle;
+#if 0
+    for(int as_release = 0; as_release < 2; as_release++)
+#else
+	bool as_release = !project->isActiveConfig("debug");
+#endif
+    {
+        QMap<QString, QString> settings;
+        settings.insert("COPY_PHASE_STRIP", (as_release ? "YES" : "NO"));
+        if(as_release)
+            settings.insert("GCC_GENERATE_DEBUGGING_SYMBOLS", "NO");
+        QString name;
+        if(pbVersion >= 42)
+            name = (as_release ? "Release" : "Debug");
+        else
+            name = (as_release ? "Deployment" : "Development");
+
+        if(pbVersion >= 42) {
+            QString key = keyFor("QMAKE_SUBDIR_PBX_BUILDCONFIG_" + name);
+            project->variables()["QMAKE_SUBDIR_PBX_BUILDCONFIGS"].append(key);
+            t << "\t\t" << key << " = {" << "\n"
+              << "\t\t\t" << "isa = XCBuildConfiguration;" << "\n"
+              << "\t\t\t" << "buildSettings = {" << "\n";
+            for(QMap<QString, QString>::Iterator set_it = settings.begin(); set_it != settings.end(); ++set_it)
+                t << "\t\t\t\t" << set_it.key() << " = \"" << set_it.data() << "\";\n";
+            t << "\t\t\t" << "};" << "\n"
+              << "\t\t\t" << "name = " << name << ";" << "\n"
+              << "\t\t" << "};" << "\n";
+        }
+
+        QString key = keyFor("QMAKE_SUBDIR_PBX_BUILDSTYLE_" + name);
+        if(project->isActiveConfig("debug") != (bool)as_release) {
+            project->variables()["QMAKE_SUBDIR_PBX_BUILDSTYLES"].append(key);
+            active_buildstyle = name;
+        } else if(pbVersion >= 42) {
+            project->variables()["QMAKE_SUBDIR_PBX_BUILDSTYLES"].append(key);
+        }
+        t << "\t\t" << key << " = {" << "\n"
+          << "\t\t\t" << "buildRules = (" << "\n"
+          << "\t\t\t" << ");" << "\n"
+          << "\t\t\t" << "buildSettings = {" << "\n";
+        for(QMap<QString, QString>::Iterator set_it = settings.begin(); set_it != settings.end(); ++set_it)
+            t << "\t\t\t\t" << set_it.key() << " = \"" << set_it.data() << "\";\n";
+        t << "\t\t\t" << "};" << "\n"
+          << "\t\t\t" << "isa = PBXBuildStyle;" << "\n"
+          << "\t\t\t" << "name = " << name << ";" << "\n"
+          << "\t\t" << "};" << "\n";
+    }
+    if(pbVersion >= 42) {
+        t << "\t\t" << keyFor("QMAKE_SUBDIR_PBX_BUILDCONFIG_LIST") << " = {" << "\n"
+          << "\t\t\t" << "isa = XCConfigurationList;" << "\n"
+          << "\t\t\t" << "buildConfigurations = (" << "\n"
+          << varGlue("QMAKE_SUBDIR_PBX_BUILDCONFIGS", "\t\t\t\t", ",\n\t\t\t\t", "\n")
+          << "\t\t\t" << ");" << "\n"
+          << "\t\t\t" << "defaultConfigurationIsVisible = 0;" << "\n"
+          << "\t\t\t" << "defaultConfigurationIsName = " << active_buildstyle << ";" << "\n"
+          << "\t\t" << "};" << "\n";
+    }
+
+#ifdef GENERATE_AGGREGRATE_SUBDIR
+    //target
+    t << "\t\t" << keyFor("QMAKE_SUBDIR_PBX_AGGREGATE_TARGET") << " = {" << "\n"
+      << "\t\t\t" << "buidPhases = (" << "\n"
+      << "\t\t\t" << ");" << "\n"
+      << "\t\t\t" << "buildSettings = {" << "\n"
+      << "\t\t\t\t" << "PRODUCT_NAME = " << project->variables()["TARGET"].first() << ";" << "\n"
+      << "\t\t\t" << "};" << "\n"
+      << "\t\t\t" << "dependencies = (" << "\n";
+    {
+        const QStringList &qmake_subdirs = project->variables()["QMAKE_PBX_SUBDIRS"];
+        for(int i = 0; i < qmake_subdirs.count(); i++)
+            t << "\t\t\t\t" << keyFor(qmake_subdirs[i] + "_TARGETREF") << "," << "\n";
+    }
+    t << "\t\t\t" << ");" << "\n"
+      << "\t\t\t" << "isa = PBXAggregateTarget;" << "\n"
+      << "\t\t\t" << "name = " << project->variables()["TARGET"].first() << ";" << "\n"
+      << "\t\t\t" << "productName = " << project->variables()["TARGET"].first() << ";" << "\n"
+      << "\t\t" << "};" << "\n";
+#endif
+
+    //ROOT_GROUP
+    t << "\t\t" << keyFor("QMAKE_PBX_ROOT_GROUP") << " = {" << "\n"
+      << "\t\t\t" << "children = (" << "\n"
+      << varGlue("QMAKE_PBX_GROUPS", "\t\t\t\t", ",\n\t\t\t\t", "\n")
+      << "\t\t\t" << ");" << "\n"
+      << "\t\t\t" << "isa = PBXGroup;" << "\n"
+      << "\t\t\t" << "refType = 4;" << "\n"
+      << "\t\t\t" << "sourceTree = \"<group>\";" << "\n"
+      << "\t\t" << "};" << "\n";
+
+    //ROOT
+    t << "\t\t" << keyFor("QMAKE_PBX_ROOT") << " = {" << "\n"
+      << "\t\t\t" << "buildSettings = {" << "\n"
+      << "\t\t\t" << "};" << "\n"
+      << "\t\t\t" << "buildStyles = (" << "\n"
+      << varGlue("QMAKE_PBX_BUILDSTYLES", "\t\t\t\t", ",\n\t\t\t\t", "\n")
+      << "\t\t\t" << ");" << "\n"
+      << "\t\t\t" << "isa = PBXProject;" << "\n"
+      << "\t\t\t" << "mainGroup = " << keyFor("QMAKE_PBX_ROOT_GROUP") << ";" << "\n"
+      << "\t\t\t" << "projectDirPath = \"\";" << "\n";
+    if(pbVersion >= 42)
+        t << "\t\t\t" << "buildConfigurationList = " << keyFor("QMAKE_SUBDIR_PBX_BUILDCONFIG_LIST") << ";" << "\n";
+    t << "\t\t\t" << "projectReferences = (" << "\n";
+    {
+	QStringList &libdirs = project->variables()["QMAKE_PBX_SUBDIRS"];
+	for(QStringList::Iterator it = libdirs.begin(); it != libdirs.end(); ++it)
+	    t << "\t\t\t\t" << "{" << "\n"
+	      << "\t\t\t\t\t" << "ProductGroup = " << keyFor((*it) + "_PRODUCTGROUP") << ";" << "\n"
+	      << "\t\t\t\t\t" << "ProjectRef = " << keyFor((*it) + "_PROJECTREF") << ";" << "\n"
+	      << "\t\t\t\t" << "}," << "\n";
+    }
+    t << "\t\t\t" << ");" << "\n"
+      << "\t\t\t" << "targets = (" << "\n"
+      << "\t\t\t" << ");" << "\n"
+      << "\t\t" << "};" << "\n";
+
+    //FOOTER
+    t << "\t" << "};" << "\n"
+      << "\t" << "rootObject = " << keyFor("QMAKE_PBX_ROOT") << ";" << "\n"
+      << "}" << endl;
+
+    return TRUE;
+}
+
+bool
+ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
+{
+    int i;
+    QStringList tmp;
+    bool did_preprocess = FALSE;
+
+    //HEADER
+    const int pbVersion = pbuilderVersion();
+    t << "// !$*UTF8*$!" << "\n"
+      << "{" << "\n"
+      << "\t" << "archiveVersion = 1;" << "\n"
+      << "\t" << "classes = {" << "\n" << "\t" << "};" << "\n"
+      << "\t" << "objectVersion = " << pbVersion << ";" << "\n"
+      << "\t" << "objects = {" << endl;
+
+    //MAKE QMAKE equivelant
+    if(!project->isActiveConfig("no_autoqmake") && project->projectFile() != "(stdin)") {
+	QString mkfile = pbx_dir + Option::dir_sep + "qt_makeqmake.mak";
+	QFile mkf(mkfile);
+	if(mkf.open(IO_WriteOnly | IO_Translate)) {
+	    debug_msg(1, "pbuilder: Creating file: %s", mkfile.latin1());
+	    QTextStream mkt(&mkf);
+	    writeHeader(mkt);
+	    mkt << "QMAKE    = "	<<
+		(project->isEmpty("QMAKE_QMAKE") ? QString("$(QTDIR)/bin/qmake") :
+		 var("QMAKE_QMAKE")) << endl;
+	    writeMakeQmake(mkt);
+	    mkf.close();
+	}
+	QString phase_key = keyFor("QMAKE_PBX_MAKEQMAKE_BUILDPHASE");
+	mkfile = fileFixify(mkfile, QDir::currentDirPath());
+	project->variables()["QMAKE_PBX_PRESCRIPT_BUILDPHASES"].append(phase_key);
+	t << "\t\t" << phase_key << " = {" << "\n"
+	  << "\t\t\t" << "buildActionMask = 2147483647;" << "\n"
+	  << "\t\t\t" << "files = (" << "\n"
+	  << "\t\t\t" << ");" << "\n"
+	  << "\t\t\t" << "generatedFileNames = (" << "\n"
+	  << "\t\t\t" << ");" << "\n"
+	  << "\t\t\t" << "isa = PBXShellScriptBuildPhase;" << "\n"
+	  << "\t\t\t" << "name = \"Qt Qmake\";" << "\n"
+	  << "\t\t\t" << "neededFileNames = (" << "\n"
+	  << "\t\t\t" << ");" << "\n"
+	  << "\t\t\t" << "shellPath = /bin/sh;" << "\n"
+	  << "\t\t\t" << "shellScript = \"make -C " << QDir::currentDirPath() <<
+	    " -f " << mkfile << "\";" << "\n"
+	  << "\t\t" << "};" << "\n";
+    }
+
+    //DUMP SOURCES
+    QMap<QString, QStringList> groups;
+    QString srcs[] = { "HEADERS", "SOURCES", "SRCMOC", "UICIMPLS", "QMAKE_IMAGE_COLLECTION",
+		       "FORMS", "QMAKE_INTERNAL_INCLUDED_FILES", QString::null };
+    for(i = 0; !srcs[i].isNull(); i++) {
+	tmp = project->variables()[srcs[i]];
+	if(srcs[i] == "QMAKE_INTERNAL_INCLUDED_FILES") {
+	    QString pfile = project->projectFile();
+	    if(pfile != "(stdin)")
+		tmp.prepend(pfile);
+	}
+	QStringList &src_list = project->variables()["QMAKE_PBX_" + srcs[i]];
+	QStringList &root_group_list = project->variables()["QMAKE_PBX_GROUPS"];
+
+	//hard coded groups..
+	QString src_group;
+	if(srcs[i] == "SOURCES")
+	    src_group = "Sources";
+	else if(srcs[i] == "HEADERS")
+	    src_group = "Headers";
+	else if(srcs[i] == "SRCMOC")
+	    src_group = "Sources [moc]";
+	else if(srcs[i] == "UICIMPLS" || srcs[i] == "FORMS")
+	    src_group = "Sources [uic]";
+	else if(srcs[i] == "QMAKE_IMAGE_COLLECTION")
+	    src_group = "Sources [images]";
+	else if(srcs[i] == "QMAKE_INTERNAL_INCLUDED_FILES")
+	    src_group = "Sources [qmake]";
+
+	for(QStringList::Iterator it = tmp.begin(); it != tmp.end(); ++it) {
+	    QStringList files = (*it);
+	    bool buildable = TRUE;
+	    if(srcs[i] == "FORMS") {
+		QString form_dot_h = (*it) + Option::h_ext.first();
+		if(QFile::exists(form_dot_h))
+		    files += form_dot_h;
+		buildable = FALSE;
+	    } else if(srcs[i] == "HEADERS" || srcs[i] == "QMAKE_INTERNAL_INCLUDED_FILES") {
+		buildable = FALSE;
+	    }
+
+	    files = fileFixify(files);
+	    for(QStringList::Iterator file_it = files.begin(); file_it != files.end(); ++file_it) {
+		QString file = (*file_it);
+		if(file.length() >= 2 && (file[0] == '"' || file[0] == '\'') && file[(int) file.length()-1] == file[0])
+		    file = file.mid(1, file.length()-2);
+		if(file.endsWith(Option::cpp_moc_ext) || file.endsWith(Option::prl_ext))
+		    continue;
+		bool in_root = TRUE;
+		QString src_key = keyFor(file), name = file;
+		if(project->isActiveConfig("flat")) {
+		    QString flat_file = fileFixify(file, QDir::currentDirPath(), Option::output_dir, TRUE);
+		    if(flat_file.find(Option::dir_sep) != -1) {
+			QStringList dirs = QStringList::split(Option::dir_sep, flat_file);
+			name = dirs.back();
+		    }
+		} else {
+		    QString flat_file = fileFixify(file, QDir::currentDirPath(), Option::output_dir, TRUE);
+		    if(QDir::isRelativePath(flat_file) && flat_file.find(Option::dir_sep) != -1) {
+			QString last_grp("QMAKE_PBX_" + src_group + "_HEIR_GROUP");
+			QStringList dirs = QStringList::split(Option::dir_sep, flat_file);
+			name = dirs.back();
+			dirs.pop_back(); //remove the file portion as it will be added via src_key
+			for(QStringList::Iterator dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) {
+			    QString new_grp(last_grp + Option::dir_sep + (*dir_it)), new_grp_key(keyFor(new_grp));
+			    if(dir_it == dirs.begin()) {
+				if(!src_list.contains(new_grp_key))
+				    src_list.append(new_grp_key);
+			    } else {
+				if(!groups[last_grp].contains(new_grp_key))
+				    groups[last_grp] += new_grp_key;
+			    }
+			    last_grp = new_grp;
+			}
+			groups[last_grp] += src_key;
+			in_root = FALSE;
+		    }
+		}
+		if(in_root)
+		    src_list.append(src_key);
+		//source reference
+		t << "\t\t" << src_key << " = {" << "\n"
+		  << "\t\t\t" << "isa = PBXFileReference;" << "\n"
+		  << "\t\t\t" << "name = \"" << name << "\";" << "\n"
+		  << "\t\t\t" << "path = \"" << file << "\";" << "\n"
+		  << "\t\t\t" << "refType = " << reftypeForFile(file) << ";" << "\n";
+                if(pbVersion >= 38) {
+		    QString filetype;
+		    for(QStringList::Iterator cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit) {
+			if(file.endsWith((*cppit))) {
+			    filetype = "sourcecode.cpp.cpp";
+			    break;
+			}
+		    }
+		    if(!filetype.isNull())
+			t << "\t\t\t" << "lastKnownFileType = " << filetype << ";" << "\n";
+		}
+		t << "\t\t" << "};" << "\n";
+		if(buildable) { //build reference
+		    QString obj_key = file + ".o";
+		    obj_key = keyFor(obj_key);
+		    t << "\t\t" << obj_key << " = {" << "\n"
+		      << "\t\t\t" << "fileRef = " << src_key << ";" << "\n"
+		      << "\t\t\t" << "isa = PBXBuildFile;" << "\n"
+		      << "\t\t\t" << "settings = {" << "\n"
+		      << "\t\t\t\t" << "ATTRIBUTES = (" << "\n"
+		      << "\t\t\t\t" << ");" << "\n"
+		      << "\t\t\t" << "};" << "\n"
+		      << "\t\t" << "};" << "\n";
+		    project->variables()["QMAKE_PBX_OBJ"].append(obj_key);
+		}
+	    }
+	}
+	if(!src_list.isEmpty()) {
+	    if(srcs[i] == "SOURCES") {
+		if(project->first("TEMPLATE") == "app" && !project->isEmpty("RC_FILE")) { //Icon
+		    QString icns_file = keyFor("ICNS_FILE");
+		    src_list.append(icns_file);
+		    t << "\t\t" << icns_file << " = {" << "\n"
+		      << "\t\t\t" << "isa = PBXFileReference;" << "\n"
+		      << "\t\t\t" << "path = \"" << project->first("RC_FILE") << "\";" << "\n"
+		      << "\t\t\t" << "refType = " << reftypeForFile(project->first("RC_FILE")) << ";" << "\n"
+		      << "\t\t" << "};" << "\n";
+		    t << "\t\t" << keyFor("ICNS_FILE_REFERENCE") << " = {" << "\n"
+		      << "\t\t\t" << "fileRef = " << icns_file << ";" << "\n"
+		      << "\t\t\t" << "isa = PBXBuildFile;" << "\n"
+		      << "\t\t\t" << "settings = {" << "\n"
+		      << "\t\t\t" << "};" << "\n"
+		      << "\t\t" << "};" << "\n";
+		}
+	    }
+
+	    QString src_group_key = keyFor(src_group);
+	    if(root_group_list.findIndex(src_group_key) == -1)
+		root_group_list += src_group_key;
+
+            QStringList &group = groups[src_group];
+            for(QStringList::Iterator src_it = src_list.begin(); src_it != src_list.end(); ++src_it) {
+                if(group.findIndex((*src_it)) == -1)
+                    group += (*src_it);
+            }
+	}
+    }
+    for(QMap<QString, QStringList>::Iterator grp_it = groups.begin(); grp_it != groups.end(); ++grp_it) {
+	t << "\t\t" << keyFor(grp_it.key()) << " = {" << "\n"
+	  << "\t\t\t" << "isa = PBXGroup;" << "\n"
+	  << "\t\t\t" << "children = (" << "\n"
+	  << valGlue(grp_it.data(), "\t\t\t\t", ",\n\t\t\t\t", "\n")
+	  << "\t\t\t" << ");" << "\n"
+	  << "\t\t\t" << "name = \"" << grp_it.key().section(Option::dir_sep, -1) << "\";" << "\n"
+	  << "\t\t\t" << "refType = 4;" << "\n"
+	  << "\t\t" << "};" << "\n";
+    }
+
+    //PREPROCESS BUILDPHASE (just a makefile)
+    if(!project->isEmpty("UICIMPLS") || !project->isEmpty("SRCMOC") || !project->isEmpty("IMAGES") ||
+	!project->isEmpty("YACCSOURCES") || !project->isEmpty("LEXSOURCES")) {
+	QString mkfile = pbx_dir + Option::dir_sep + "qt_preprocess.mak";
+	QFile mkf(mkfile);
+	if(mkf.open(IO_WriteOnly | IO_Translate)) {
+	    did_preprocess = TRUE;
+	    debug_msg(1, "pbuilder: Creating file: %s", mkfile.latin1());
+	    QTextStream mkt(&mkf);
+	    writeHeader(mkt);
+	    mkt << "MOC       = " << Option::fixPathToTargetOS(var("QMAKE_MOC")) << endl;
+	    mkt << "UIC       = " << Option::fixPathToTargetOS(var("QMAKE_UIC")) << endl;
+	    mkt << "LEX       = " << var("QMAKE_LEX") << endl;
+	    mkt << "LEXFLAGS  = " << var("QMAKE_LEXFLAGS") << endl;
+	    mkt << "YACC      = " << var("QMAKE_YACC") << endl;
+	    mkt << "YACCFLAGS = " << var("QMAKE_YACCFLAGS") << endl;
+	    mkt << "DEL_FILE  = " << var("QMAKE_DEL_FILE") << endl;
+	    mkt << "MOVE      = " << var("QMAKE_MOVE") << endl << endl;
+	    mkt << "FORMS = " << varList("UICIMPLS") << endl;
+	    mkt << "IMAGES = " << varList("QMAKE_IMAGE_COLLECTION") << endl;
+	    mkt << "MOCS = " << varList("SRCMOC") << endl;
+	    mkt << "PARSERS =";
+	    if(!project->isEmpty("YACCSOURCES")) {
+		QStringList &yaccs = project->variables()["YACCSOURCES"];
+		for(QStringList::Iterator yit = yaccs.begin(); yit != yaccs.end(); ++yit) {
+		    QFileInfo fi((*yit));
+		    mkt << " " << fi.dirPath() << Option::dir_sep << fi.baseName(TRUE)
+			<< Option::yacc_mod << Option::cpp_ext.first();
+		}
+	    }
+	    if(!project->isEmpty("LEXSOURCES")) {
+		QStringList &lexs = project->variables()["LEXSOURCES"];
+		for(QStringList::Iterator lit = lexs.begin(); lit != lexs.end(); ++lit) {
+		    QFileInfo fi((*lit));
+		    mkt << " " << fi.dirPath() << Option::dir_sep << fi.baseName(TRUE)
+			<< Option::lex_mod << Option::cpp_ext.first();
+		}
+	    }
+	    mkt << "\n";
+	    mkt << "preprocess: $(FORMS) $(MOCS) $(PARSERS) $(IMAGES)" << endl;
+	    mkt << "clean preprocess_clean: mocclean uiclean parser_clean" << endl << endl;
+	    mkt << "mocclean:" << "\n";
+	    if(!project->isEmpty("SRCMOC"))
+		mkt << "\t-rm -f $(MOCS)" << "\n";
+	    mkt << "uiclean:" << "\n";
+	    if(!project->isEmpty("UICIMPLS"))
+		mkt << "\t-rm -f $(FORMS)" << "\n";
+	    if(!project->isEmpty("QMAKE_IMAGE_COLLECTION"))
+		mkt << "\t-rm -f $(IMAGES)" << "\n";
+	    mkt << "parser_clean:" << "\n";
+	    if(!project->isEmpty("YACCSOURCES") || !project->isEmpty("LEXSOURCES"))
+		mkt << "\t-rm -f $(PARSERS)" << "\n";
+	    writeUicSrc(mkt, "FORMS");
+	    writeMocSrc(mkt, "HEADERS");
+	    writeMocSrc(mkt, "SOURCES");
+	    writeMocSrc(mkt, "UICDECLS");
+	    writeYaccSrc(mkt, "YACCSOURCES");
+	    writeLexSrc(mkt, "LEXSOURCES");
+	    writeImageSrc(mkt, "QMAKE_IMAGE_COLLECTION");
+	    mkf.close();
+	}
+	mkfile = fileFixify(mkfile, QDir::currentDirPath());
+	QString phase_key = keyFor("QMAKE_PBX_PREPROCESS_TARGET");
+//	project->variables()["QMAKE_PBX_BUILDPHASES"].append(phase_key);
+	project->variables()["QMAKE_PBX_PRESCRIPT_BUILDPHASES"].append(phase_key);
+	t << "\t\t" << phase_key << " = {" << "\n"
+	  << "\t\t\t" << "buildActionMask = 2147483647;" << "\n"
+	  << "\t\t\t" << "files = (" << "\n"
+	  << "\t\t\t" << ");" << "\n"
+	  << "\t\t\t" << "generatedFileNames = (" << "\n"
+	  << varGlue("QMAKE_PBX_OBJ", "\t\t\t\t", ",\n\t\t\t\t", "\n")
+	  << "\t\t\t" << ");" << "\n"
+	  << "\t\t\t" << "isa = PBXShellScriptBuildPhase;" << "\n"
+	  << "\t\t\t" << "name = \"Qt Preprocessors\";" << "\n"
+	  << "\t\t\t" << "neededFileNames = (" << "\n"
+	  << varGlue("QMAKE_PBX_OBJ", "\t\t\t\t", ",\n\t\t\t\t", "\n")
+	  << "\t\t\t" << ");" << "\n"
+	  << "\t\t\t" << "shellPath = /bin/sh;" << "\n"
+	  << "\t\t\t" << "shellScript = \"make -C " << QDir::currentDirPath() <<
+	    " -f " << mkfile << "\";" << "\n"
+	  << "\t\t" << "};" << "\n";
+   }
+
+    //SOURCE BUILDPHASE
+    if(!project->isEmpty("QMAKE_PBX_OBJ")) {
+	QString grp = "Build Sources", key = keyFor(grp);
+	project->variables()["QMAKE_PBX_BUILDPHASES"].append(key);
+	t << "\t\t" << key << " = {" << "\n"
+	  << "\t\t\t" << "buildActionMask = 2147483647;" << "\n"
+	  << "\t\t\t" << "files = (" << "\n"
+	  << varGlue("QMAKE_PBX_OBJ", "\t\t\t\t", ",\n\t\t\t\t", "\n")
+	  << "\t\t\t" << ");" << "\n"
+	  << "\t\t\t" << "isa = PBXSourcesBuildPhase;" << "\n"
+	  << "\t\t\t" << "name = \"" << grp << "\";" << "\n"
+	  << "\t\t" << "};" << "\n";
+    }
+
+    if(!project->isActiveConfig("staticlib")) { //DUMP LIBRARIES
+	QStringList &libdirs = project->variables()["QMAKE_PBX_LIBPATHS"];
+	QString libs[] = { "QMAKE_LFLAGS", "QMAKE_LIBDIR_FLAGS", "QMAKE_LIBS", QString::null };
+	for(i = 0; !libs[i].isNull(); i++) {
+	    tmp = project->variables()[libs[i]];
+	    for(QStringList::Iterator it = tmp.begin(); it != tmp.end();) {
+		bool remove = FALSE;
+		QString library, name, opt = (*it).stripWhiteSpace();
+		if(opt.length() >= 2 && (opt[0] == '"' || opt[0] == '\'') && opt[(int) opt.length()-1] == opt[0])
+		    opt = opt.mid(1, opt.length()-2);
+		if(opt.startsWith("-L")) {
+		    QString r = opt.right(opt.length() - 2);
+		    fixEnvVariables(r);
+		    libdirs.append(r);
+		} else if(opt == "-prebind") {
+		    project->variables()["QMAKE_DO_PREBINDING"].append("TRUE");
+		    remove = TRUE;
+		} else if(opt.startsWith("-l")) {
+		    name = opt.right(opt.length() - 2);
+		    QString lib("lib" + name);
+		    for(QStringList::Iterator lit = libdirs.begin(); lit != libdirs.end(); ++lit) {
+			if(project->isActiveConfig("link_prl")) {
+			    /* This isn't real nice, but it is real usefull. This looks in a prl
+			       for what the library will ultimately be called so we can stick it
+			       in the ProjectFile. If the prl format ever changes (not likely) then
+			       this will not really work. However, more concerning is that it will
+			       encode the version number in the Project file which might be a bad
+			       things in days to come? --Sam
+			    */
+			    QString lib_file = (*lit) + Option::dir_sep + lib;
+			    if(QMakeMetaInfo::libExists(lib_file)) {
+				QMakeMetaInfo libinfo;
+				if(libinfo.readLib(lib_file)) {
+				    if(!libinfo.isEmpty("QMAKE_PRL_TARGET")) {
+					library = (*lit) + Option::dir_sep + libinfo.first("QMAKE_PRL_TARGET");
+					debug_msg(1, "pbuilder: Found library (%s) via PRL %s (%s)",
+						  opt.latin1(), lib_file.latin1(), library.latin1());
+					remove = TRUE;
+				    }
+				}
+			    }
+			}
+			if(!remove) {
+			    QString extns[] = { ".dylib", ".so", ".a", QString::null };
+			    for(int n = 0; !remove && !extns[n].isNull(); n++) {
+				QString tmp =  (*lit) + Option::dir_sep + lib + extns[n];
+				if(QFile::exists(tmp)) {
+				    library = tmp;
+				    debug_msg(1, "pbuilder: Found library (%s) via %s",
+					      opt.latin1(), library.latin1());
+				    remove = TRUE;
+				}
+			    }
+			}
+		    }
+		} else if(opt == "-framework") {
+		    ++it;
+		    if(it == tmp.end())
+			break;
+		    QStringList &fdirs = project->variables()["QMAKE_FRAMEWORKDIR"];
+		    if(fdirs.isEmpty())
+			fdirs.append("/System/Library/Frameworks/");
+		    for(QStringList::Iterator fit = fdirs.begin(); fit != fdirs.end(); ++fit) {
+			if(QFile::exists((*fit) + QDir::separator() + (*it) + ".framework")) {
+			    --it;
+			    it = tmp.remove(it);
+			    remove = TRUE;
+			    library = (*fit) + Option::dir_sep + (*it) + ".framework";
+			    break;
+			}
+		    }
+		} else if(opt.left(1) != "-") {
+                    if(QFile::exists(opt)) {
+                        remove = TRUE;
+                        library = opt;
+                    }
+		}
+		if(!library.isEmpty()) {
+		    if(name.isEmpty()) {
+			int slsh = library.findRev(Option::dir_sep);
+			if(slsh != -1)
+			    name = library.right(library.length() - slsh - 1);
+		    }
+		    library = fileFixify(library);
+		    QString key = keyFor(library);
+		    bool is_frmwrk = (library.endsWith(".framework"));
+		    t << "\t\t" << key << " = {" << "\n"
+		      << "\t\t\t" << "isa = " << (is_frmwrk ? "PBXFrameworkReference" : "PBXFileReference") << ";" << "\n"
+		      << "\t\t\t" << "name = \"" << name << "\";" << "\n"
+		      << "\t\t\t" << "path = \"" << library << "\";" << "\n"
+		      << "\t\t\t" << "refType = " << reftypeForFile(library) << ";" << "\n"
+		      << "\t\t" << "};" << "\n";
+		    project->variables()["QMAKE_PBX_LIBRARIES"].append(key);
+		    QString obj_key = library + ".o";
+		    obj_key = keyFor(obj_key);
+		    t << "\t\t" << obj_key << " = {" << "\n"
+		      << "\t\t\t" << "fileRef = " << key << ";" << "\n"
+		      << "\t\t\t" << "isa = PBXBuildFile;" << "\n"
+		      << "\t\t\t" << "settings = {" << "\n"
+		      << "\t\t\t" << "};" << "\n"
+		      << "\t\t" << "};" << "\n";
+		    project->variables()["QMAKE_PBX_BUILD_LIBRARIES"].append(obj_key);
+		}
+		if(remove)
+		    it = tmp.remove(it);
+		else
+		    ++it;
+	    }
+	    project->variables()[libs[i]] = tmp;
+	}
+    }
+    //SUBLIBS BUILDPHASE (just another makefile)
+    if(!project->isEmpty("SUBLIBS")) {
+	QString mkfile = pbx_dir + Option::dir_sep + "qt_sublibs.mak";
+	QFile mkf(mkfile);
+	if(mkf.open(IO_WriteOnly | IO_Translate)) {
+	    debug_msg(1, "pbuilder: Creating file: %s", mkfile.latin1());
+	    QTextStream mkt(&mkf);
+	    writeHeader(mkt);
+	    mkt << "SUBLIBS= ";
+	    tmp = project->variables()["SUBLIBS"];
+	    QStringList::Iterator it;
+	    for(it = tmp.begin(); it != tmp.end(); ++it)
+		t << "tmp/lib" << (*it) << ".a ";
+	    t << endl << endl;
+	    mkt << "sublibs: $(SUBLIBS)" << endl << endl;
+	    tmp = project->variables()["SUBLIBS"];
+	    for(it = tmp.begin(); it != tmp.end(); ++it)
+		t << "tmp/lib" << (*it) << ".a" << ":\n\t"
+		  << var(QString("MAKELIB") + (*it)) << endl << endl;
+	    mkf.close();
+	}
+	QString phase_key = keyFor("QMAKE_PBX_SUBLIBS_BUILDPHASE");
+	mkfile = fileFixify(mkfile, QDir::currentDirPath());
+	project->variables()["QMAKE_PBX_PRESCRIPT_BUILDPHASES"].append(phase_key);
+	t << "\t\t" << phase_key << " = {" << "\n"
+	  << "\t\t\t" << "buildActionMask = 2147483647;" << "\n"
+	  << "\t\t\t" << "files = (" << "\n"
+	  << "\t\t\t" << ");" << "\n"
+	  << "\t\t\t" << "generatedFileNames = (" << "\n"
+	  << "\t\t\t" << ");" << "\n"
+	  << "\t\t\t" << "isa = PBXShellScriptBuildPhase;" << "\n"
+	  << "\t\t\t" << "name = \"Qt Sublibs\";" << "\n"
+	  << "\t\t\t" << "neededFileNames = (" << "\n"
+	  << "\t\t\t" << ");" << "\n"
+	  << "\t\t\t" << "shellPath = /bin/sh;" << "\n"
+	  << "\t\t\t" << "shellScript = \"make -C " << QDir::currentDirPath() <<
+	    " -f " << mkfile << "\";" << "\n"
+	  << "\t\t" << "};" << "\n";
+    }
+    //LIBRARY BUILDPHASE
+    if(!project->isEmpty("QMAKE_PBX_LIBRARIES")) {
+	tmp = project->variables()["QMAKE_PBX_LIBRARIES"];
+	if(!tmp.isEmpty()) {
+	    QString grp("External Frameworks and Libraries"), key = keyFor(grp);
+	    project->variables()["QMAKE_PBX_GROUPS"].append(key);
+	    t << "\t\t" << key << " = {" << "\n"
+	      << "\t\t\t" << "children = (" << "\n"
+	      << varGlue("QMAKE_PBX_LIBRARIES", "\t\t\t\t", ",\n\t\t\t\t", "\n")
+	      << "\t\t\t" << ");" << "\n"
+	      << "\t\t\t" << "isa = PBXGroup;" << "\n"
+	      << "\t\t\t" << "name = \"" << grp << "\"" << ";" << "\n"
+	      << "\t\t\t" << "path = \"\";" << "\n"
+	      << "\t\t\t" << "refType = 4;" << "\n"
+	      << "\t\t" << "};" << "\n";
+	}
+    }
+    {
+	QString grp("Frameworks & Libraries"), key = keyFor(grp);
+	project->variables()["QMAKE_PBX_BUILDPHASES"].append(key);
+	t << "\t\t" << key << " = {" << "\n"
+	  << "\t\t\t" << "buildActionMask = 2147483647;" << "\n"
+	  << "\t\t\t" << "files = (" << "\n"
+	  << varGlue("QMAKE_PBX_BUILD_LIBRARIES", "\t\t\t\t", ",\n\t\t\t\t", "\n")
+	  << "\t\t\t" << ");" << "\n"
+	  << "\t\t\t" << "isa = PBXFrameworksBuildPhase;" << "\n"
+	  << "\t\t\t" << "name = \"" << grp << "\";" << "\n"
+	  << "\t\t" << "};" << "\n";
+    }
+    if(!project->isActiveConfig("console") && project->first("TEMPLATE") == "app") { //BUNDLE RESOURCES
+	QString grp("Bundle Resources"), key = keyFor(grp);
+	project->variables()["QMAKE_PBX_BUILDPHASES"].append(key);
+	t << "\t\t" << key << " = {" << "\n"
+	  << "\t\t\t" << "buildActionMask = 2147483647;" << "\n"
+	  << "\t\t\t" << "files = (" << "\n"
+	  << (!project->isEmpty("RC_FILE") ? keyFor("ICNS_FILE_REFERENCE") : QString(""))
+	  << "\t\t\t" << ");" << "\n"
+	  << "\t\t\t" << "isa = PBXResourcesBuildPhase;" << "\n"
+	  << "\t\t\t" << "name = \"" << grp << "\";" << "\n"
+	  << "\t\t" << "};" << "\n";
+    }
+    { //INSTALL BUILDPHASE (sh script)
+        QString phase_key = keyFor("QMAKE_PBX_TARGET_COPY_PHASE");
+        QString destDir = Option::output_dir;
+        if (!project->isEmpty("QMAKE_ORIG_DESTDIR"))
+            destDir = project->first("QMAKE_ORIG_DESTDIR");
+        fixEnvs(destDir);
+        destDir = QFileInfo(Option::fixPathToLocalOS(destDir)).absFilePath();
+        project->variables()["QMAKE_PBX_PRESCRIPT_BUILDPHASES"].append(phase_key);
+        t << "\t\t" << phase_key << " = {\n"
+          << "\t\t\tbuildActionMask = 2147483647;\n"
+          << "\t\t\tdstPath = " << destDir << ";\n"
+          << "\t\t\tdstSubfolderSpec = 0;\n"
+          << "\t\t\tfiles = (\n"
+          << "\t\t\t" << keyFor("QMAKE_PBX_TARGET_COPY_FILE") << ",\n"
+          << "\t\t\t);\n"
+          << "\t\t\tisa = PBXCopyFilesBuildPhase;\n"
+          << "\t\t\trunOnlyForDeploymentPostprocessing = 0;\n"
+          << "\t\t};\n"
+          << "\t\t" << keyFor("QMAKE_PBX_TARGET_COPY_FILE")  << " = {\n"
+          << "\t\t\tfileRef =  " <<  keyFor(pbx_dir + "QMAKE_PBX_REFERENCE") << ";\n"
+          << "\t\t\tisa = PBXBuildFile;\n"
+          << "\t\t\tsettings = {\n"
+          << "\t\t\t};\n"
+          << "\t\t};\n";
+    }
+    if(/*ideType() == MAC_XCODE &&*/ !project->isEmpty("QMAKE_PBX_PRESCRIPT_BUILDPHASES") && 0) {
+	// build reference
+	t << "\t\t" << keyFor("QMAKE_PBX_PRESCRIPT_BUILDREFERENCE") << " = {" << "\n"
+	  << "\t\t\t" << "includeInIndex = 0;" << "\n"
+	  << "\t\t\t" << "isa = PBXFileReference;" << "\n"
+	  << "\t\t\t" << "path = preprocessor.out;" << "\n"
+	  << "\t\t\t" << "refType = 3;" << "\n"
+	  << "\t\t\t" << "sourceTree = BUILT_PRODUCTS_DIR;" << "\n"
+	  << "\t\t" << "};" << "\n";
+	project->variables()["QMAKE_PBX_PRODUCTS"].append(keyFor("QMAKE_PBX_PRESCRIPTS_BUILDREFERENCE"));
+	//build phase
+        QString prescript_key = keyFor("QMAKE_PBX_PRESCRIPTS_BUILDPHASE");
+        project->variables()["QMAKE_PBX_TARGETS"].append(prescript_key);
+	t << "\t\t" << prescript_key << " = {" << "\n"
+	  << "\t\t\t" << "buildPhases = (" << "\n"
+	  << varGlue("QMAKE_PBX_PRESCRIPT_BUILDPHASES", "\t\t\t\t", ",\n\t\t\t\t", "\n")
+	  << "\t\t\t" << ");" << "\n"
+	  << "\t\t\t" << "buildRules = (" << "\n"
+	  << "\t\t\t" << ");" << "\n"
+	  << "\t\t\t" << "buildSettings = {" << "\n"
+	  << "\t\t\t" << "};" << "\n"
+	  << "\t\t\t" << "dependencies = (" << "\n"
+	  << "\t\t\t" << ");" << "\n"
+	  << "\t\t\t" << "isa = PBXNativeTarget;" << "\n"
+	  << "\t\t\t" << "name = \"Qt Preprocessor Steps\";" << "\n"
+	  << "\t\t\t" << "productName = \"Qt Preprocessor Steps\";" << "\n"
+	  << "\t\t\t" << "productReference = " << keyFor("QMAKE_PBX_PRESCRIPTS_BUILDREFERENCE") << ";" << "\n"
+	  << "\t\t\t" << "productType = \"com.apple.product-type.tool\";" << "\n"
+	  << "\t\t" << "};" << "\n";
+	//dependency
+	t << "\t\t" << keyFor("QMAKE_PBX_PRESCRIPTS_DEPENDENCY") << " = {" << "\n"
+	  << "\t\t\t" << "isa = PBXTargetDependency;" << "\n"
+	  << "\t\t\t" << "target = " << keyFor("QMAKE_PBX_PRESCRIPTS_BUILDPHASE") << ";" << "\n"
+	  << "\t\t" << "};" << "\n";
+	project->variables()["QMAKE_PBX_TARGET_DEPENDS"].append(keyFor("QMAKE_PBX_PRESCRIPTS_DEPENDENCY"));
+	project->variables()["QMAKE_PBX_PRESCRIPT_BUILDPHASES"].clear(); //these are already consumed above
+    }
+
+    //DUMP EVERYTHING THAT TIES THE ABOVE TOGETHER
+    //ROOT_GROUP
+    t << "\t\t" << keyFor("QMAKE_PBX_ROOT_GROUP") << " = {" << "\n"
+      << "\t\t\t" << "children = (" << "\n"
+      << varGlue("QMAKE_PBX_GROUPS", "\t\t\t\t", ",\n\t\t\t\t", "\n")
+      << "\t\t\t" << ");" << "\n"
+      << "\t\t\t" << "isa = PBXGroup;" << "\n"
+      << "\t\t\t" << "name = " << project->first("QMAKE_ORIG_TARGET") << ";" << "\n"
+      << "\t\t\t" << "path = \"\";" << "\n"
+      << "\t\t\t" << "refType = 4;" << "\n"
+      << "\t\t" << "};" << "\n";
+    //REFERENCE
+    project->variables()["QMAKE_PBX_PRODUCTS"].append(keyFor(pbx_dir + "QMAKE_PBX_REFERENCE"));
+    t << "\t\t" << keyFor(pbx_dir + "QMAKE_PBX_REFERENCE") << " = {" << "\n"
+      << "\t\t\t" << "fallbackIsa = PBXFileReference;" << "\n";
+    if(project->first("TEMPLATE") == "app") {
+	QString targ = project->first("QMAKE_ORIG_TARGET");
+	if(project->isActiveConfig("resource_fork") && !project->isActiveConfig("console")) {
+	    targ += ".app";
+	    t << "\t\t\t" << "isa = PBXApplicationReference;" << "\n";
+	} else {
+	    t << "\t\t\t" << "isa = PBXExecutableFileReference;" << "\n";
+	}
+	QString app = (!project->isEmpty("DESTDIR") ? project->first("DESTDIR") + project->first("QMAKE_ORIG_TARGET") :
+		       QDir::currentDirPath()) + Option::dir_sep + targ;
+	t << "\t\t\t" << "name = " <<  targ << ";" << "\n"
+	  << "\t\t\t" << "path = \"" << targ << "\";" << "\n"
+	  << "\t\t\t" << "refType = " << reftypeForFile(app) << ";" << "\n";
+    } else {
+	QString lib = project->first("QMAKE_ORIG_TARGET");
+	if(project->isActiveConfig("staticlib")) {
+	    lib = project->first("TARGET");
+	} else if(!project->isActiveConfig("frameworklib")) {
+	    if(project->isActiveConfig("plugin"))
+		lib = project->first("TARGET");
+	    else
+		lib = project->first("TARGET_");
+	}
+	int slsh = lib.findRev(Option::dir_sep);
+	if(slsh != -1)
+	    lib = lib.right(lib.length() - slsh - 1);
+	t << "\t\t\t" << "isa = PBXLibraryReference;" << "\n"
+	  << "\t\t\t" << "expectedFileType = \"compiled.mach-o.dylib\";" << "\n"
+	  << "\t\t\t" << "path = " << lib << ";\n"
+	  << "\t\t\t" << "refType = " << 3/*reftypeForFile(lib)*/ << ";" << "\n"
+	  << "\t\t\t" << "sourceTree = BUILT_PRODUCTS_DIR" << ";" << "\n";
+    }
+    t << "\t\t" << "};" << "\n";
+    { //Products group
+	QString grp("Products"), key = keyFor(grp);
+	project->variables()["QMAKE_PBX_GROUPS"].append(key);
+	t << "\t\t" << key << " = {" << "\n"
+	  << "\t\t\t" << "children = (" << "\n"
+	  << varGlue("QMAKE_PBX_PRODUCTS", "\t\t\t\t", ",\n\t\t\t\t", "\n")
+	  << "\t\t\t" << ");" << "\n"
+	  << "\t\t\t" << "isa = PBXGroup;" << "\n"
+	  << "\t\t\t" << "name = Products;" << "\n"
+	  << "\t\t\t" << "refType = 4;" << "\n"
+	  << "\t\t" << "};" << "\n";
+    }
+    //TARGET
+    QString target_key = keyFor("QMAKE_PBX_TARGET");
+    project->variables()["QMAKE_PBX_TARGETS"].append(target_key);
+    t << "\t\t" << target_key << " = {" << "\n"
+      << "\t\t\t" << "buildPhases = (" << "\n"
+      << varGlue("QMAKE_PBX_PRESCRIPT_BUILDPHASES", "\t\t\t\t", ",\n\t\t\t\t", ",\n")
+      << varGlue("QMAKE_PBX_BUILDPHASES", "\t\t\t\t", ",\n\t\t\t\t", "\n")
+      << "\t\t\t" << ");" << "\n"
+      << "\t\t\t" << "buildSettings = {" << "\n"
+      << "\t\t\t\t" << "CC = \"" << fixEnvsList("QMAKE_CC") << "\";" << "\n"
+      << "\t\t\t\t" << "CPLUSPLUS = \"" << fixEnvsList("QMAKE_CXX") << "\";" << "\n"
+      << "\t\t\t\t" << "FRAMEWORK_SEARCH_PATHS = \"\";" << "\n"
+      << "\t\t\t\t" << "HEADER_SEARCH_PATHS = \"" << fixEnvsList("INCLUDEPATH") << " " << fixEnvs(specdir()) << "\";" << "\n"
+      << "\t\t\t\t" << "LIBRARY_SEARCH_PATHS = \"" << var("QMAKE_PBX_LIBPATHS") << "\";" << "\n"
+      << "\t\t\t\t" << "OPTIMIZATION_CFLAGS = \"\";" << "\n"
+      << "\t\t\t\t" << "GCC_GENERATE_DEBUGGING_SYMBOLS = " <<
+        (project->isActiveConfig("debug") ? "YES" : "NO") << ";" << "\n"
+      << "\t\t\t\t" << "OTHER_CFLAGS = \"" <<
+	fixEnvsList("QMAKE_CFLAGS") << fixQuotes(varGlue("PRL_EXPORT_DEFINES"," -D"," -D","")) <<
+	fixQuotes(varGlue("DEFINES"," -D"," -D","")) << "\";" << "\n"
+      << "\t\t\t\t" << "LEXFLAGS = \"" << var("QMAKE_LEXFLAGS") << "\";" << "\n"
+      << "\t\t\t\t" << "YACCFLAGS = \"" << var("QMAKE_YACCFLAGS") << "\";" << "\n"
+      << "\t\t\t\t" << "OTHER_CPLUSPLUSFLAGS = \"" <<
+	fixEnvsList("QMAKE_CXXFLAGS") << fixQuotes(varGlue("PRL_EXPORT_DEFINES"," -D"," -D","")) <<
+	fixQuotes(varGlue("DEFINES"," -D"," -D","")) << "\";" << "\n"
+      << "\t\t\t\t" << "OTHER_REZFLAGS = \"\";" << "\n"
+      << "\t\t\t\t" << "SECTORDER_FLAGS = \"\";" << "\n"
+      << "\t\t\t\t" << "WARNING_CFLAGS = \"\";" << "\n"
+      << "\t\t\t\t" << "PREBINDING = " << (project->isEmpty("QMAKE_DO_PREBINDING") ? "NO" : "YES") << ";" << "\n";
+    if(project->isActiveConfig("debug"))
+        t << "\t\t\t\t" << "GCC_OPTIMIZATION_LEVEL = 0" << ";" << "\n";
+    if(!project->isEmpty("PRECOMPILED_HEADER")) {
+        if(pbVersion >= 38) {
+            t << "\t\t\t\t" << "GCC_PRECOMPILE_PREFIX_HEADER = \"YES\";" << "\n"
+                << "\t\t\t\t" << "GCC_PREFIX_HEADER = \"" <<  project->first("PRECOMPILED_HEADER") << "\";" << "\n";
+        } else {
+            t << "\t\t\t\t" << "PRECOMPILE_PREFIX_HEADER = \"YES\";" << "\n"
+                << "\t\t\t\t" << "PREFIX_HEADER = \"" <<  project->first("PRECOMPILED_HEADER") << "\";" << "\n";
+        }
+    }
+    if(project->first("TEMPLATE") == "app") {
+        QString plist = fileFixify(project->first("QMAKE_INFO_PLIST"));
+        if(plist.isEmpty())
+            plist = specdir() + QDir::separator() + "Info.plist." + project->first("TEMPLATE");
+	if(QFile::exists(plist)) {
+	    QFile plist_in_file(plist);
+	    if(plist_in_file.open(IO_ReadOnly)) {
+		QTextStream plist_in(&plist_in_file);
+		QString plist_in_text = plist_in.read();
+                plist_in_text = plist_in_text.replace("@ICON@", (project->isEmpty("RC_FILE") ? QString("") : project->first("RC_FILE").section(Option::dir_sep, -1)));
+                plist_in_text = plist_in_text.replace("@EXECUTABLE@", project->first("QMAKE_ORIG_TARGET"));
+		QFile plist_out_file("Info.plist");
+		if(plist_out_file.open(IO_WriteOnly | IO_Translate)) {
+		    QTextStream plist_out(&plist_out_file);
+		    plist_out << plist_in_text;
+		    t << "\t\t\t\t" << "INFOPLIST_FILE = \"Info.plist\";" << "\n";
+		}
+	    }
+	}
+    }
+#if 1
+    t << "\t\t\t\t" << "BUILD_ROOT = \"" << QDir::currentDirPath() << "\";" << "\n";
+#endif
+    if(!project->isActiveConfig("staticlib"))
+	t << "\t\t\t\t" << "OTHER_LDFLAGS = \"" << fixEnvsList("SUBLIBS") << " " <<
+	    fixEnvsList("QMAKE_LFLAGS") << " " << fixEnvsList("QMAKE_LIBDIR_FLAGS") <<
+	    " " << fixEnvsList("QMAKE_LIBS") << "\";" << "\n";
+    if(!project->isEmpty("DESTDIR")) {
+	QString dir = project->first("DESTDIR");
+	if (QDir::isRelativePath(dir))
+	    dir.prepend(QDir::currentDirPath() + Option::dir_sep);
+	t << "\t\t\t\t" << "INSTALL_DIR = \"" << dir << "\";" << "\n";
+    }
+    if ( project->first("TEMPLATE") == "lib") {
+	t << "\t\t\t\t" << "INSTALL_PATH = \"" <<  "\";" << "\n";
+    }
+    if(!project->isEmpty("VERSION") && project->first("VERSION") != "0.0.0") {
+	t << "\t\t\t\t" << "DYLIB_CURRENT_VERSION = \"" << project->first("VER_MAJ") << "."
+	  << project->first("VER_MIN") << "." << project->first("VER_PAT")  << "\";" << "\n";
+	if(project->isEmpty("COMPAT_VERSION"))
+	    t << "\t\t\t\t" << "DYLIB_COMPATIBILITY_VERSION = \"" << project->first("VER_MAJ") << "."
+	      << project->first("VER_MIN")  << "\";" << "\n";
+    }
+    if(!project->isEmpty("COMPAT_VERSION"))
+        t << "\t\t\t\t" << "DYLIB_COMPATIBILITY_VERSION = \"" << project->first("COMPAT_VERSION") << "\";" << "\n";
+    if(!project->isEmpty("QMAKE_MACOSX_DEPLOYMENT_TARGET"))
+        t << "\t\t\t\t" << "MACOSX_DEPLOYMENT_TARGET = \""
+          << project->first("QMAKE_MACOSX_DEPLOYMENT_TARGET") << "\";" << "\n";
+    if(pbVersion >= 38) {
+        if(!project->isEmpty("OBJECTS_DIR"))
+            t << "\t\t\t\t" << "OBJROOT = \"" << project->first("OBJECTS_DIR") << "\";" << "\n";
+    }
+#if 0
+    if(!project->isEmpty("DESTDIR"))
+	t << "\t\t\t\t" << "SYMROOT = \"" << project->first("DESTDIR") << "\";" << "\n";
+    else
+	t << "\t\t\t\t" << "SYMROOT = \"" << QDir::currentDirPath() << "\";" << "\n";
+#endif
+    if(project->first("TEMPLATE") == "app") {
+        if(pbVersion < 38 && !project->isActiveConfig("console"))
+            t << "\t\t\t\t" << "WRAPPER_SUFFIX = app;" << "\n";
+        t << "\t\t\t\t" << "PRODUCT_NAME = " << project->first("QMAKE_ORIG_TARGET") << ";" << "\n";
+    } else {
+	if(!project->isActiveConfig("plugin") && project->isActiveConfig("staticlib")) {
+	    t << "\t\t\t\t" << "LIBRARY_STYLE = STATIC;" << "\n";
+	} else {
+	    t << "\t\t\t\t" << "LIBRARY_STYLE = DYNAMIC;" << "\n";
+	}
+	QString lib = project->first("QMAKE_ORIG_TARGET");
+	if (!project->isActiveConfig("frameworklib") && !project->isActiveConfig("staticlib"))
+	    lib.prepend("lib");
+	t << "\t\t\t\t" << "PRODUCT_NAME = " << lib << ";" << "\n";
+    }
+    tmp = project->variables()["QMAKE_PBX_VARS"];
+    for(QStringList::Iterator it = tmp.begin(); it != tmp.end(); ++it) {
+	QString var = (*it), val = getenv(var);
+	if(!val && var == "TB")
+	    val = "/usr/bin/";
+	t << "\t\t\t\t" << var << " = \"" << val << "\";" << "\n";
+    }
+    t << "\t\t\t" << "};" << "\n"
+      << "\t\t\t" << "conditionalBuildSettings = {" << "\n"
+      << "\t\t\t" << "};" << "\n"
+      << "\t\t\t" << "dependencies = (" << "\n"
+      << varGlue("QMAKE_PBX_TARGET_DEPENDS", "\t\t\t\t", ",\n\t\t\t\t", "\n")
+      << "\t\t\t" << ");" << "\n"
+      << "\t\t\t" << "productReference = " << keyFor(pbx_dir + "QMAKE_PBX_REFERENCE") << ";" << "\n"
+      << "\t\t\t" << "shouldUseHeadermap = 1;" << "\n";
+    if(pbVersion >= 38)
+        t << "\t\t\t" << "isa = PBXNativeTarget;" << "\n";
+    if(project->first("TEMPLATE") == "app") {
+        if(project->isActiveConfig("console")) {
+            if(pbVersion >= 38)
+                t << "\t\t\t" << "productType = \"com.apple.product-type.tool\";" << "\n";
+            else
+                t << "\t\t\t" << "isa = PBXToolTarget;" << "\n";
+        } else {
+            if(pbVersion >= 38)
+                t << "\t\t\t" << "productType = \"com.apple.product-type.application\";" << "\n";
+            else
+                t << "\t\t\t" << "isa = PBXApplicationTarget;" << "\n";
+            t << "\t\t\t" << "productSettingsXML = \"";
+            bool read_plist = false;
+            if(QFile::exists("Info.plist")) {
+                QFile plist("Info.plist");
+                if(plist.open(IO_ReadOnly)) {
+                    read_plist = true;
+                    QTextStream stream(&plist);
+                    while(!stream.eof())
+                        t << stream.readLine().replace('"', "\\\"") << endl;
+                }
+            }
+            if(!read_plist) {
+                t << "<?xml version="
+                  << "\\\"1.0\\\" encoding=" << "\\\"UTF-8\\\"" << "?>" << "\n"
+                  << "\t\t\t\t" << "<!DOCTYPE plist SYSTEM \\\"file://localhost/System/"
+                  << "Library/DTDs/PropertyList.dtd\\\">" << "\n"
+                  << "\t\t\t\t" << "<plist version=\\\"0.9\\\">" << "\n"
+                  << "\t\t\t\t" << "<dict>" << "\n"
+                  << "\t\t\t\t\t" << "<key>CFBundleDevelopmentRegion</key>" << "\n"
+                  << "\t\t\t\t\t" << "<string>English</string>" << "\n"
+                  << "\t\t\t\t\t" << "<key>CFBundleExecutable</key>" << "\n"
+                  << "\t\t\t\t\t" << "<string>" << project->first("QMAKE_ORIG_TARGET") << "</string>" << "\n"
+                  << "\t\t\t\t\t" << "<key>CFBundleIconFile</key>" << "\n"
+                  << "\t\t\t\t\t" << "<string>" << var("RC_FILE").section(Option::dir_sep, -1) << "</string>" << "\n"
+                  << "\t\t\t\t\t" << "<key>CFBundleInfoDictionaryVersion</key>"  << "\n"
+                  << "\t\t\t\t\t" << "<string>6.0</string>" << "\n"
+                  << "\t\t\t\t\t" << "<key>CFBundlePackageType</key>" << "\n"
+                  << "\t\t\t\t\t" << "<string>APPL</string>" << "\n"
+                  << "\t\t\t\t\t" << "<key>CFBundleSignature</key>" << "\n"
+                    //Although the output below looks strange it is to avoid the trigraph ??<
+                  << "\t\t\t\t\t" << "<string>????" << "</string>" << "\n"
+                  << "\t\t\t\t\t" << "<key>CFBundleVersion</key>" << "\n"
+                  << "\t\t\t\t\t" << "<string>0.1</string>" << "\n"
+                  << "\t\t\t\t\t" << "<key>CSResourcesFileMapped</key>" << "\n"
+                  << "\t\t\t\t\t" << "<true/>" << "\n"
+                  << "\t\t\t\t" << "</dict>" << "\n"
+                  << "\t\t\t\t" << "</plist>";
+            }
+	}
+        t << "\";" << "\n";
+	t << "\t\t\t" << "name = \"" << project->first("QMAKE_ORIG_TARGET") << "\";" << "\n"
+	  << "\t\t\t" << "productName = " << project->first("QMAKE_ORIG_TARGET") << ";" << "\n";
+    } else {
+        QString lib = project->first("QMAKE_ORIG_TARGET");
+        if(!project->isActiveConfig("frameworklib") && !project->isActiveConfig("staticlib"))
+           lib.prepend("lib");
+        t << "\t\t\t" << "name = \"" << lib << "\";" << "\n"
+          << "\t\t\t" << "productName = " << lib << ";" << "\n";
+        if(pbVersion >= 38) {
+            if(project->isActiveConfig("staticlib"))
+                t << "\t\t\t" << "productType = \"com.apple.product-type.library.static\";" << "\n";
+            else
+                t << "\t\t\t" << "productType = \"com.apple.product-type.library.dynamic\";" << "\n";
+        } else {
+            t << "\t\t\t" << "isa = PBXLibraryTarget;" << "\n";
+        }
+    }
+    t << "\t\t\t" << "startupPath = \"<<ProjectDirectory>>\";" << "\n";
+    if(!project->isEmpty("DESTDIR"))
+	t << "\t\t\t" << "productInstallPath = \"" << project->first("DESTDIR") << "\";" << "\n";
+    t << "\t\t" << "};" << "\n";
+    //DEBUG/RELEASE
+    QString active_buildstyle;
+#if 0
+    for(int as_release = 0; as_release < 2; as_release++)
+#else
+	bool as_release = !project->isActiveConfig("debug");
+#endif
+    {
+        QMap<QString, QString> settings;
+        settings.insert("COPY_PHASE_STRIP", (as_release ? "YES" : "NO"));
+        if(as_release)
+            settings.insert("GCC_GENERATE_DEBUGGING_SYMBOLS", "NO");
+        QString name;
+        if(pbVersion >= 42)
+            name = (as_release ? "Release" : "Debug");
+        else
+            name = (as_release ? "Deployment" : "Development");
+
+        if(pbVersion >= 42) {
+            QString key = keyFor("QMAKE_PBX_BUILDCONFIG_" + name);
+            project->variables()["QMAKE_PBX_BUILDCONFIGS"].append(key);
+            t << "\t\t" << key << " = {" << "\n"
+              << "\t\t\t" << "isa = XCBuildConfiguration;" << "\n"
+              << "\t\t\t" << "buildSettings = {" << "\n";
+            for(QMap<QString, QString>::Iterator set_it = settings.begin(); set_it != settings.end(); ++set_it)
+                t << "\t\t\t\t" << set_it.key() << " = \"" << set_it.data() << "\";\n";
+            t << "\t\t\t" << "};" << "\n"
+              << "\t\t\t" << "name = " << name << ";" << "\n"
+              << "\t\t" << "};" << "\n";
+        }
+
+        QString key = keyFor("QMAKE_PBX_BUILDSTYLE_" + name);
+        if(project->isActiveConfig("debug") != (bool)as_release) {
+            project->variables()["QMAKE_PBX_BUILDSTYLES"].append(key);
+            active_buildstyle = name;
+        } else if(pbVersion >= 42) {
+            project->variables()["QMAKE_PBX_BUILDSTYLES"].append(key);
+        }
+        t << "\t\t" << key << " = {" << "\n"
+          << "\t\t\t" << "buildRules = (" << "\n"
+          << "\t\t\t" << ");" << "\n"
+          << "\t\t\t" << "buildSettings = {" << "\n";
+        for(QMap<QString, QString>::Iterator set_it = settings.begin(); set_it != settings.end(); ++set_it)
+            t << "\t\t\t\t" << set_it.key() << " = \"" << set_it.data() << "\";\n";
+        t << "\t\t\t" << "};" << "\n"
+          << "\t\t\t" << "isa = PBXBuildStyle;" << "\n"
+          << "\t\t\t" << "name = " << name << ";" << "\n"
+          << "\t\t" << "};" << "\n";
+    }
+    if(pbVersion >= 42) {
+        t << "\t\t" << keyFor("QMAKE_PBX_BUILDCONFIG_LIST") << " = {" << "\n"
+          << "\t\t\t" << "isa = XCConfigurationList;" << "\n"
+          << "\t\t\t" << "buildConfigurations = (" << "\n"
+          << varGlue("QMAKE_PBX_BUILDCONFIGS", "\t\t\t\t", ",\n\t\t\t\t", "\n")
+          << "\t\t\t" << ");" << "\n"
+          << "\t\t\t" << "defaultConfigurationIsVisible = 0;" << "\n"
+          << "\t\t\t" << "defaultConfigurationIsName = " << active_buildstyle << ";" << "\n"
+          << "\t\t" << "};" << "\n";
+    }
+    //ROOT
+    t << "\t\t" << keyFor("QMAKE_PBX_ROOT") << " = {" << "\n"
+      << "\t\t\t" << "buildStyles = (" << "\n"
+      << varGlue("QMAKE_PBX_BUILDSTYLES", "\t\t\t\t", ",\n\t\t\t\t", "\n")
+      << "\t\t\t" << ");" << "\n"
+      << "\t\t\t" << "hasScannedForEncodings = 1;" << "\n"
+      << "\t\t\t" << "isa = PBXProject;" << "\n"
+      << "\t\t\t" << "mainGroup = " << keyFor("QMAKE_PBX_ROOT_GROUP") << ";" << "\n"
+      << "\t\t\t" << "projectDirPath = \"\";" << "\n"
+      << "\t\t\t" << "targets = (" << "\n"
+      << varGlue("QMAKE_PBX_TARGETS", "\t\t\t\t", ",\n\t\t\t\t", "\n")
+      << "\t\t\t" << ");" << "\n"
+      << "\t\t" << "};" << "\n";
+
+    //FOOTER
+    t << "\t" << "};" << "\n"
+      << "\t" << "rootObject = " << keyFor("QMAKE_PBX_ROOT") << ";" << "\n"
+      << "}" << endl;
+
+    if(project->isActiveConfig("generate_pbxbuild_makefile")) {
+	QString mkwrap = fileFixify(pbx_dir + Option::dir_sep + ".." + Option::dir_sep + project->first("MAKEFILE"),
+				    QDir::currentDirPath());
+	QFile mkwrapf(mkwrap);
+	if(mkwrapf.open(IO_WriteOnly | IO_Translate)) {
+	    debug_msg(1, "pbuilder: Creating file: %s", mkwrap.latin1());
+	    QTextStream mkwrapt(&mkwrapf);
+	    writeHeader(mkwrapt);
+	    const char *cleans = "uiclean mocclean preprocess_clean ";
+	    mkwrapt << "#This is a makefile wrapper for PROJECT BUILDER\n"
+		    << "all:" << "\n\t"
+		    << "cd " << project->first("QMAKE_ORIG_TARGET") << projectSuffix() << "/ && " << pbxbuild() << "\n"
+		    << "install: all" << "\n\t"
+		    << "cd " << project->first("QMAKE_ORIG_TARGET") << projectSuffix() << "/ && " << pbxbuild() << " install\n"
+		    << "distclean clean: preprocess_clean" << "\n\t"
+		    << "cd " << project->first("QMAKE_ORIG_TARGET") << projectSuffix() << "/ && " << pbxbuild() << " clean" << "\n"
+		    << (!did_preprocess ? cleans : "") << ":" << "\n";
+	    if(did_preprocess)
+		mkwrapt << cleans << ":" << "\n\t"
+			<< "make -f "
+			<< pbx_dir << Option::dir_sep << "qt_preprocess.mak $@" << endl;
+	}
+    }
+    return TRUE;
+}
+
+QString
+ProjectBuilderMakefileGenerator::fixQuotes(const QString &val)
+{
+    QString ret(val);
+    ret = ret.replace(QRegExp("('|\\\\|\")"), "\\\\1");
+    return ret;
+}
+
+QString
+ProjectBuilderMakefileGenerator::fixEnvs(const QString &file)
+{
+    QRegExp reg_var("\\$\\((.*)\\)");
+    for(int rep = 0; (rep = reg_var.search(file, rep)) != -1; ) {
+	if(project->variables()["QMAKE_PBX_VARS"].findIndex(reg_var.cap(1)) == -1)
+	    project->variables()["QMAKE_PBX_VARS"].append(reg_var.cap(1));
+	rep += reg_var.matchedLength();
+    }
+    return file;
+}
+
+QString
+ProjectBuilderMakefileGenerator::fixEnvsList(const QString &where)
+{
+    QString ret;
+    const QStringList &l = project->variables()[where];
+    for(QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
+	fixEnvs((*it));
+	if(!ret.isEmpty())
+	    ret += " ";
+	ret += fixQuotes((*it));
+    }
+    return ret;
+}
+
+QString
+ProjectBuilderMakefileGenerator::keyFor(const QString &block)
+{
+#if 1 //This make this code much easier to debug..
+    if(project->isActiveConfig("no_pb_munge_key"))
+       return block;
+#endif
+    QString ret;
+    if(!keys.contains(block)) {
+	ret = qtMD5(block.utf8()).left(24).upper();
+	keys.insert(block, ret);
+    } else {
+	ret = keys[block];
+    }
+    return ret;
+}
+
+bool
+ProjectBuilderMakefileGenerator::openOutput(QFile &file) const
+{
+    if(QDir::isRelativePath(file.name()))
+	file.setName(Option::output_dir + file.name()); //pwd when qmake was run
+    QFileInfo fi(file);
+    if(fi.extension() != "pbxproj" || file.name().isEmpty()) {
+	QString output = file.name();
+	if(fi.isDir())
+	    output += QDir::separator();
+	if(!output.endsWith(projectSuffix())) {
+	    if(file.name().isEmpty() || fi.isDir())
+		output += project->first("TARGET");
+	    output += projectSuffix() + QDir::separator();
+	} else if(output[(int)output.length() - 1] != QDir::separator()) {
+	    output += QDir::separator();
+	}
+	output += QString("project.pbxproj");
+	file.setName(output);
+    }
+    bool ret = UnixMakefileGenerator::openOutput(file);
+    ((ProjectBuilderMakefileGenerator*)this)->pbx_dir = Option::output_dir.section(Option::dir_sep, 0, -1);
+    Option::output_dir = pbx_dir.section(Option::dir_sep, 0, -2);
+    return ret;
+}
+
+/* This function is such a hack it is almost pointless, but it
+   eliminates the warning message from ProjectBuilder that the project
+   file is for an older version. I guess this could be used someday if
+   the format of the output is dependant upon the version of
+   ProjectBuilder as well.
+*/
+int
+ProjectBuilderMakefileGenerator::pbuilderVersion() const
+{
+    QString ret;
+    if(project->isEmpty("QMAKE_PBUILDER_VERSION")) {
+        QString version, version_plist = project->first("QMAKE_PBUILDER_VERSION_PLIST");
+        if(version_plist.isEmpty()) {
+            if(QFile::exists("/Developer/Applications/Xcode.app/Contents/version.plist"))
+                version_plist = "/Developer/Applications/Xcode.app/Contents/version.plist";
+            else
+                version_plist = "/Developer/Applications/Project Builder.app/Contents/version.plist";
+        } else {
+            version_plist = version_plist.replace(QRegExp("\""), "");
+        }
+        QFile version_file(version_plist);
+        if (version_file.open(IO_ReadOnly)) {
+            debug_msg(1, "pbuilder: version.plist: Reading file: %s", version_plist.latin1());
+            QTextStream plist(&version_file);
+
+            bool in_dict = false;
+            QString current_key;
+            QRegExp keyreg("^<key>(.*)</key>$"), stringreg("^<string>(.*)</string>$");
+            while(!plist.atEnd()) {
+                QString line = plist.readLine().stripWhiteSpace();
+                if(line == "<dict>")
+                    in_dict = true;
+                else if(line == "</dict>")
+                    in_dict = false;
+                else if(in_dict) {
+                    if(keyreg.exactMatch(line))
+                        current_key = keyreg.cap(1);
+                    else if(current_key == "CFBundleShortVersionString" && stringreg.exactMatch(line))
+                        version = stringreg.cap(1);
+                }
+            }
+            version_file.close();
+        } else { debug_msg(1, "pbuilder: version.plist: Failure to open %s", version_plist.latin1()); }
+        if(version.isEmpty() && version_plist.contains("Xcode")) {
+            ret = "39";
+        } else {
+            if(version.startsWith("2."))
+                ret = "42";
+            else if(version == "1.5")
+                ret = "39";
+            else if(version == "1.1")
+                ret = "34";
+        }
+    } else {
+        ret = project->first("QMAKE_PBUILDER_VERSION");
+    }
+    if(!ret.isEmpty()) {
+        bool ok;
+        int int_ret = ret.toInt(&ok);
+        if(ok) {
+            debug_msg(1, "pbuilder: version.plist: Got version: %d", int_ret);
+            return int_ret;
+        }
+    }
+    debug_msg(1, "pbuilder: version.plist: Fallback to default version");
+    return 34; //my fallback
+}
+
+int
+ProjectBuilderMakefileGenerator::reftypeForFile(const QString &where)
+{
+    int ret = 0; //absolute is the default..
+    if(QDir::isRelativePath(where))
+	ret = 4; //relative
+    return ret;
+}
+
+QString
+ProjectBuilderMakefileGenerator::projectSuffix() const
+{
+    const int pbVersion = pbuilderVersion();
+    if(pbVersion >= 42)
+        return ".xcodeproj";
+    else if(pbVersion >= 38)
+        return ".xcode";
+    return ".pbproj";
+}
+
+QString
+ProjectBuilderMakefileGenerator::pbxbuild()
+{
+    if(QFile::exists("/usr/bin/pbbuild"))
+	return "pbbuild";
+    if(QFile::exists("/usr/bin/xcodebuild"))
+       return "xcodebuild";
+    return (pbuilderVersion() >= 38 ? "xcodebuild" : "pbxbuild");
+}
+
diff --git a/qmake/generators/mac/pbuilder_pbx.h b/qmake/generators/mac/pbuilder_pbx.h
new file mode 100644
index 0000000..0661acc
--- /dev/null
+++ b/qmake/generators/mac/pbuilder_pbx.h
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Definition of ProjectBuilderMakefileGenerator class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#ifndef __PBUILDER_PBX_H__
+#define __PBUILDER_PBX_H__
+
+#include "unixmake.h"
+
+class ProjectBuilderMakefileGenerator : public UnixMakefileGenerator
+{
+    QString pbx_dir;
+    int pbuilderVersion() const;
+    bool writeSubdirs(QTextStream &, bool);
+    bool writeMakeParts(QTextStream &);
+    bool writeMakefile(QTextStream &);
+
+    QString pbxbuild();
+    QMap<QString, QString> keys;
+    QString keyFor(const QString &file);
+    QString fixQuotes(const QString &val);
+    QString fixEnvs(const QString &file);
+    QString fixEnvsList(const QString &where);
+    int     reftypeForFile(const QString &where);
+    QString projectSuffix() const;
+
+public:
+    ProjectBuilderMakefileGenerator(QMakeProject *p);
+    ~ProjectBuilderMakefileGenerator();
+
+    virtual bool openOutput(QFile &) const;
+protected:
+    bool doPrecompiledHeaders() const { return FALSE; }
+    virtual bool doDepends() const { return FALSE; } //never necesary
+};
+
+inline ProjectBuilderMakefileGenerator::~ProjectBuilderMakefileGenerator()
+{ }
+
+
+#endif /* __PBUILDER_PBX_H__ */
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
new file mode 100644
index 0000000..9b46b89
--- /dev/null
+++ b/qmake/generators/makefile.cpp
@@ -0,0 +1,2503 @@
+/****************************************************************************
+**
+** Implementation of MakefileGenerator class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#include "makefile.h"
+#include "option.h"
+#include "meta.h"
+#include <qdir.h>
+#include <qfile.h>
+#include <qtextstream.h>
+#include <qregexp.h>
+#include <qdict.h>
+#if defined(Q_OS_UNIX)
+#include <unistd.h>
+#else
+#include <io.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+// Well, Windows doesn't have this, so here's the macro
+#ifndef S_ISDIR
+#define S_ISDIR(m)	(((m) & S_IFMT) == S_IFDIR)
+#endif
+#define QMAKE_EOL(x) (x == '\r' || x == '\n')
+
+QString mkdir_p_asstring(const QString &dir)
+{
+    QString ret =  "@$(CHK_DIR_EXISTS) \"" + dir + "\" ";
+    if(Option::target_mode == Option::TARG_WIN_MODE)
+	ret += "$(MKDIR)";
+    else
+	ret += "|| $(MKDIR)";
+    ret += " \"" + dir + "\"";
+    return ret;
+}
+
+static bool createDir(const QString& fullPath)
+{
+    if(QFile::exists(fullPath))
+	return FALSE;
+    QDir dirTmp;
+    bool ret = TRUE;
+    QString pathComponent, tmpPath;
+    QStringList hierarchy = QStringList::split(QString(Option::dir_sep), fullPath, TRUE);
+    for(QStringList::Iterator it = hierarchy.begin(); it != hierarchy.end(); ++it) {
+	pathComponent = *it + QDir::separator();
+	tmpPath += pathComponent;
+	if(!dirTmp.mkdir(tmpPath)) {
+	    ret = FALSE;
+//	    break;
+	}
+    }
+    return ret;
+}
+
+
+MakefileGenerator::MakefileGenerator(QMakeProject *p) : init_opath_already(FALSE),
+							init_already(FALSE), moc_aware(FALSE),
+							no_io(FALSE), project(p)
+{
+}
+
+static char *gimme_buffer(off_t s)
+{
+    static char *big_buffer = NULL;
+    static int big_buffer_size = 0;
+    if(!big_buffer || big_buffer_size < s)
+	big_buffer = (char *)realloc(big_buffer, s);
+    return big_buffer;
+}
+
+bool
+MakefileGenerator::generateMocList(const QString &fn_target)
+{
+    if(!findMocDestination(fn_target).isEmpty())
+	return TRUE;
+
+    QString fn_local = Option::fixPathToLocalOS(fileFixify(fn_target, QDir::currentDirPath(), Option::output_dir));
+
+    int file = open(fn_local.latin1(), O_RDONLY);
+    if(file == -1)
+	return FALSE;
+
+    struct stat fst;
+    if(fstat(file, &fst) || S_ISDIR(fst.st_mode))
+	return FALSE; //shouldn't happen
+    char *big_buffer = gimme_buffer(fst.st_size);
+
+    int total_size_read;
+    for(int have_read = total_size_read = 0;
+	(have_read = read(file, big_buffer + total_size_read,
+			  fst.st_size - total_size_read));
+	total_size_read += have_read);
+    close(file);
+
+    bool ignore_qobject = FALSE;
+    int line_count = 1;
+ /* qmake ignore Q_OBJECT */
+#define COMP_LEN 8 //strlen("Q_OBJECT")
+#define OBJ_LEN 8 //strlen("Q_OBJECT")
+#define DIS_LEN 10 //strlen("Q_DISPATCH")
+    int x;
+    for(x = 0; x < (total_size_read-COMP_LEN); x++) {
+	if(*(big_buffer + x) == '/') {
+	    x++;
+	    if(total_size_read >= x) {
+		if(*(big_buffer + x) == '/') { //c++ style comment
+		    for( ;x < total_size_read && !QMAKE_EOL(*(big_buffer + x)); x++);
+		    line_count++;
+		} else if(*(big_buffer + x) == '*') { //c style comment
+		    for( ;x < total_size_read; x++) {
+			if(*(big_buffer + x) == 't' || *(big_buffer + x) == 'q') { //ignore
+			    if(total_size_read >= (x + 20)) {
+				if(!strncmp(big_buffer + x + 1, "make ignore Q_OBJECT", 20)) {
+				    debug_msg(2, "Mocgen: %s:%d Found \"qmake ignore Q_OBJECT\"",
+					      fn_target.latin1(), line_count);
+				    x += 20;
+				    ignore_qobject = TRUE;
+				}
+			    }
+			} else if(*(big_buffer + x) == '*') {
+			    if(total_size_read >= (x+1) && *(big_buffer + (x+1)) == '/') {
+				x += 2;
+				break;
+			    }
+			} else if(QMAKE_EOL(*(big_buffer + x))) {
+			    line_count++;
+			}
+		    }
+		}
+	    }
+	}
+#define SYMBOL_CHAR(x) ((x >= 'a' && x <= 'z') || (x >= 'A' && x <= 'Z') || \
+			(x <= '0' && x >= '9') || x == '_')
+
+	bool interesting = *(big_buffer+x) == 'Q' && (!strncmp(big_buffer+x, "Q_OBJECT", OBJ_LEN) ||
+						      !strncmp(big_buffer+x, "Q_DISPATCH", DIS_LEN));
+	if(interesting) {
+	    int len = 0;
+	    if(!strncmp(big_buffer+x, "Q_OBJECT", OBJ_LEN)) {
+		if(ignore_qobject) {
+		    debug_msg(2, "Mocgen: %s:%d Ignoring Q_OBJECT", fn_target.latin1(), line_count);
+		    interesting = FALSE;
+		}
+		len=OBJ_LEN;
+	    } else if(!strncmp(big_buffer+x, "Q_DISPATCH", DIS_LEN)) {
+		len=DIS_LEN;
+	    }
+	    if(SYMBOL_CHAR(*(big_buffer+x+len)))
+		interesting = FALSE;
+	    if(interesting) {
+		*(big_buffer+x+len) = '\0';
+		debug_msg(2, "Mocgen: %s:%d Found MOC symbol %s", fn_target.latin1(),
+			  line_count, big_buffer+x);
+
+		int ext_pos = fn_target.findRev('.');
+		int ext_len = fn_target.length() - ext_pos;
+		int dir_pos =  fn_target.findRev(Option::dir_sep, ext_pos);
+		QString mocFile;
+		if(!project->isEmpty("MOC_DIR"))
+		    mocFile = project->first("MOC_DIR");
+		else if(dir_pos != -1)
+		    mocFile = fn_target.left(dir_pos+1);
+
+		bool cpp_ext = FALSE;
+		for(QStringList::Iterator cppit = Option::cpp_ext.begin();
+		    cppit != Option::cpp_ext.end(); ++cppit) {
+		    if((cpp_ext = (fn_target.right(ext_len) == (*cppit))))
+			break;
+		}
+		if(cpp_ext) {
+		    mocFile += Option::cpp_moc_mod + fn_target.mid(dir_pos+1, ext_pos - dir_pos-1) + Option::cpp_moc_ext;
+		    project->variables()["_SRCMOC"].append(mocFile);
+		} else if(project->variables()["HEADERS"].findIndex(fn_target) != -1) {
+		    for(QStringList::Iterator hit = Option::h_ext.begin();
+			hit != Option::h_ext.end(); ++hit) {
+			if((fn_target.right(ext_len) == (*hit))) {
+			    mocFile += Option::h_moc_mod + fn_target.mid(dir_pos+1, ext_pos - dir_pos-1) +
+				       Option::h_moc_ext;
+			    logicWarn(mocFile, "SOURCES");
+			    project->variables()["_HDRMOC"].append(mocFile);
+			    break;
+			}
+		    }
+		}
+
+		if(!mocFile.isEmpty()) {
+		    mocFile = Option::fixPathToTargetOS(mocFile);
+		    mocablesToMOC[cleanFilePath(fn_target)] = mocFile;
+		    mocablesFromMOC[cleanFilePath(mocFile)] = fn_target;
+		}
+		break;
+	    }
+	}
+
+	while(x < total_size_read && SYMBOL_CHAR(*(big_buffer+x)))
+	    x++;
+	if(QMAKE_EOL(*(big_buffer+x)))
+	    line_count++;
+    }
+#undef OBJ_LEN
+#undef DIS_LEN
+    return TRUE;
+}
+
+bool
+MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, const QString &f, bool recurse)
+{
+    if(processedDependencies(f))
+	return TRUE;
+    setProcessedDependencies(f, TRUE);
+
+    QStringList &fndeps = findDependencies(f);
+    QString fn = fileFixify(f, QDir::currentDirPath(), Option::output_dir);
+    fn = Option::fixPathToLocalOS(fn, FALSE);
+    QString fix_env_fn = Option::fixPathToLocalOS(fn);
+    int file = open(fix_env_fn.latin1(), O_RDONLY);
+    if(file == -1)
+	return FALSE;
+    struct stat fst;
+    if(fstat(file, &fst) || S_ISDIR(fst.st_mode))
+	return FALSE; //shouldn't happen
+
+    QString fndir, fix_env_fndir;
+    int dl = fn.findRev(Option::dir_sep);
+    if(dl != -1)
+	fndir = fn.left(dl+1);
+    dl = fix_env_fn.findRev(Option::dir_sep);
+    if(dl != -1)
+	fix_env_fndir = fix_env_fn.left(dl + 1);
+
+    int line_count = 1;
+    char *big_buffer = gimme_buffer(fst.st_size);
+
+    int total_size_read;
+    for(int have_read = total_size_read = 0;
+	(have_read = read(file, big_buffer + total_size_read,
+			  fst.st_size - total_size_read));
+	total_size_read += have_read);
+    close(file);
+
+    bool ui_file = fn.endsWith(Option::ui_ext);
+    for(int x = 0; x < total_size_read; x++) {
+	QStringList *outdeps=&fndeps;
+	QString inc;
+	if(!ui_file) {
+	    if(*(big_buffer + x) == '/') {
+		x++;
+		if(total_size_read >= x) {
+		    if(*(big_buffer + x) == '/') { //c++ style comment
+			for( ; x < total_size_read && !QMAKE_EOL(*(big_buffer + x)); x++);
+		    } else if(*(big_buffer + x) == '*') { //c style comment
+			for( ; x < total_size_read; x++) {
+			    if(*(big_buffer + x) == '*') {
+				if(total_size_read >= (x+1) && *(big_buffer + (x+1)) == '/') {
+				    x += 2;
+				    break;
+				}
+			    } else if(QMAKE_EOL(*(big_buffer + x))) {
+				line_count++;
+			    }
+			}
+		    }
+		}
+	    }
+	    while(x < total_size_read && //Skip spaces
+		  (*(big_buffer+x) == ' ' || *(big_buffer+x) == '\t'))
+		x++;
+	    if(*(big_buffer + x) == '#') {
+		x++;
+		while(x < total_size_read && //Skip spaces after hash
+		      (*(big_buffer+x) == ' ' || *(big_buffer+x) == '\t'))
+		    x++;
+		if(total_size_read >= x + 8 && !strncmp(big_buffer + x, "include", 7) &&
+		   (*(big_buffer + x + 7) == ' ' || *(big_buffer + x + 7) == '\t' ||
+		    *(big_buffer + x + 7) == '<' || *(big_buffer + x + 7) == '"')) {
+		    for(x+=7; //skip spaces after keyword
+			x < total_size_read && (*(big_buffer+x) == ' ' || *(big_buffer+x) == '\t');
+			x++);
+		    char term = *(big_buffer + x);
+		    if(term == '"');
+		    else if(term == '<')
+			term = '>';
+		    else
+			continue; //wtf?
+		    x++;
+
+		    int inc_len;
+		    for(inc_len = 0; *(big_buffer + x + inc_len) != term &&
+                                     !QMAKE_EOL(*(big_buffer + x + inc_len)); inc_len++);
+		    *(big_buffer + x + inc_len) = '\0';
+		    inc = big_buffer + x;
+		} else if(total_size_read >= x + 14 && !strncmp(big_buffer + x,  "qmake_warning ", 14)) {
+		    for(x+=14; //skip spaces after keyword
+			x < total_size_read && (*(big_buffer+x) == ' ' || *(big_buffer+x) == '\t');
+			x++);
+		    char term = 0;
+		    if(*(big_buffer + x) == '"')
+			term = '"';
+		    if(*(big_buffer + x) == '\'')
+			term = '\'';
+		    if(term)
+			x++;
+
+		    int msg_len;
+		    for(msg_len = 0; (term && *(big_buffer + x + msg_len) != term) &&
+                                     !QMAKE_EOL(*(big_buffer + x + msg_len)); msg_len++);
+                    const char saved_term = *(big_buffer + x + msg_len);
+		    *(big_buffer + x + msg_len) = '\0';
+		    QString msg = big_buffer + x;
+		    debug_msg(0, "%s:%d qmake_warning -- %s", fix_env_fn.latin1(),
+			      line_count, msg.latin1());
+		    *(big_buffer + x + msg_len) = saved_term; //put it back
+		}
+	    }
+	} else if(ui_file) {
+	    // skip whitespaces
+	    while(x < total_size_read &&
+		  (*(big_buffer+x) == ' ' || *(big_buffer+x) == '\t'))
+		x++;
+	    if(*(big_buffer + x) == '<') {
+		x++;
+		if(total_size_read >= x + 12 && !strncmp(big_buffer + x, "includehint", 11) &&
+		    (*(big_buffer + x + 11) == ' ' || *(big_buffer + x + 11) == '>')) {
+		    for(x += 11; *(big_buffer + x) != '>'; x++);
+		    int inc_len = 0;
+		    for(x += 1 ; *(big_buffer + x + inc_len) != '<'; inc_len++);
+		    *(big_buffer + x + inc_len) = '\0';
+		    inc = big_buffer + x;
+		} else if(total_size_read >= x + 13 && !strncmp(big_buffer + x, "customwidget", 12) &&
+			  (*(big_buffer + x + 12) == ' ' || *(big_buffer + x + 12) == '>')) {
+		    for(x += 13; *(big_buffer + x) != '>'; x++); //skip up to >
+		    while(x < total_size_read) {
+			for(x++; *(big_buffer + x) != '<'; x++); //skip up to <
+			x++;
+			if(total_size_read >= x + 7 && !strncmp(big_buffer+x, "header", 6) &&
+			   (*(big_buffer + x + 6) == ' ' || *(big_buffer + x + 6) == '>')) {
+			    for(x += 7; *(big_buffer + x) != '>'; x++); //skip up to >
+			    int inc_len = 0;
+			    for(x += 1 ; *(big_buffer + x + inc_len) != '<'; inc_len++);
+			    *(big_buffer + x + inc_len) = '\0';
+			    inc = big_buffer + x;
+			    break;
+			} else if(total_size_read >= x + 14 && !strncmp(big_buffer+x, "/customwidget", 13) &&
+				  (*(big_buffer + x + 13) == ' ' || *(big_buffer + x + 13) == '>')) {
+			    x += 14;
+			    break;
+			}
+		    }
+		} else if(total_size_read >= x + 8 && !strncmp(big_buffer + x, "include", 7) &&
+		    (*(big_buffer + x + 7) == ' ' || *(big_buffer + x + 7) == '>')) {
+		    for(x += 8; *(big_buffer + x) != '>'; x++) {
+			if(total_size_read >= x + 9 && *(big_buffer + x) == 'i' &&
+			   !strncmp(big_buffer + x, "impldecl", 8)) {
+			    for(x += 8; *(big_buffer + x) != '='; x++);
+			    if(*(big_buffer + x) != '=')
+				continue;
+			    for(x++; *(big_buffer+x) == '\t' || *(big_buffer+x) == ' '; x++);
+			    char quote = 0;
+			    if(*(big_buffer+x) == '\'' || *(big_buffer+x) == '"') {
+				quote = *(big_buffer + x);
+				x++;
+			    }
+			    int val_len;
+			    for(val_len = 0; TRUE; val_len++) {
+				if(quote) {
+				    if(*(big_buffer+x+val_len) == quote)
+					break;
+				} else if(*(big_buffer + x + val_len) == '>' ||
+					  *(big_buffer + x + val_len) == ' ') {
+				    break;
+				}
+			    }
+			    char saved = *(big_buffer + x + val_len);
+			    *(big_buffer + x + val_len) = '\0';
+			    QString where = big_buffer + x;
+			    *(big_buffer + x + val_len) = saved;
+			    if(where == "in implementation") {
+				QString cpp = fn.left(fn.length() - Option::ui_ext.length()) +
+						      Option::cpp_ext.first();
+				outdeps = &findDependencies(cpp);
+			    }
+			}
+		    }
+		    int inc_len = 0;
+		    for(x += 1 ; *(big_buffer + x + inc_len) != '<'; inc_len++);
+		    *(big_buffer + x + inc_len) = '\0';
+		    inc = big_buffer + x;
+		}
+	    }
+	}
+
+	if(!inc.isEmpty()) {
+	    bool from_source_dir = TRUE;
+	    debug_msg(5, "%s:%d Found dependency to %s", fix_env_fn.latin1(),
+		      line_count, inc.latin1());
+	    if(!project->isEmpty("SKIP_DEPENDS")) {
+		bool found = FALSE;
+		QStringList &nodeplist = project->values("SKIP_DEPENDS");
+		for(QStringList::Iterator it = nodeplist.begin();
+		    it != nodeplist.end(); ++it) {
+		    QRegExp regx((*it));
+		    if(regx.search(inc) != -1) {
+			found = TRUE;
+			break;
+		    }
+		}
+		if(found)
+		    continue;
+	    }
+	    QString fqn;
+	    if(project->isEmpty("QMAKE_ABSOLUTE_SOURCE_PATH") &&
+	       !stat(fix_env_fndir + inc, &fst) && !S_ISDIR(fst.st_mode)) {
+		fqn = fndir + inc;
+		goto handle_fqn;
+	    } else if(project->isEmpty("QMAKE_ABSOLUTE_SOURCE_PATH") &&
+	       !stat(inc, &fst) && !S_ISDIR(fst.st_mode)) {
+		fqn = inc;
+		goto handle_fqn;
+	    } else {
+		if((Option::target_mode == Option::TARG_MAC9_MODE && inc.find(':')) ||
+		   (Option::target_mode == Option::TARG_WIN_MODE && inc[1] != ':') ||
+		   ((Option::target_mode == Option::TARG_UNIX_MODE ||
+		     Option::target_mode == Option::TARG_QNX6_MODE ||
+		     Option::target_mode == Option::TARG_MACX_MODE) &&
+		    inc[0] != '/')) {
+		    for(MakefileDependDir *mdd = dirs.first(); mdd; mdd = dirs.next() ) {
+			if(!stat(mdd->local_dir + QDir::separator() + inc, &fst) &&
+			   !S_ISDIR(fst.st_mode)) {
+			    fqn = mdd->real_dir + QDir::separator() + inc;
+			    goto handle_fqn;
+			}
+		    }
+		}
+	    }
+	    if(fqn.isEmpty() && Option::mkfile::do_dep_heuristics) {
+		//these are some hacky heuristics it will try to do on an include
+		//however these can be turned off at runtime, I'm not sure how
+		//reliable these will be, most likely when problems arise turn it off
+		//and see if they go away..
+		if(depHeuristics.contains(inc)) {
+		    fqn = depHeuristics[inc];
+		    from_source_dir = FALSE;
+		} else if(Option::mkfile::do_dep_heuristics) { //some heuristics..
+		    //is it a file from a .ui?
+		    QString inc_file = inc.section(Option::dir_sep, -1);
+		    int extn = inc_file.findRev('.');
+		    if(extn != -1 &&
+		       (inc_file.right(inc_file.length()-extn) == Option::cpp_ext.first() ||
+			inc_file.right(inc_file.length()-extn) == Option::h_ext.first())) {
+			QString uip = inc_file.left(extn) + Option::ui_ext;
+			QStringList uil = project->variables()["FORMS"];
+			for(QStringList::Iterator it = uil.begin(); it != uil.end(); ++it) {
+			    if((*it).section(Option::dir_sep, -1) == uip) {
+				if(!project->isEmpty("UI_DIR"))
+				    fqn = project->first("UI_DIR");
+				else if(!project->isEmpty("UI_HEADERS_DIR"))
+				    fqn = project->first("UI_HEADERS_DIR");
+				else
+				    fqn = (*it).section(Option::dir_sep, 0, -2);
+				if(!fqn.isEmpty() && !fqn.endsWith(Option::dir_sep))
+				    fqn += Option::dir_sep;
+				fqn += inc_file;
+				from_source_dir = FALSE; //uics go in the output_dir (so don't fix them)
+				fqn = fileFixify(fqn, QDir::currentDirPath(), Option::output_dir);
+				goto cache_fqn;
+			    }
+			}
+		    }
+		    if(project->isActiveConfig("lex_included")) { //is this the lex file?
+			QString rhs = Option::lex_mod + Option::cpp_ext.first();
+			if(inc.endsWith(rhs)) {
+			    QString lhs = inc.left(inc.length() - rhs.length()) + Option::lex_ext;
+			    QStringList ll = project->variables()["LEXSOURCES"];
+			    for(QStringList::Iterator it = ll.begin(); it != ll.end(); ++it) {
+				QString s = (*it), d;
+				int slsh = s.findRev(Option::dir_sep);
+				if(slsh != -1) {
+				    d = s.left(slsh + 1);
+				    s = s.right(s.length() - slsh - 1);
+				}
+				if(!project->isEmpty("QMAKE_ABSOLUTE_SOURCE_PATH"))
+				    d = project->first("QMAKE_ABSOLUTE_SOURCE_PATH");
+				if(s == lhs) {
+				    fqn = d + inc;
+				    from_source_dir = FALSE;  //uics go in the output_dir (so don't fix them)
+				    fqn = fileFixify(fqn, QDir::currentDirPath(), Option::output_dir);
+				    goto cache_fqn;
+				}
+			    }
+			}
+		    }
+		    { //is it from a .y?
+			QString rhs = Option::yacc_mod + Option::h_ext.first();
+			if(inc.endsWith(rhs)) {
+			    QString lhs = inc.left(inc.length() - rhs.length()) + Option::yacc_ext;
+			    QStringList yl = project->variables()["YACCSOURCES"];
+			    for(QStringList::Iterator it = yl.begin(); it != yl.end(); ++it) {
+				QString s = (*it), d;
+				int slsh = s.findRev(Option::dir_sep);
+				if(slsh != -1) {
+				    d = s.left(slsh + 1);
+				    s = s.right(s.length() - slsh - 1);
+				}
+				if(!project->isEmpty("QMAKE_ABSOLUTE_SOURCE_PATH"))
+				    d = project->first("QMAKE_ABSOLUTE_SOURCE_PATH");
+				if(s == lhs) {
+				    fqn = d + inc;
+				    from_source_dir = FALSE;  //uics go in the output_dir (so don't fix them)
+				    fqn = fileFixify(fqn, QDir::currentDirPath(), Option::output_dir);
+				    goto cache_fqn;
+				}
+			    }
+			}
+		    }
+		    if( mocAware() &&		    //is it a moc file?
+		       ( inc.endsWith(Option::cpp_ext.first()) || inc.endsWith(Option::cpp_moc_ext) )
+		       || ( (Option::cpp_ext.first() != Option::h_moc_ext) && inc.endsWith(Option::h_moc_ext) )) {
+			QString mocs[] = { QString("_HDRMOC"), QString("_SRCMOC"), QString::null };
+			for(int moc = 0; !mocs[moc].isNull(); moc++) {
+			    QStringList &l = project->variables()[mocs[moc]];
+			    for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+				QString file = Option::fixPathToTargetOS((*it));
+				if(file.section(Option::dir_sep, -(inc.contains('/')+1)) == inc) {
+				    fqn = (*it);
+				    if(mocs[moc] == "_HDRMOC") {
+					//Since it is include, no need to link it in as well
+					project->variables()["_SRCMOC"].append((*it));
+					l.remove(it);
+				    } else if(!findMocSource(fqn).endsWith(fileFixify(fn))) {
+					/* Not really a very good test, but this will at least avoid
+					   confusion if it really does happen (since tmake/qmake
+					   previously didn't even allow this the test is mostly accurate) */
+					warn_msg(WarnLogic,
+						 "Found potential multiple MOC include %s (%s) in '%s'",
+						 inc.latin1(), fqn.latin1(), fix_env_fn.latin1());
+				    }
+				    from_source_dir = FALSE; //mocs go in the output_dir (so don't fix them)
+				    goto cache_fqn;
+				}
+			    }
+			}
+		    }
+		    fqn = findDependency(inc); //all else fails..
+		cache_fqn:
+		    if(from_source_dir) {
+			fqn = fileFixify(fqn);
+			from_source_dir = FALSE;
+		    }
+		    depHeuristics.insert(inc, fqn);
+		}
+	    }
+	handle_fqn:
+	    if(fqn.isEmpty()) //I give up
+	      continue;
+	    fqn = Option::fixPathToTargetOS(fqn, FALSE);
+	    if(from_source_dir)
+		fqn = fileFixify(fqn);
+	    debug_msg(4, "Resolved dependency of %s to %s", inc.latin1(), fqn.latin1());
+	    if(outdeps && outdeps->findIndex(fqn) == -1)
+		outdeps->append(fqn);
+	}
+	//read past new line now..
+	for( ; x < total_size_read && !QMAKE_EOL(*(big_buffer + x)); x++);
+        line_count++;
+    }
+
+    if(recurse) {
+	for(QStringList::Iterator fnit = fndeps.begin(); fnit != fndeps.end(); ++fnit) {
+	    generateDependencies(dirs, (*fnit), recurse);
+	    QStringList &deplist = findDependencies((*fnit));
+	    for(QStringList::Iterator it = deplist.begin(); it != deplist.end(); ++it) 
+		if(fndeps.findIndex((*it)) == -1 && (*it) != fn)
+		    fndeps.append((*it));
+	}
+    }
+    debug_msg(2, "Dependencies: %s -> %s", fn.latin1(), fndeps.join(" :: ").latin1());
+    return TRUE;
+}
+
+void
+MakefileGenerator::initOutPaths()
+{
+    if(init_opath_already)
+	return;
+    init_opath_already = TRUE;
+    QMap<QString, QStringList> &v = project->variables();
+	if(!v.contains("QMAKE_ABSOLUTE_SOURCE_PATH")) {
+	    if(Option::mkfile::do_cache && !Option::mkfile::cachefile.isEmpty() &&
+	       v.contains("QMAKE_ABSOLUTE_SOURCE_ROOT")) {
+		QString root = v["QMAKE_ABSOLUTE_SOURCE_ROOT"].first();
+		root = Option::fixPathToTargetOS( root );
+		if(!root.isEmpty()) {
+		    QFileInfo fi(Option::mkfile::cachefile);
+		    if(!fi.convertToAbs()) {
+			QString cache_r = fi.dirPath(), pwd = Option::output_dir;
+			if ( pwd.startsWith(cache_r) && !pwd.startsWith(root) ) {
+			    pwd = Option::fixPathToTargetOS(root + pwd.mid(cache_r.length()));
+			    if(QFile::exists(pwd))
+				v.insert("QMAKE_ABSOLUTE_SOURCE_PATH", pwd);
+			}
+		    }
+		}
+	    }
+	}
+	if(!v["QMAKE_ABSOLUTE_SOURCE_PATH"].isEmpty()) {
+	    QString &asp = v["QMAKE_ABSOLUTE_SOURCE_PATH"].first();
+	    asp = Option::fixPathToTargetOS( asp );
+	    if(asp.isEmpty() || asp == Option::output_dir) //if they're the same, why bother?
+		v["QMAKE_ABSOLUTE_SOURCE_PATH"].clear();
+	}
+	QString currentDir = QDir::currentDirPath();
+	QString dirs[] = { QString("OBJECTS_DIR"), QString("MOC_DIR"), QString("UI_HEADERS_DIR"),
+			   QString("UI_SOURCES_DIR"), QString("UI_DIR"), QString("DESTDIR"),
+			   QString("SUBLIBS_DIR"), QString("DLLDESTDIR"), QString::null };
+	for(int x = 0; dirs[x] != QString::null; x++) {
+	    if ( !v[dirs[x]].isEmpty() ) {
+		QString orig_path = v[dirs[x]].first();
+#ifdef Q_WS_WIN
+		// We don't want to add a separator for DLLDESTDIR on Windows
+		if (!(dirs[x] == "DLLDESTDIR"))
+#endif
+		{
+		    QString &path = v[dirs[x]].first();
+		    path = fileFixify(path, Option::output_dir, Option::output_dir);
+		    if(path.right(Option::dir_sep.length()) != Option::dir_sep)
+			path += Option::dir_sep;
+		}
+		if(noIO())
+		    continue;
+
+		QString path = project->first(dirs[x]); //not to be changed any further
+		path = Option::fixPathToTargetOS(fileFixify(path, QDir::currentDirPath(), Option::output_dir));
+		debug_msg(3, "Fixed output_dir %s (%s) into %s (%s)", dirs[x].latin1(), orig_path.latin1(),
+			  v[dirs[x]].join("::").latin1(), path.latin1());
+
+		QDir d;
+		if(path.startsWith(Option::dir_sep)) {
+		    d.cd(Option::dir_sep);
+		    path = path.right(path.length() - 1);
+		}
+#ifdef Q_WS_WIN
+		bool driveExists = TRUE;
+		if ( !QDir::isRelativePath( path ) ) {
+		    if ( QFile::exists( path.left( 3 ) ) ) {
+			d.cd( path.left( 3 ) );
+			path = path.right( path.length() - 3 );
+		    } else {
+			warn_msg(WarnLogic, "%s: Cannot access drive '%s' (%s)", dirs[x].latin1(),
+			    path.left( 3 ).latin1(), path.latin1() );
+			driveExists = FALSE;
+		    }
+		}
+		if ( driveExists ) {
+#endif
+		    QStringList subs = QStringList::split(Option::dir_sep, path);
+		    for(QStringList::Iterator subit = subs.begin(); subit != subs.end(); ++subit) {
+			if(!d.cd(*subit)) {
+			    d.mkdir((*subit));
+			    if ( d.exists( (*subit) ) )
+				d.cd((*subit));
+			    else {
+				warn_msg(WarnLogic, "%s: Cannot access directory '%s' (%s)", dirs[x].latin1(),
+				    (*subit).latin1(), path.latin1() );
+				break;
+			    }
+			}
+		    }
+#ifdef Q_WS_WIN
+		}
+#endif
+	    }
+	}
+	if ( !v["DESTDIR"].isEmpty() ) {
+	    QDir d(v["DESTDIR"].first());
+	    if(Option::fixPathToLocalOS(d.absPath()) == Option::fixPathToLocalOS(Option::output_dir))
+		v.remove("DESTDIR");
+	}
+	QDir::current().cd( currentDir );
+}
+
+void
+MakefileGenerator::init()
+{
+    initOutPaths();
+    if(init_already)
+	return;
+    init_already = TRUE;
+
+    QMap<QString, QStringList> &v = project->variables();
+    QString paths[] = { QString("SOURCES"), QString("FORMS"), QString("YACCSOURCES"), QString("INCLUDEPATH"),
+			QString("HEADERS"), QString("HEADERS_ORIG"), QString("LEXSOURCES"),
+			QString("QMAKE_INTERNAL_INCLUDED_FILES"),
+			QString("PRECOMPILED_HEADER"), QString::null };
+    for(int y = 0; paths[y] != QString::null; y++) {
+	QStringList &l = v[paths[y]];
+	for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	    if ((*it).isEmpty())
+		continue;
+	    if(QFile::exists((*it)))
+		(*it) = fileFixify((*it));
+	}
+    }
+
+    /* get deps and mocables */
+    QDict<void> cache_found_files;
+    QString cache_file(".qmake.internal.cache");
+    if(!project->isEmpty("QMAKE_INTERNAL_CACHE_FILE"))
+	cache_file = Option::fixPathToLocalOS(project->first("QMAKE_INTERNAL_CACHE_FILE"));
+    if(cache_file.find(QDir::separator()) == -1) //guess they know what they are doing..
+	cache_file.prepend(Option::output_dir + QDir::separator());
+    if((Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT ||
+	Option::mkfile::do_deps || Option::mkfile::do_mocs) && !noIO()) {
+	QPtrList<MakefileDependDir> deplist;
+	deplist.setAutoDelete(TRUE);
+	if((Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT || Option::mkfile::do_deps) &&
+	   doDepends()) {
+	    QStringList incDirs = v["DEPENDPATH"] + v["QMAKE_ABSOLUTE_SOURCE_PATH"];
+	    if(project->isActiveConfig("depend_includepath"))
+		incDirs += v["INCLUDEPATH"];
+	    for(QStringList::Iterator it = incDirs.begin(); it != incDirs.end(); ++it) {
+		QString r = (*it), l = Option::fixPathToLocalOS((*it));
+		deplist.append(new MakefileDependDir(r.replace("\"",""),
+						     l.replace("\"","")));
+	    }
+	    debug_msg(1, "Dependency Directories: %s", incDirs.join(" :: ").latin1());
+	    if(Option::output.name() != "-" && project->isActiveConfig("qmake_cache")) {
+		QFile cachef(cache_file);
+		if(cachef.open(IO_ReadOnly | IO_Translate)) {
+		    QFileInfo cachefi(cache_file);
+		    debug_msg(2, "Trying internal cache information: %s", cache_file.latin1());
+		    QTextStream cachet(&cachef);
+		    QString line, file;
+		    enum { CacheInfo, CacheDepend, CacheMoc } state = CacheInfo;
+		    while (!cachet.eof()) {
+			line = cachet.readLine().stripWhiteSpace();
+			int sep = line.find('=');
+			if(line == "[depend]") {
+			    state = CacheDepend;
+			} else if(line == "[mocable]") {
+			    state = CacheMoc;
+			} else if(line == "[check]") {
+			    state = CacheInfo;
+			} else if(!line.isEmpty() && sep != -1) {
+			    file = line.left(sep).stripWhiteSpace();
+			    line = line.right(line.length() - sep - 1).stripWhiteSpace();
+			    if(state == CacheInfo) {
+				if(file == "QMAKE_CACHE_VERSION") {
+				    if(line != qmake_version())
+					break;
+				} else {
+				    const QStringList &l = project->variables()[file];
+				    if(!l.isEmpty() && !line.isEmpty() && l.join(" ") != line)
+					break;
+				}
+			    } else if(state == CacheDepend) {
+				bool found = (bool)cache_found_files[file];
+				QStringList files = QStringList::split(" ", line);
+				if(!found) {
+				    QFileInfo fi(fileFixify(file, QDir::currentDirPath(), Option::output_dir));
+				    if(fi.exists() && fi.lastModified() < cachefi.lastModified()) {
+					cache_found_files.insert(file, (void *)1);
+					found = TRUE;
+				    }
+				}
+				if(found) {
+				    for(QStringList::Iterator dep_it = files.begin();
+					dep_it != files.end(); ++dep_it) {
+					if(!cache_found_files[(*dep_it)]) {
+					    QFileInfo fi(fileFixify((*dep_it), QDir::currentDirPath(), Option::output_dir));
+					    if(fi.exists() &&
+					       fi.lastModified() < cachefi.lastModified()) {
+						cache_found_files.insert((*dep_it), (void *)1);
+					    } else {
+						found = FALSE;
+						break;
+					    }
+					}
+				    }
+				    if(found) {
+					debug_msg(2, "Dependencies (cached): %s -> %s", file.latin1(),
+						  files.join(" :: ").latin1());
+					findDependencies(file) = files;
+					setProcessedDependencies(file, TRUE);
+				    }
+				}
+			    } else {
+				void *found = cache_found_files[file];
+				if(found != (void *)2) {
+				    if(found) {
+					cache_found_files.replace(file, (void *)2);
+				    } else {
+					QFileInfo fi(fileFixify(file, QDir::currentDirPath(), Option::output_dir));
+					if(fi.exists() && fi.lastModified() < cachefi.lastModified()) {
+					    cache_found_files.insert(file, (void *)2);
+					    found = (void*)1;
+					}
+				    }
+				}
+				if(found && line != "*qmake_ignore*") {
+				    int ext_len = file.length() - file.findRev('.');
+				    bool cpp_ext = FALSE;
+				    for(QStringList::Iterator cppit = Option::cpp_ext.begin();
+					cppit != Option::cpp_ext.end(); ++cppit) {
+					if((cpp_ext = (file.right(ext_len) == (*cppit))))
+					    break;
+				    }
+				    if(cpp_ext) {
+					project->variables()["_SRCMOC"].append(line);
+				    } else if(project->variables()["HEADERS"].findIndex(file) != -1) {
+					for(QStringList::Iterator hit = Option::h_ext.begin();
+					    hit != Option::h_ext.end(); ++hit) {
+					    if((file.right(ext_len) == (*hit))) {
+						project->variables()["_HDRMOC"].append(line);
+						break;
+					    }
+					}
+				    }
+				    debug_msg(2, "Mocgen (cached): %s -> %s", file.latin1(),
+					      line.latin1());
+				    mocablesToMOC[file] = line;
+				    mocablesFromMOC[line] = file;
+				}
+			    }
+			}
+		    }
+		    cachef.close();
+		}
+	    }
+	}
+	if(!noIO()) {
+	    QString sources[] = { QString("OBJECTS"), QString("LEXSOURCES"), QString("YACCSOURCES"),
+				  QString("HEADERS"), QString("SOURCES"), QString("FORMS"), 
+				  QString("PRECOMPILED_HEADER"), QString::null };
+	    depHeuristics.clear();
+	    bool write_cache = FALSE, read_cache = QFile::exists(cache_file);
+	    int x;
+	    for(x = 0; sources[x] != QString::null; x++) {
+		QStringList vpath, &l = v[sources[x]];
+		for(QStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) {
+		    if(!(*val_it).isEmpty()) {
+			QString file = fileFixify((*val_it), QDir::currentDirPath(), Option::output_dir);
+			if(!QFile::exists(file)) {
+			    bool found = FALSE;
+			    if(QDir::isRelativePath((*val_it))) {
+				if(vpath.isEmpty())
+				    vpath = v["VPATH_" + sources[x]] + v["VPATH"] +
+					    v["QMAKE_ABSOLUTE_SOURCE_PATH"] + v["DEPENDPATH"];
+
+				for(QStringList::Iterator vpath_it = vpath.begin();
+				    vpath_it != vpath.end(); ++vpath_it) {
+				    QString real_dir = Option::fixPathToLocalOS((*vpath_it));
+				    if(QFile::exists(real_dir + QDir::separator() + (*val_it))) {
+					QString dir = (*vpath_it);
+					if(dir.right(Option::dir_sep.length()) != Option::dir_sep)
+					    dir += Option::dir_sep;
+					(*val_it) = fileFixify(dir + (*val_it));
+					found = TRUE;
+					debug_msg(1, "Found file through vpath %s -> %s",
+						  file.latin1(), (*val_it).latin1());
+					break;
+				    }
+				}
+			    }
+			    if(!found) {
+				QString dir, regex = (*val_it), real_dir;
+				if(regex.findRev(Option::dir_sep) != -1) {
+				    dir = regex.left(regex.findRev(Option::dir_sep) + 1);
+				    real_dir = fileFixify(Option::fixPathToLocalOS(dir),
+							  QDir::currentDirPath(), Option::output_dir);
+				    regex = regex.right(regex.length() - dir.length());
+				}
+				if(real_dir.isEmpty() || QFile::exists(real_dir)) {
+				    QDir d(real_dir, regex);
+				    if(!d.count()) {
+					debug_msg(1, "%s:%d Failure to find %s in vpath (%s)",
+						  __FILE__, __LINE__,
+						  (*val_it).latin1(), vpath.join("::").latin1());
+					warn_msg(WarnLogic, "Failure to find: %s", (*val_it).latin1());
+					continue;
+				    } else {
+					for(int i = 0; i < (int)d.count(); i++) {
+					    QString file = fileFixify(dir + d[i]);
+					    if(i == (int)d.count() - 1)
+						(*val_it) = file;
+					    else
+						l.insert(val_it, file);
+					}
+				    }
+				} else {
+				    debug_msg(1, "%s:%d Cannot match %s%c%s, as %s does not exist.",
+					      __FILE__, __LINE__,
+					      real_dir.latin1(), QDir::separator(), regex.latin1(),
+					      real_dir.latin1());
+				    warn_msg(WarnLogic, "Failure to find: %s", (*val_it).latin1());
+				}
+			    }
+			}
+		    }
+		}
+	    }
+	    for(x = 0; sources[x] != QString::null; x++) {
+	        QStringList &l = v[sources[x]];
+	        for(QStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) {
+		    bool found_cache_moc = FALSE, found_cache_dep = FALSE;
+		    if(read_cache && Option::output.name() != "-" &&
+			    project->isActiveConfig("qmake_cache")) {
+			if(processedDependencies((*val_it)))
+			    found_cache_dep = TRUE;
+			if(cache_found_files[(*val_it)] == (void *)2)
+			    found_cache_moc = TRUE;
+			if(!found_cache_moc || !found_cache_dep)
+			    write_cache = TRUE;
+		    }
+		    /* Do moc before dependency checking since some includes can come from
+		       moc_*.cpp files */
+		    if(found_cache_moc) {
+			QString fixed_file(fileFixify((*val_it), QDir::currentDirPath(), Option::output_dir));
+			QString moc = findMocDestination(fixed_file);
+			if(!moc.isEmpty()) {
+			    for(QStringList::Iterator cppit = Option::cpp_ext.begin();
+				    cppit != Option::cpp_ext.end(); ++cppit) {
+				if(fixed_file.endsWith((*cppit))) {
+				    QStringList &deps = findDependencies(fixed_file);
+				    if(!deps.contains(moc))
+					deps.append(moc);
+				    break;
+				}
+			    }
+			}
+		    } else if(mocAware() && (sources[x] == "SOURCES" || sources[x] == "HEADERS") &&
+			    (Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT ||
+			     Option::mkfile::do_mocs)) {
+			generateMocList((*val_it));
+		    }
+		    if(!found_cache_dep && sources[x] != "OBJECTS") {
+			debug_msg(5, "Looking for dependencies for %s", (*val_it).latin1());
+			generateDependencies(deplist, (*val_it), doDepends());
+		    }
+		}
+	    }
+	    if(project->isActiveConfig("qmake_cache") && (write_cache || !read_cache)) {
+		QFile cachef(cache_file);
+		if(cachef.open(IO_WriteOnly | IO_Translate)) {
+		    debug_msg(2, "Writing internal cache information: %s", cache_file.latin1());
+		    QTextStream cachet(&cachef);
+		    cachet << "[check]" << "\n"
+			   << "QMAKE_CACHE_VERSION = " << qmake_version() << "\n"
+			   << "QMAKE_ABSOLUTE_SOURCE_PATH = " << var("QMAKE_ABSOLUTE_SOURCE_PATH") << "\n"
+			   << "MOC_DIR = " << var("MOC_DIR") << "\n"
+			   << "UI_DIR = " <<  var("UI_DIR") << "\n"
+			   << "UI_HEADERS_DIR = " <<  var("UI_HEADERS_DIR") << "\n"
+			   << "UI_SOURCES_DIR = " <<  var("UI_SOURCES_DIR") << "\n";
+		    cachet << "[depend]" << endl;
+		    for(QMap<QString, QStringList>::Iterator it = depends.begin();
+			it != depends.end(); ++it)
+			cachet << dependencyKey(it.key()) << " = " << it.data().join(" ") << endl;
+		    cachet << "[mocable]" << endl;
+		    QString mc, moc_sources[] = { QString("HEADERS"), QString("SOURCES"), QString::null };
+		    for(int x = 0; moc_sources[x] != QString::null; x++) {
+			QStringList &l = v[moc_sources[x]];
+			for(QStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) {
+			    QString f = fileFixify((*val_it));
+			    if(!f.isEmpty()) {
+				mc = mocablesToMOC[f];
+				if(mc.isEmpty())
+				    mc = "*qmake_ignore*";
+				cachet << f << " = " << mc << endl;
+			    }
+			}
+		    }
+		    cachef.close();
+		}
+	    }
+	}
+    }
+    v["OBJECTS"] = createObjectList("SOURCES") + v["OBJECTS"]; // init variables
+
+    //lex files
+    {
+	QStringList &impls = v["LEXIMPLS"];
+	QStringList &l = v["LEXSOURCES"];
+	for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	    QString dir;
+	    QFileInfo fi((*it));
+	    if(fi.dirPath() != ".")
+		dir = fi.dirPath() + Option::dir_sep;
+	    dir = fileFixify(dir, QDir::currentDirPath(), Option::output_dir);
+	    if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep)
+		dir += Option::dir_sep;
+	    QString impl = dir + fi.baseName(TRUE) + Option::lex_mod + Option::cpp_ext.first();
+	    logicWarn(impl, "SOURCES");
+	    logicWarn(impl, "SOURCES");
+	    impls.append(impl);
+	    if( ! project->isActiveConfig("lex_included")) {
+		v["SOURCES"].append(impl);
+		// attribute deps of lex file to impl file
+		QStringList &lexdeps = findDependencies((*it));
+		QStringList &impldeps = findDependencies(impl);
+		for(QStringList::ConstIterator d = lexdeps.begin(); d != lexdeps.end(); ++d) {
+		    if(!impldeps.contains(*d))
+			impldeps.append(*d);
+		}
+		lexdeps.clear();
+	    }
+	}
+	if( ! project->isActiveConfig("lex_included"))
+	    v["OBJECTS"] += (v["LEXOBJECTS"] = createObjectList("LEXIMPLS"));
+    }
+    //yacc files
+    {
+	QStringList &decls = v["YACCCDECLS"], &impls = v["YACCIMPLS"];
+	QStringList &l = v["YACCSOURCES"];
+	for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	    QString dir;
+	    QFileInfo fi((*it));
+	    if(fi.dirPath() != ".")
+		dir = fi.dirPath() + Option::dir_sep;
+	    dir = fileFixify(dir, QDir::currentDirPath(), Option::output_dir);
+	    if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep)
+		dir += Option::dir_sep;
+	    QString impl = dir + fi.baseName(TRUE) + Option::yacc_mod + Option::cpp_ext.first();
+	    logicWarn(impl, "SOURCES");
+	    QString decl = dir + fi.baseName(TRUE) + Option::yacc_mod + Option::h_ext.first();
+	    logicWarn(decl, "HEADERS");
+
+	    decls.append(decl);
+	    impls.append(impl);
+	    v["SOURCES"].append(impl);
+	    QStringList &impldeps = findDependencies(impl);
+	    impldeps.append(decl);
+	    // attribute deps of yacc file to impl file
+	    QStringList &yaccdeps = findDependencies((*it));
+	    for(QStringList::ConstIterator d = yaccdeps.begin(); d != yaccdeps.end(); ++d) {
+		if(!impldeps.contains(*d))
+		    impldeps.append(*d);
+	    }
+	    if( project->isActiveConfig("lex_included")) {
+		// is there a matching lex file ? Transfer its dependencies.
+		QString lexsrc = fi.baseName(TRUE) + Option::lex_ext;
+		if(fi.dirPath() != ".")
+		    lexsrc.prepend(fi.dirPath() + Option::dir_sep);
+		if(v["LEXSOURCES"].findIndex(lexsrc) != -1) {
+		    QString trg = dir + fi.baseName(TRUE) + Option::lex_mod + Option::cpp_ext.first();
+		    impldeps.append(trg);
+		    impldeps += findDependencies(lexsrc);
+		    depends[lexsrc].clear();
+		}
+	    }
+	    yaccdeps.clear();
+	}
+	v["OBJECTS"] += (v["YACCOBJECTS"] = createObjectList("YACCIMPLS"));
+    }
+
+    //UI files
+    {
+	QStringList &includepath = project->variables()["INCLUDEPATH"];
+	if(!project->isEmpty("UI_DIR"))
+	    includepath.append(project->first("UI_DIR"));
+	else if(!project->isEmpty("UI_HEADERS_DIR"))
+	    includepath.append(project->first("UI_HEADERS_DIR"));
+	QStringList &decls = v["UICDECLS"], &impls = v["UICIMPLS"];
+	QStringList &l = v["FORMS"];
+	for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	    QString impl, decl;
+	    QFileInfo fi(Option::fixPathToLocalOS((*it)));
+	    if ( !project->isEmpty("UI_DIR") ) {
+		impl = decl = project->first("UI_DIR");
+		QString d = fi.dirPath();
+		if( d == ".")
+		    d = QDir::currentDirPath();
+		d = fileFixify(d, QDir::currentDirPath(), Option::output_dir);
+		if(!includepath.contains(d))
+		    includepath.append(d);
+	    } else {
+		if(decl.isEmpty() && !project->isEmpty("UI_HEADERS_DIR"))
+		    decl = project->first("UI_HEADERS_DIR");
+		if(!decl.isEmpty() || (project->isEmpty("UI_HEADERS_DIR") &&
+				       !project->isEmpty("UI_SOURCES_DIR")) ) {
+		    QString d = fi.dirPath();
+		    if( d == ".")
+			d = QDir::currentDirPath();
+		    d = fileFixify(d, QDir::currentDirPath(), Option::output_dir);
+		    if(!includepath.contains(d))
+			includepath.append(d);
+		}
+		if(impl.isEmpty() && !project->isEmpty("UI_SOURCES_DIR"))
+		    impl = project->first("UI_SOURCES_DIR");
+		if(fi.dirPath() != ".") {
+		    if(impl.isEmpty())
+			impl = fi.dirPath() + Option::dir_sep;
+		    if(decl.isEmpty())
+			decl = fi.dirPath() + Option::dir_sep;
+		}
+	    }
+	    impl = fileFixify(impl, QDir::currentDirPath(), Option::output_dir);
+	    if(!impl.isEmpty() && !impl.endsWith(Option::dir_sep))
+		impl += Option::dir_sep;
+	    impl += fi.baseName(TRUE) + Option::cpp_ext.first();
+	    if(Option::output_dir != QDir::currentDirPath() &&
+	       project->isEmpty("UI_DIR") && project->isEmpty("UI_HEADERS_DIR")) {
+		QString decl_fixed = fileFixify(decl, QDir::currentDirPath(), Option::output_dir);
+		if(!includepath.contains(decl_fixed))
+		    includepath.append(decl_fixed);
+		if(!includepath.contains(decl))
+		    project->variables()["INCLUDEPATH"].append(decl);
+	    }
+	    decl = fileFixify(decl, QDir::currentDirPath(), Option::output_dir);
+	    if(!decl.isEmpty() && !decl.endsWith(Option::dir_sep))
+		decl += Option::dir_sep;
+	    decl += fi.baseName(TRUE) + Option::h_ext.first();
+	    logicWarn(impl, "SOURCES");
+	    logicWarn(decl, "HEADERS");
+	    decls.append(decl);
+	    impls.append(impl);
+	    findDependencies(impl).append(decl);
+
+	    QString mocable = Option::h_moc_mod + fi.baseName(TRUE) + Option::h_moc_ext;
+	    if(!v["MOC_DIR"].isEmpty())
+		mocable.prepend(v["MOC_DIR"].first());
+	    else if(fi.dirPath() != ".")
+		mocable.prepend(fi.dirPath() + Option::dir_sep);
+	    logicWarn(mocable, "SOURCES");
+	    mocablesToMOC[cleanFilePath(decl)] = mocable;
+	    mocablesFromMOC[cleanFilePath(mocable)] = decl;
+	    v["_UIMOC"].append(mocable);
+	}
+	v["OBJECTS"] += (v["UICOBJECTS"] = createObjectList("UICDECLS"));
+    }
+
+    //Translation files
+    if(!project->isEmpty("TRANSLATIONS")) {
+	QStringList &trf = project->variables()["TRANSLATIONS"];
+	for(QStringList::Iterator it = trf.begin(); it != trf.end(); ++it) {
+	    (*it) = Option::fixPathToLocalOS((*it));
+	}
+    }
+
+    //Image files
+    if(!project->isEmpty("IMAGES")) {
+	if(project->isEmpty("QMAKE_IMAGE_COLLECTION"))
+	    v["QMAKE_IMAGE_COLLECTION"].append("qmake_image_collection" + Option::cpp_ext.first());
+	QString imgfile = project->first("QMAKE_IMAGE_COLLECTION");
+	Option::fixPathToTargetOS(imgfile);
+	if(!project->isEmpty("UI_DIR") || !project->isEmpty("UI_SOURCES_DIR")) {
+	    if(imgfile.find(Option::dir_sep) != -1)
+		imgfile = imgfile.right(imgfile.findRev(Option::dir_sep) + 1);
+	    imgfile.prepend( (project->isEmpty("UI_DIR") ? project->first("UI_SOURCES_DIR") :
+			    project->first("UI_DIR")) );
+	    v["QMAKE_IMAGE_COLLECTION"] = QStringList(imgfile);
+	}
+	logicWarn(imgfile, "SOURCES");
+	if(!noIO()) {
+	    QStringList &l = v["IMAGES"];
+	    for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+		if(!QFile::exists((*it))) {
+		    warn_msg(WarnLogic, "Failure to open: %s", (*it).latin1());
+		    continue;
+		}
+		findDependencies(imgfile).append(fileFixify((*it)));
+	    }
+	}
+	v["OBJECTS"] += (v["IMAGEOBJECTS"] = createObjectList("QMAKE_IMAGE_COLLECTION"));
+    }
+    if(Option::output_dir != QDir::currentDirPath())
+	project->variables()["INCLUDEPATH"].append(fileFixify(Option::output_dir, Option::output_dir,
+							      Option::output_dir));
+
+    //moc files
+    if ( mocAware() ) {
+	if(!project->isEmpty("MOC_DIR"))
+	    project->variables()["INCLUDEPATH"].append(project->first("MOC_DIR"));
+	if ( Option::h_moc_ext == Option::cpp_ext.first() )
+	    v["OBJMOC"] = createObjectList("_HDRMOC") + createObjectList("_UIMOC");
+
+	QStringList &l = v["SRCMOC"];
+	l = v["_HDRMOC"] + v["_UIMOC"] + v["_SRCMOC"];
+	for(QStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) {
+	    if(!(*val_it).isEmpty())
+		(*val_it) = Option::fixPathToTargetOS((*val_it), FALSE);
+	}
+    }
+
+    QString fixpaths[] = { QString("PRE_TARGETDEPS"), QString("POST_TARGETDEPS"), QString::null };
+    for(int path = 0; !fixpaths[path].isNull(); path++) {
+	QStringList &l = v[fixpaths[path]];
+	for(QStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) {
+	    if(!(*val_it).isEmpty())
+		(*val_it) = Option::fixPathToTargetOS((*val_it), FALSE);
+	}
+    }
+
+    // Make sure the INCLUDEPATH doesn't contain any empty(/null) entries
+    QStringList &ipl = project->variables()["INCLUDEPATH"];
+    for(QStringList::Iterator ipl_it = ipl.begin(); ipl_it != ipl.end();) {
+	if ((*ipl_it).isEmpty())
+	    ipl_it = ipl.remove(ipl_it);
+	else
+	    ++ipl_it;
+    }
+}
+
+bool
+MakefileGenerator::processPrlFile(QString &file)
+{
+    bool ret = FALSE, try_replace_file=FALSE;
+    QString meta_file, orig_file = file;
+    if(QMakeMetaInfo::libExists(file)) {
+	try_replace_file = TRUE;
+	meta_file = file;
+	file = "";
+    } else {
+	QString tmp = file;
+	int ext = tmp.findRev('.');
+	if(ext != -1)
+	    tmp = tmp.left(ext);
+	meta_file = tmp;
+    }
+    meta_file = fileFixify(meta_file);
+    if(!QMakeMetaInfo::libExists(fileFixify(meta_file, QDir::currentDirPath(), Option::output_dir)) &&
+       project->isActiveConfig("qt")) {
+	QString stem = meta_file, dir, extn;
+	int slsh = stem.findRev('/'), hadlib = 0;
+	if(slsh != -1) {
+	    dir = stem.left(slsh + 1);
+	    stem = stem.right(stem.length() - slsh - 1);
+	}
+	if(stem.startsWith("lib")) {
+	    hadlib = 1;
+	    stem = stem.right(stem.length() - 3);
+	}
+	int dot = stem.find('.');
+	if(dot != -1) {
+	    extn = stem.right(stem.length() - dot);
+	    stem = stem.left(dot);
+	}
+	if(stem == "qt" || stem == "qte" || stem == "qte-mt" || stem == "qt-mt") {
+	    if(stem.endsWith("-mt"))
+		stem = stem.left(stem.length() - 3); //lose the -mt
+	    else
+		stem += "-mt"; //try the thread case
+	    meta_file = dir;
+	    if(hadlib)
+		meta_file += "lib";
+	    meta_file += stem + extn;
+	    try_replace_file = TRUE;
+	}
+    }
+    QString real_meta_file = Option::fixPathToLocalOS(meta_file);
+    if(project->variables()["QMAKE_PRL_INTERNAL_FILES"].findIndex(QMakeMetaInfo::findLib(meta_file)) != -1) {
+	ret = TRUE;
+    } else if(!meta_file.isEmpty()) {
+	QString f = fileFixify(real_meta_file, QDir::currentDirPath(), Option::output_dir);
+	if(QMakeMetaInfo::libExists(f)) {
+	    QMakeMetaInfo libinfo;
+	    debug_msg(1, "Processing PRL file: %s", real_meta_file.latin1());
+	    if(!libinfo.readLib(f)) {
+		fprintf(stderr, "Error processing meta file: %s\n", real_meta_file.latin1());
+	    } else if(project->isActiveConfig("no_read_prl_" + libinfo.type().lower())) {
+		debug_msg(2, "Ignored meta file %s [%s]", real_meta_file.latin1(), libinfo.type().latin1()); 
+	    } else {
+		ret = TRUE;
+		QMap<QString, QStringList> &vars = libinfo.variables();
+		for( QMap<QString, QStringList>::Iterator it = vars.begin(); it != vars.end(); ++it)
+		    processPrlVariable(it.key(), it.data());
+		if(try_replace_file && !libinfo.isEmpty("QMAKE_PRL_TARGET")) {
+		    QString dir;
+		    int slsh = real_meta_file.findRev(Option::dir_sep);
+		    if(slsh != -1)
+			dir = real_meta_file.left(slsh+1);
+		    file = libinfo.first("QMAKE_PRL_TARGET");
+		    if(QDir::isRelativePath(file))
+			file.prepend(dir);
+		}
+	    }
+	}
+	if(ret) {
+	    QString mf = QMakeMetaInfo::findLib(meta_file);
+	    project->variables()["QMAKE_PRL_INTERNAL_FILES"].append(mf);
+	    project->variables()["QMAKE_INTERNAL_INCLUDED_FILES"].append(mf);
+	}
+    }
+    if(try_replace_file && file.isEmpty()) {
+#if 0
+	warn_msg(WarnLogic, "Found prl [%s] file with no target [%s]!", meta_file.latin1(),
+		 orig_file.latin1());
+#endif
+	file = orig_file;
+    }
+    return ret;
+}
+
+void
+MakefileGenerator::processPrlVariable(const QString &var, const QStringList &l)
+{
+    if(var == "QMAKE_PRL_LIBS") {
+	QString where = "QMAKE_LIBS";
+	if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
+	    where = project->first("QMAKE_INTERNAL_PRL_LIBS");
+	QStringList &out = project->variables()[where];
+	for(QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
+	    if( out.findIndex((*it)) == -1)
+		out.append((*it));
+	}
+    } else if(var == "QMAKE_PRL_DEFINES") {
+	QStringList &out = project->variables()["DEFINES"];
+	for(QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
+	    if(out.findIndex((*it)) == -1 &&
+	       project->variables()["PRL_EXPORT_DEFINES"].findIndex((*it)) == -1)
+		out.append((*it));
+	}
+    }
+}
+
+void
+MakefileGenerator::processPrlFiles()
+{
+    QDict<void> processed;
+    for(bool ret = FALSE; TRUE; ret = FALSE) {
+	//read in any prl files included..
+	QStringList l_out;
+	QString where = "QMAKE_LIBS";
+	if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
+	    where = project->first("QMAKE_INTERNAL_PRL_LIBS");
+	QStringList &l = project->variables()[where];
+	for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	    QString file = (*it);
+	    if(!processed[file] && processPrlFile(file)) {
+		processed.insert(file, (void*)1);
+		ret = TRUE;
+	    }
+	    if(!file.isEmpty())
+		l_out.append(file);
+	}
+	if(ret)
+	    l = l_out;
+	else
+	    break;
+    }
+}
+
+void
+MakefileGenerator::writePrlFile(QTextStream &t)
+{
+    QString target = project->first("TARGET");
+    int slsh = target.findRev(Option::dir_sep);
+    if(slsh != -1)
+	target = target.right(target.length() - slsh - 1);
+    QString bdir = Option::output_dir;
+    if(bdir.isEmpty())
+	bdir = QDir::currentDirPath();
+    t << "QMAKE_PRL_BUILD_DIR = " << bdir << endl;
+
+    if(!project->projectFile().isEmpty() && project->projectFile() != "-")
+	t << "QMAKE_PRO_INPUT = " << project->projectFile().section('/', -1) << endl;
+
+    if(!project->isEmpty("QMAKE_ABSOLUTE_SOURCE_PATH"))
+	t << "QMAKE_PRL_SOURCE_DIR = " << project->first("QMAKE_ABSOLUTE_SOURCE_PATH") << endl;
+    t << "QMAKE_PRL_TARGET = " << target << endl;
+    if(!project->isEmpty("PRL_EXPORT_DEFINES"))
+	t << "QMAKE_PRL_DEFINES = " << project->variables()["PRL_EXPORT_DEFINES"].join(" ") << endl;
+    if(!project->isEmpty("PRL_EXPORT_CFLAGS"))
+	t << "QMAKE_PRL_CFLAGS = " << project->variables()["PRL_EXPORT_CFLAGS"].join(" ") << endl;
+    if(!project->isEmpty("PRL_EXPORT_CXXFLAGS"))
+	t << "QMAKE_PRL_CXXFLAGS = " << project->variables()["PRL_EXPORT_CXXFLAGS"].join(" ") << endl;
+    if(!project->isEmpty("CONFIG"))
+	t << "QMAKE_PRL_CONFIG = " << project->variables()["CONFIG"].join(" ") << endl;
+    if(!project->isEmpty("VERSION"))
+        t << "QMAKE_PRL_VERSION = " << project->first("VERSION") << endl;
+    if(project->isActiveConfig("staticlib") || project->isActiveConfig("explicitlib")) {
+	QStringList libs;
+	if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
+	    libs = project->variables()["QMAKE_INTERNAL_PRL_LIBS"];
+	else
+	    libs << "QMAKE_LIBS"; //obvious one
+	t << "QMAKE_PRL_LIBS = ";
+	for(QStringList::Iterator it = libs.begin(); it != libs.end(); ++it)
+	    t << project->variables()[(*it)].join(" ") << " ";
+	t << endl;
+    }
+}
+
+bool
+MakefileGenerator::write()
+{
+    usePlatformDir();
+    init();
+    findLibraries();
+    if((Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE || //write prl
+       Option::qmake_mode == Option::QMAKE_GENERATE_PRL) &&
+       project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty() &&
+       project->isActiveConfig("create_prl") && project->first("TEMPLATE") == "lib" &&
+       !project->isActiveConfig("plugin")) {
+	QString prl = var("TARGET");
+	int slsh = prl.findRev(Option::dir_sep);
+	if(slsh != -1)
+	    prl = prl.right(prl.length() - slsh);
+	int dot = prl.find('.');
+	if(dot != -1)
+	    prl = prl.left(dot);
+	prl += Option::prl_ext;
+	if(!project->isEmpty("DESTDIR"))
+	    prl.prepend(var("DESTDIR"));
+	QString local_prl = Option::fixPathToLocalOS(fileFixify(prl, QDir::currentDirPath(), Option::output_dir));
+	QFile ft(local_prl);
+	if(ft.open(IO_WriteOnly)) {
+	    project->variables()["ALL_DEPS"].append(prl);
+	    project->variables()["QMAKE_INTERNAL_PRL_FILE"].append(prl);
+	    QTextStream t(&ft);
+	    writePrlFile(t);
+	    ft.close();
+	}
+    }
+    if(Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE &&
+       project->isActiveConfig("link_prl")) //load up prl's'
+	processPrlFiles();
+
+    if(Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE || //write prl file
+       Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT) {
+	QTextStream t(&Option::output);
+	writeMakefile(t);
+    }
+    return TRUE;
+}
+
+// Manipulate directories, so it's possible to build
+// several cross-platform targets concurrently
+void
+MakefileGenerator::usePlatformDir()
+{
+    QString pltDir(project->first("QMAKE_PLATFORM_DIR"));
+    if(pltDir.isEmpty())
+	return;
+    char sep = QDir::separator();
+    QString slashPltDir = sep + pltDir;
+
+    QString filePath = project->first("DESTDIR");
+    project->variables()["DESTDIR"] = filePath 
+				    + (filePath.isEmpty() ? pltDir : slashPltDir);
+
+    filePath = project->first("DLLDESTDIR");
+    project->variables()["DLLDESTDIR"] = filePath 
+				       + (filePath.isEmpty() ? pltDir : slashPltDir);
+
+    filePath = project->first("OBJECTS_DIR");
+    project->variables()["OBJECTS_DIR"] = filePath 
+					+ (filePath.isEmpty() ? pltDir : slashPltDir);
+
+    filePath = project->first("QMAKE_LIBDIR_QT");
+    project->variables()["QMAKE_LIBDIR_QT"] = filePath 
+					    + (filePath.isEmpty() ? pltDir : slashPltDir);
+
+    filePath = project->first("QMAKE_LIBS_QT");
+    int fpi = filePath.findRev(sep);
+    if (fpi == -1)
+	project->variables()["QMAKE_LIBS_QT"].prepend(pltDir + sep);
+    else
+        project->variables()["QMAKE_LIBS_QT"] = filePath.left(fpi)
+					      + slashPltDir
+					      + filePath.mid(fpi);
+    
+    filePath = project->first("QMAKE_LIBS_QT_THREAD");
+    fpi = filePath.findRev(sep);
+    if (fpi == -1)
+	project->variables()["QMAKE_LIBS_QT_THREAD"].prepend(pltDir + sep);
+    else
+        project->variables()["QMAKE_LIBS_QT_THREAD"] = filePath.left(fpi)
+						     + slashPltDir
+						     + filePath.mid(fpi);
+
+    filePath = project->first("QMAKE_LIBS_QT_ENTRY");
+    fpi = filePath.findRev(sep);
+    if (fpi == -1)
+	project->variables()["QMAKE_LIBS_QT_ENTRY"].prepend(pltDir + sep);
+    else
+        project->variables()["QMAKE_LIBS_QT_ENTRY"] = filePath.left(fpi)
+						    + slashPltDir
+						    + filePath.mid(fpi);
+}
+
+void
+MakefileGenerator::writeObj(QTextStream &t, const QString &obj, const QString &src)
+{
+    QStringList &objl = project->variables()[obj];
+    QStringList &srcl = project->variables()[src];
+
+    QStringList::Iterator oit = objl.begin();
+    QStringList::Iterator sit = srcl.begin();
+    QString stringSrc("$src");
+    QString stringObj("$obj");
+    for( ;sit != srcl.end() && oit != objl.end(); oit++, sit++) {
+	if((*sit).isEmpty())
+	    continue;
+
+	if(!doDepends()) {
+	    QString sdep, odep = (*sit) + " ";
+	    QStringList deps = findDependencies((*sit));
+	    for(QStringList::Iterator dit = deps.begin(); dit != deps.end(); dit++) {
+		if((*dit).endsWith(Option::cpp_moc_ext))
+		    odep += (*dit) + " ";
+		else
+		    sdep += (*dit) + " ";
+	    }
+	    t << (*sit) << ": " << sdep << endl
+	      << (*oit) << ": " << odep ;
+	} else {
+	    t << (*oit) << ": " << (*sit) << " " << findDependencies((*sit)).join(" \\\n\t\t");
+	}
+
+	QString comp, cimp;
+	for(QStringList::Iterator cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit) {
+	    if((*sit).endsWith((*cppit))) {
+		comp = "QMAKE_RUN_CXX";
+		cimp = "QMAKE_RUN_CXX_IMP";
+		break;
+	    }
+	}
+	if(comp.isEmpty()) {
+	    comp = "QMAKE_RUN_CC";
+	    cimp = "QMAKE_RUN_CC_IMP";
+	}
+	bool use_implicit_rule = !project->isEmpty(cimp);
+	if(use_implicit_rule) {
+	    if(!project->isEmpty("OBJECTS_DIR")) {
+		use_implicit_rule = FALSE;
+	    } else {
+		int dot = (*sit).findRev('.');
+		if(dot == -1 || ((*sit).left(dot) + Option::obj_ext != (*oit)))
+		    use_implicit_rule = FALSE;
+	    }
+	}
+	if (!use_implicit_rule && !project->isEmpty(comp)) {
+	    QString p = var(comp), srcf(*sit);
+	    p.replace(stringSrc, srcf);
+	    p.replace(stringObj, (*oit));
+	    t << "\n\t" << p;
+	}
+	t << endl << endl;
+    }
+}
+
+
+void
+MakefileGenerator::writeUicSrc(QTextStream &t, const QString &ui)
+{
+    QStringList &uil = project->variables()[ui];
+    for(QStringList::Iterator it = uil.begin(); it != uil.end(); it++) {
+	QString decl, impl;
+	{
+	    QString tmp = (*it), impl_dir, decl_dir;
+	    decl = tmp.replace(QRegExp("\\" + Option::ui_ext + "$"), Option::h_ext.first());
+	    int dlen = decl.findRev(Option::dir_sep) + 1;
+	    tmp = (*it);
+	    impl = tmp.replace(QRegExp("\\" + Option::ui_ext + "$"), Option::cpp_ext.first());
+	    int ilen = decl.findRev(Option::dir_sep) + 1;
+	    if(!project->isEmpty("UI_DIR")) {
+		impl_dir = project->first("UI_DIR");
+		decl = project->first("UI_DIR") + decl.right(decl.length() - dlen);
+		impl = project->first("UI_DIR") + impl.right(impl.length() - ilen);
+	    } else {
+		if(!project->isEmpty("UI_HEADERS_DIR")) {
+		    decl_dir = project->first("UI_HEADERS_DIR");
+		    decl = project->first("UI_HEADERS_DIR") + decl.right(decl.length() - dlen);
+		}
+		if(!project->isEmpty("UI_SOURCES_DIR")) {
+		    impl_dir = project->first("UI_SOURCES_DIR");
+		    impl = project->first("UI_SOURCES_DIR") + impl.right(impl.length() - ilen);
+		}
+	    }
+	    impl = fileFixify(impl, QDir::currentDirPath(), Option::output_dir);
+	    decl = fileFixify(decl, QDir::currentDirPath(), Option::output_dir);
+	    if(decl_dir.isEmpty())
+		decl_dir = decl.section(Option::dir_sep,0,-2);
+	    if(impl_dir.isEmpty())
+		impl_dir = impl.section(Option::dir_sep,0,-2);
+	    if (QDir::isRelativePath(impl_dir))
+		impl_dir.prepend(Option::output_dir + Option::dir_sep);
+	    if (QDir::isRelativePath(decl_dir))
+		decl_dir.prepend(Option::output_dir + Option::dir_sep);
+	    createDir(impl_dir);
+	    createDir(decl_dir);
+	}
+	QStringList deps = findDependencies((*it));
+	deps.remove(decl); //avoid circular dependencies..
+	t << decl << ": " << (*it) << " ";
+        t << deps.join(" \\\n\t\t") << "\n\t"
+          << "$(UIC) " << (*it) << " -o " << decl << endl << endl;
+
+	QString mildDecl = decl;
+	int k = mildDecl.findRev(Option::dir_sep);
+	if ( k != -1 )
+	    mildDecl = mildDecl.mid( k + 1 );
+	t << impl << ": " << decl << " " << (*it) << " ";
+        if(QFile::exists((*it) + Option::h_ext.first()))
+            t << (*it) << Option::h_ext.first() << " ";
+        t << deps.join(" \\\n\t\t") << "\n\t"
+	  << "$(UIC) " << (*it) << " -i " << mildDecl << " -o " << impl << endl << endl;
+    }
+}
+
+
+void
+MakefileGenerator::writeMocObj(QTextStream &t, const QString &obj, const QString &src)
+{
+    QStringList &objl = project->variables()[obj],
+		&srcl = project->variables()[src];
+    QStringList::Iterator oit = objl.begin(), sit = srcl.begin();
+    QString stringSrc("$src"), stringObj("$obj");
+    for( ;sit != srcl.end() && oit != objl.end(); oit++, sit++) {
+	QString hdr = findMocSource((*sit));
+	t << (*oit) << ": " 
+	  << (*sit) << " " << findDependencies((*sit)).join(" \\\n\t\t") << " "
+	  << hdr << " " << findDependencies(hdr).join(" \\\n\t\t");
+	bool use_implicit_rule = !project->isEmpty("QMAKE_RUN_CXX_IMP");
+	if(use_implicit_rule) {
+	    if(!project->isEmpty("OBJECTS_DIR") || !project->isEmpty("MOC_DIR")) {
+		use_implicit_rule = FALSE;
+	    } else {
+		int dot = (*sit).findRev('.');
+		if(dot == -1 || ((*sit).left(dot) + Option::obj_ext != (*oit)))
+		    use_implicit_rule = FALSE;
+	    }
+	}
+	if (!use_implicit_rule && !project->isEmpty("QMAKE_RUN_CXX")) {
+	    QString p = var("QMAKE_RUN_CXX"), srcf(*sit);
+	    p.replace(stringSrc, srcf);
+	    p.replace(stringObj, (*oit));
+	    t << "\n\t" << p;
+	}
+	t << endl << endl;
+    }
+}
+
+
+void
+MakefileGenerator::writeMocSrc(QTextStream &t, const QString &src)
+{
+    QStringList &l = project->variables()[src];
+    for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	QString m = Option::fixPathToTargetOS(findMocDestination(*it));
+	if ( !m.isEmpty()) {
+	    QString deps;
+	    if(!project->isActiveConfig("no_mocdepend"))
+		deps += "$(MOC) ";
+	    deps += (*it);
+	    t << m << ": " << deps << "\n\t"
+	      << "$(MOC)";
+	    t << " " << (*it) << " -o " << m << endl << endl;
+	}
+    }
+}
+
+void
+MakefileGenerator::writeYaccSrc(QTextStream &t, const QString &src)
+{
+    QStringList &l = project->variables()[src];
+    if(project->isActiveConfig("yacc_no_name_mangle") && l.count() > 1)
+	warn_msg(WarnLogic, "yacc_no_name_mangle specified, but multiple parsers expected."
+		 "This can lead to link problems.\n");
+    QString default_out_h = "y.tab.h", default_out_c = "y.tab.c";
+    if(!project->isEmpty("QMAKE_YACC_HEADER"))
+	default_out_h = project->first("QMAKE_YACC_HEADER");
+    if(!project->isEmpty("QMAKE_YACC_SOURCE"))
+	default_out_c = project->first("QMAKE_YACC_SOURCE");
+    QString stringBase("$base");
+    for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	QFileInfo fi((*it));
+	QString dir;
+	if(fi.dirPath() != ".")
+	    dir = fi.dirPath() + Option::dir_sep;
+	dir = fileFixify(dir, QDir::currentDirPath(), Option::output_dir);
+	if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep)
+	    dir += Option::dir_sep;
+
+	QString impl = dir + fi.baseName(TRUE) + Option::yacc_mod + Option::cpp_ext.first();
+	QString decl = dir + fi.baseName(TRUE) + Option::yacc_mod + Option::h_ext.first();
+
+	QString yaccflags = "$(YACCFLAGS)", mangle = "y";
+	if(!project->isActiveConfig("yacc_no_name_mangle")) {
+	    mangle = fi.baseName(TRUE);
+	    if(!project->isEmpty("QMAKE_YACCFLAGS_MANGLE")) 
+		yaccflags += " " + var("QMAKE_YACCFLAGS_MANGLE").replace(stringBase, mangle);
+	    else
+		yaccflags += " -p " + mangle;
+	}
+	QString out_h = default_out_h, out_c = default_out_c;
+	if(!mangle.isEmpty()) {
+	    out_h.replace(stringBase, mangle);
+	    out_c.replace(stringBase, mangle);
+	}
+
+	t << impl << ": " << (*it) << "\n\t"
+	  << "$(YACC) " << yaccflags << " " << (*it) << "\n\t"
+	  << "-$(DEL_FILE) " << impl << " " << decl << "\n\t"
+	  << "-$(MOVE) " << out_h << " " << decl << "\n\t"
+	  << "-$(MOVE) " << out_c << " " << impl << endl << endl;
+	t << decl << ": " << impl << endl << endl;
+    }
+}
+
+void
+MakefileGenerator::writeLexSrc(QTextStream &t, const QString &src)
+{
+    QStringList &l = project->variables()[src];
+    if(project->isActiveConfig("yacc_no_name_mangle") && l.count() > 1)
+	warn_msg(WarnLogic, "yacc_no_name_mangle specified, but multiple parsers expected.\n"
+		 "This can lead to link problems.\n");
+    QString default_out_c = "lex.$base.c";
+    if(!project->isEmpty("QMAKE_LEX_SOURCE"))
+	default_out_c = project->first("QMAKE_LEX_SOURCE");
+    QString stringBase("$base");
+    for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	QFileInfo fi((*it));
+	QString dir;
+	if(fi.dirPath() != ".")
+	    dir = fi.dirPath() + Option::dir_sep;
+	dir = fileFixify(dir, QDir::currentDirPath(), Option::output_dir);
+	if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep)
+	    dir += Option::dir_sep;
+	QString impl = dir + fi.baseName(TRUE) + Option::lex_mod + Option::cpp_ext.first();
+
+	QString lexflags = "$(LEXFLAGS)", stub="yy";
+	if(!project->isActiveConfig("yacc_no_name_mangle")) {
+	    stub = fi.baseName(TRUE);
+	    lexflags += " -P" + stub;
+	}
+	QString out_c = default_out_c;
+	if(!stub.isEmpty())
+	    out_c.replace(stringBase, stub);
+
+	t << impl << ": " << (*it) << " " << findDependencies((*it)).join(" \\\n\t\t") << "\n\t"
+	  << ( "$(LEX) " + lexflags + " " ) << (*it) << "\n\t"
+	  << "-$(DEL_FILE) " << impl << " " << "\n\t"
+	  << "-$(MOVE) " << out_c << " " << impl << endl << endl;
+    }
+}
+
+void
+MakefileGenerator::writeImageObj(QTextStream &t, const QString &obj)
+{
+    QStringList &objl = project->variables()[obj];
+    QString stringSrc("$src");
+    QString stringObj("$obj");
+
+    QString uidir;
+    for(QStringList::Iterator oit = objl.begin(); oit != objl.end(); oit++) {
+        QString src(project->first("QMAKE_IMAGE_COLLECTION"));
+	t << (*oit) << ": " << src;
+	bool use_implicit_rule = !project->isEmpty("QMAKE_RUN_CXX_IMP");
+	if(use_implicit_rule) {
+	    if(!project->isEmpty("OBJECTS_DIR") || !project->isEmpty("UI_DIR") || !project->isEmpty("UI_SOURCES_DIR")) {
+		use_implicit_rule = FALSE;
+	    } else {
+		int dot = src.findRev('.');
+		if(dot == -1 || (src.left(dot) + Option::obj_ext != (*oit)))
+		    use_implicit_rule = FALSE;
+	    }
+	}
+	if(!use_implicit_rule && !project->isEmpty("QMAKE_RUN_CXX")) {
+	    QString p = var("QMAKE_RUN_CXX"), srcf(src);
+	    p.replace(stringSrc, srcf);
+	    p.replace(stringObj, (*oit));
+	    t << "\n\t" << p;
+	}
+	t << endl << endl;
+    }
+}
+
+
+void
+MakefileGenerator::writeImageSrc(QTextStream &t, const QString &src)
+{
+    QStringList &l = project->variables()[src];
+    for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	QString gen = project->first("MAKEFILE_GENERATOR");
+	if ( gen == "MSVC" ) {
+	    t << (*it) << ": " << findDependencies((*it)).join(" \\\n\t\t") << "\n\t"
+		<< "$(UIC)  -o " << (*it) << " -embed " << project->first("QMAKE_ORIG_TARGET")
+		<< " -f <<\n" << findDependencies((*it)).join(" ") << "\n<<" << endl << endl;
+	} else if ( gen == "BMAKE" ) {
+	    t << (*it) << ": " << findDependencies((*it)).join(" \\\n\t\t") << "\n\t"
+		<< "$(UIC) " << " -embed " << project->first("QMAKE_ORIG_TARGET")
+		<< " -f &&|\n" << findDependencies((*it)).join(" ") << "\n| -o " << (*it) << endl << endl;
+	} else {
+	    t << (*it) << ": " << findDependencies((*it)).join(" \\\n\t\t") << "\n\t"
+		<< "$(UIC) " << " -embed " << project->first("QMAKE_ORIG_TARGET")
+		<< " " << findDependencies((*it)).join(" ") << " -o " << (*it) << endl << endl;
+	}
+    }
+}
+
+
+void
+MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs)
+{
+    QString all_installs, all_uninstalls;
+    QStringList &l = project->variables()[installs];
+    for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	QString pvar = (*it) + ".path";
+	if(project->variables()[(*it) + ".CONFIG"].findIndex("no_path") == -1 &&
+	   project->variables()[pvar].isEmpty()) {
+	    warn_msg(WarnLogic, "%s is not defined: install target not created\n", pvar.latin1());
+	    continue;
+	}
+
+	bool do_default = TRUE;
+	const QString root = "$(INSTALL_ROOT)";
+	QString target, dst= fileFixify(project->variables()[pvar].first());
+	if(dst.right(1) != Option::dir_sep)
+	    dst += Option::dir_sep;
+	QStringList tmp, uninst = project->variables()[(*it) + ".uninstall"];
+	//other
+	tmp = project->variables()[(*it) + ".extra"];
+	if(tmp.isEmpty())
+	    tmp = project->variables()[(*it) + ".commands"]; //to allow compatible name
+	if(!tmp.isEmpty()) {
+	    do_default = FALSE;
+	    if(!target.isEmpty())
+		target += "\n\t";
+	    target += tmp.join(" ");
+	}
+	//masks
+	tmp = project->variables()[(*it) + ".files"];
+	if(!tmp.isEmpty()) {
+	    if(!target.isEmpty())
+		target += "\n";
+	    do_default = FALSE;
+	    for(QStringList::Iterator wild_it = tmp.begin(); wild_it != tmp.end(); ++wild_it) {
+		QString wild = Option::fixPathToLocalOS((*wild_it), FALSE), wild_var = fileFixify(wild);
+		QString dirstr = QDir::currentDirPath(), filestr = wild;
+		int slsh = filestr.findRev(Option::dir_sep);
+		if(slsh != -1) {
+		    dirstr = filestr.left(slsh+1);
+		    filestr = filestr.right(filestr.length() - slsh - 1);
+		}
+		if(dirstr.right(Option::dir_sep.length()) != Option::dir_sep)
+		    dirstr += Option::dir_sep;
+		if(QFile::exists(wild)) { //real file
+		    QString file = wild;
+		    QFileInfo fi(wild);
+		    if(!target.isEmpty())
+			target += "\t";
+		    QString cmd =  QString(fi.isDir() ? "-$(INSTALL_DIR)" : "-$(INSTALL_FILE)") + " \"" +
+				   Option::fixPathToTargetOS(fileFixify(wild, QString::null,
+									QString::null, FALSE, FALSE), FALSE) +
+				   "\" \"" + root + dst + "\"\n";
+		    target += cmd;
+		    if(!project->isActiveConfig("debug") &&
+		       !fi.isDir() && fi.isExecutable() && !project->isEmpty("QMAKE_STRIP"))
+			target += QString("\t-") + var("QMAKE_STRIP") + " \"" +
+				  root + fileFixify(dst + filestr, QString::null, QString::null, FALSE, FALSE) +
+				  "\"\n";
+		    if(!uninst.isEmpty())
+			uninst.append("\n\t");
+		    uninst.append(
+#ifdef Q_WS_WIN
+		    QString("-$(DEL_FILE)")
+#else
+		    QString("-$(DEL_FILE) -r")
+#endif
+		    + " \"" + root + fileFixify(dst + filestr, QString::null, QString::null, FALSE, FALSE) + "\"");
+		    continue;
+		}
+		fixEnvVariables(dirstr);
+		QDir dir(dirstr, filestr);		    //wild
+		for(uint x = 0; x < dir.count(); x++) {
+		    QString file = dir[x];
+		    if(file == "." || file == "..") //blah
+			continue;
+		    if(!uninst.isEmpty())
+			uninst.append("\n\t");
+		    uninst.append(
+#ifdef Q_WS_WIN
+			QString("-$(DEL_FILE)")
+#else
+			QString("-$(DEL_FILE) -r")
+#endif
+			+ " \"" + root + fileFixify(dst + file, QString::null, QString::null, FALSE, FALSE) +
+			"\"");
+		    QFileInfo fi(Option::fixPathToTargetOS(fileFixify(dirstr + file), TRUE));
+		    if(!target.isEmpty())
+			target += "\t";
+		    QString cmd = QString(fi.isDir() ? "-$(INSTALL_DIR)" : "-$(INSTALL_FILE)") + " \"" +
+				  Option::fixPathToTargetOS(fileFixify(dirstr + file, QString::null,
+								       QString::null, FALSE, FALSE), FALSE) +
+				  "\" \"" + root + dst + "\"\n";
+		    target += cmd;
+		    if(!project->isActiveConfig("debug") &&
+		       !fi.isDir() && fi.isExecutable() && !project->isEmpty("QMAKE_STRIP"))
+			target += QString("\t-") + var("QMAKE_STRIP") + " \"" +
+				  root + fileFixify(dst + file, QString::null, QString::null, FALSE, FALSE) +
+				  "\"\n";
+		}
+	    }
+	}
+	//default?
+	if(do_default) {
+	    target = defaultInstall((*it));
+	    uninst = project->variables()[(*it) + ".uninstall"];
+	}
+
+	if(!target.isEmpty()) {
+	    t << "install_" << (*it) << ": all ";
+	    const QStringList &deps = project->variables()[(*it) + ".depends"];
+	    if(!deps.isEmpty()) {
+		for(QStringList::ConstIterator dep_it = deps.begin(); dep_it != deps.end(); ++dep_it) {
+		    QString targ = var((*dep_it) + ".target");
+		    if(targ.isEmpty())
+			targ = (*dep_it);
+		    t << targ;
+		}
+	    }
+	    t << "\n\t";
+	    const QStringList &dirs = project->variables()[pvar];
+	    for(QStringList::ConstIterator pit = dirs.begin(); pit != dirs.end(); ++pit) {
+		QString tmp_dst = fileFixify((*pit));
+#ifndef Q_WS_WIN
+		if(tmp_dst.right(1) != Option::dir_sep)
+		    tmp_dst += Option::dir_sep;
+#endif
+		t << mkdir_p_asstring(root+tmp_dst) << "\n\t";
+	    }
+	    t << target << endl << endl;
+	    if(!uninst.isEmpty()) {
+		t << "uninstall_" << (*it) << ": " << "\n\t"
+		  << uninst.join("") << "\n\t"
+		  << "-$(DEL_DIR) \"" << ( root + dst ) << "\"" << endl << endl;
+	    }
+	    t << endl;
+
+	    if(project->variables()[(*it) + ".CONFIG"].findIndex("no_default_install") == -1) {
+		all_installs += QString("install_") + (*it) + " ";
+		if(!uninst.isEmpty())
+		    all_uninstalls += "uninstall_" + (*it) + " ";
+	    }
+	}   else {
+	    debug_msg(1, "no definition for install %s: install target not created",(*it).latin1());
+	}
+    }
+    t << "install: " << all_installs << " " << var("INSTALLDEPS")   << "\n\n";
+    t << "uninstall: " << all_uninstalls << " " << var("UNINSTALLDEPS") << "\n\n";
+}
+
+QString
+MakefileGenerator::var(const QString &var)
+{
+    return val(project->variables()[var]);
+}
+
+QString
+MakefileGenerator::val(const QStringList &varList)
+{
+    return valGlue(varList, "", " ", "");
+}
+
+QString
+MakefileGenerator::varGlue(const QString &var, const QString &before, const QString &glue, const QString &after)
+{
+    return valGlue(project->variables()[var], before, glue, after);
+}
+
+QString
+MakefileGenerator::valGlue(const QStringList &varList, const QString &before, const QString &glue, const QString &after)
+{
+    QString ret;
+    for(QStringList::ConstIterator it = varList.begin(); it != varList.end(); ++it) {
+	if(!(*it).isEmpty()) {
+	    if(!ret.isEmpty())
+		ret += glue;
+	    ret += (*it);
+	}
+    }
+    return ret.isEmpty() ? QString("") : before + ret + after;
+}
+
+
+QString
+MakefileGenerator::varList(const QString &var)
+{
+    return valList(project->variables()[var]);
+}
+
+QString
+MakefileGenerator::valList(const QStringList &varList)
+{
+    return valGlue(varList, "", " \\\n\t\t", "");
+}
+
+
+QStringList
+MakefileGenerator::createObjectList(const QString &var)
+{
+    QStringList &l = project->variables()[var], ret;
+    QString objdir, dir;
+    if(!project->variables()["OBJECTS_DIR"].isEmpty())
+	objdir = project->first("OBJECTS_DIR");
+    for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	QFileInfo fi(Option::fixPathToLocalOS((*it)));
+	if(objdir.isEmpty() && project->isActiveConfig("object_with_source")) {
+	    QString fName = Option::fixPathToTargetOS((*it), FALSE);
+	    int dl = fName.findRev(Option::dir_sep);
+	    if(dl != -1)
+		dir = fName.left(dl + 1);
+	} else {
+	    dir = objdir;
+	}
+	ret.append(dir + fi.baseName(TRUE) + Option::obj_ext);
+    }
+    return ret;
+}
+
+bool
+MakefileGenerator::writeMakefile(QTextStream &t)
+{
+    t << "####### Compile" << endl << endl;
+    writeObj(t, "OBJECTS", "SOURCES");
+    writeUicSrc(t, "FORMS");
+    writeObj(t, "UICOBJECTS", "UICIMPLS");
+    writeMocObj(t, "OBJMOC", "SRCMOC" );
+    writeMocSrc(t, "HEADERS");
+    writeMocSrc(t, "SOURCES");
+    writeMocSrc(t, "UICDECLS");
+    writeYaccSrc(t, "YACCSOURCES");
+    writeLexSrc(t, "LEXSOURCES");
+    writeImageObj(t, "IMAGEOBJECTS");
+    writeImageSrc(t, "QMAKE_IMAGE_COLLECTION");
+
+    t << "####### Install" << endl << endl;
+    writeInstalls(t, "INSTALLS");
+    return TRUE;
+}
+
+QString MakefileGenerator::buildArgs()
+{
+    static QString ret;
+    if(ret.isEmpty()) {
+	//special variables
+	if(!project->isEmpty("QMAKE_ABSOLUTE_SOURCE_PATH"))
+	    ret += " QMAKE_ABSOLUTE_SOURCE_PATH=\"" + project->first("QMAKE_ABSOLUTE_SOURCE_PATH") + "\"";
+
+	//warnings
+	else if(Option::warn_level == WarnNone)
+	    ret += " -Wnone";
+	else if(Option::warn_level == WarnAll)
+	    ret += " -Wall";
+	else if(Option::warn_level & WarnParser)
+		ret += " -Wparser";
+	//other options
+	if(!Option::user_template.isEmpty())
+	    ret += " -t " + Option::user_template;
+	if(!Option::mkfile::do_cache)
+	    ret += " -nocache";
+	if(!Option::mkfile::do_deps)
+	    ret += " -nodepend";
+	if(!Option::mkfile::do_mocs)
+	    ret += " -nomoc";
+	if(!Option::mkfile::do_dep_heuristics)
+	    ret += " -nodependheuristics";
+	if(!Option::mkfile::qmakespec_commandline.isEmpty())
+	    ret += " -spec " + Option::mkfile::qmakespec_commandline;
+
+	//arguments
+	for(QStringList::Iterator it = Option::before_user_vars.begin();
+	    it != Option::before_user_vars.end(); ++it) {
+	    if((*it).left(qstrlen("QMAKE_ABSOLUTE_SOURCE_PATH")) != "QMAKE_ABSOLUTE_SOURCE_PATH")
+		ret += " \"" + (*it) + "\"";
+	}
+	if(Option::after_user_vars.count()) {
+	    ret += " -after ";
+	    for(QStringList::Iterator it = Option::after_user_vars.begin();
+		it != Option::after_user_vars.end(); ++it) {
+		if((*it).left(qstrlen("QMAKE_ABSOLUTE_SOURCE_PATH")) != "QMAKE_ABSOLUTE_SOURCE_PATH")
+		    ret += " \"" + (*it) + "\"";
+	    }
+	}
+    }
+    return ret;
+}
+
+//could get stored argv, but then it would have more options than are
+//probably necesary this will try to guess the bare minimum..
+QString MakefileGenerator::build_args()
+{
+    static QString ret;
+    if(ret.isEmpty()) {
+	ret = "$(QMAKE)";
+
+	// general options and arguments
+	ret += buildArgs();
+
+	//output
+	QString ofile = Option::fixPathToTargetOS(fileFixify(Option::output.name()));
+	if (!ofile.isEmpty() && ofile != project->first("QMAKE_MAKEFILE"))
+	    ret += " -o " + ofile;
+
+	//inputs
+	QStringList files = fileFixify(Option::mkfile::project_files);
+	ret += " " + files.join(" ");
+    }
+    return ret;
+}
+
+bool
+MakefileGenerator::writeHeader(QTextStream &t)
+{
+    time_t foo = time(NULL);
+    t << "#############################################################################" << endl;
+    t << "# Makefile for building: " << var("TARGET") << endl;
+    t << "# Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: " << ctime(&foo);
+    t << "# Project:  " << fileFixify(project->projectFile()) << endl;
+    t << "# Template: " << var("TEMPLATE") << endl;
+    t << "# Command: " << build_args() << endl;
+    t << "#############################################################################" << endl;
+    t << endl;
+    return TRUE;
+}
+
+
+//makes my life easier..
+bool
+MakefileGenerator::writeMakeQmake(QTextStream &t)
+{
+    QString ofile = Option::fixPathToTargetOS(fileFixify(Option::output.name()));
+    if(project->isEmpty("QMAKE_FAILED_REQUIREMENTS") && !project->isActiveConfig("no_autoqmake") &&
+       !project->isEmpty("QMAKE_INTERNAL_PRL_FILE")) {
+	QStringList files = fileFixify(Option::mkfile::project_files);
+	t << project->first("QMAKE_INTERNAL_PRL_FILE") << ": " << "\n\t"
+	  << "@$(QMAKE) -prl " << buildArgs() << " " << files.join(" ") << endl;
+    }
+
+    QString pfile = project->projectFile();
+    if(pfile != "(stdin)") {
+	QString qmake = build_args();
+	if(!ofile.isEmpty() && !project->isActiveConfig("no_autoqmake")) {
+	    t << ofile << ": " << fileFixify(pfile) << " ";
+	    if(Option::mkfile::do_cache)
+		t <<  fileFixify(Option::mkfile::cachefile) << " ";
+	    if(!specdir().isEmpty()) {
+		if (QFile::exists(Option::fixPathToLocalOS(specdir()+QDir::separator()+"qmake.conf")))
+		    t << specdir() << Option::dir_sep << "qmake.conf" << " ";
+		else if (QFile::exists(Option::fixPathToLocalOS(specdir()+QDir::separator()+"tmake.conf")))
+		    t << specdir() << Option::dir_sep << "tmake.conf" << " ";
+	    }
+	    t << project->variables()["QMAKE_INTERNAL_INCLUDED_FILES"].join(" \\\n\t\t") << "\n\t"
+	      << qmake <<endl;
+	}
+	if(project->first("QMAKE_ORIG_TARGET") != "qmake") {
+	    t << "qmake: " <<
+		project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].join(" \\\n\t\t") << "\n\t"
+	      << "@" << qmake << endl << endl;
+	}
+    }
+    return TRUE;
+}
+
+QStringList
+MakefileGenerator::fileFixify(const QStringList& files, const QString &out_dir, const QString &in_dir,
+			      bool force_fix, bool canon) const
+{
+    if(files.isEmpty())
+	return files;
+    QStringList ret;
+    for(QStringList::ConstIterator it = files.begin(); it != files.end(); ++it) {
+	if(!(*it).isEmpty())
+	    ret << fileFixify((*it), out_dir, in_dir, force_fix, canon);
+    }
+    return ret;
+}
+
+QString
+MakefileGenerator::fileFixify(const QString& file0, const QString &out_d,
+			      const QString &in_d, bool force_fix, bool canon) const
+{
+    if(file0.isEmpty())
+	return file0;
+    QString key = file0;
+    if(QDir::isRelativePath(file0))
+	key.prepend(QDir::currentDirPath() + "--");
+    if(!in_d.isEmpty() || !out_d.isEmpty() || force_fix || !canon)
+	key.prepend(in_d + "--" + out_d + "--" + QString::number((int)force_fix) + "--" +
+		    QString::number((int)canon) + "-");
+    if(fileFixed.contains(key))
+	return fileFixed[key];
+
+    QString file = file0;
+    int depth = 4;
+    if(Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE ||
+       Option::qmake_mode == Option::QMAKE_GENERATE_PRL) {
+	if(project && !project->isEmpty("QMAKE_PROJECT_DEPTH"))
+	    depth = project->first("QMAKE_PROJECT_DEPTH").toInt();
+	else if(Option::mkfile::cachefile_depth != -1)
+	    depth = Option::mkfile::cachefile_depth;
+    }
+
+    QChar quote;
+    if((file.startsWith("'") || file.startsWith("\"")) && file.startsWith(file.right(1))) {
+	quote = file.at(0);
+	file = file.mid(1, file.length() - 2);
+    }
+    QString orig_file = file;
+    if(!force_fix && project->isActiveConfig("no_fixpath")) {
+	if(!project->isEmpty("QMAKE_ABSOLUTE_SOURCE_PATH")) { //absoluteify it
+	    QString qfile = Option::fixPathToLocalOS(file, TRUE, canon);
+	    if(QDir::isRelativePath(file)) { //already absolute
+		QFileInfo fi(qfile);
+		if(!fi.convertToAbs()) //strange
+		    file = fi.filePath();
+	    }
+	}
+    } else { //fix it..
+	QString qfile(Option::fixPathToLocalOS(file, TRUE, canon)), in_dir(in_d), out_dir(out_d);
+	{
+	    if(out_dir.isNull() || QDir::isRelativePath(out_dir))
+		out_dir.prepend(Option::output_dir + QDir::separator());
+	    if(out_dir == ".")
+		out_dir = QDir::currentDirPath();
+	    if(in_dir.isEmpty() || QDir::isRelativePath(in_dir))
+		in_dir.prepend(QDir::currentDirPath() + QDir::separator());
+	    if(in_dir == ".")
+		in_dir = QDir::currentDirPath();
+
+	    if(!QDir::isRelativePath(in_dir) || !QDir::isRelativePath(out_dir)) {
+		QFileInfo in_fi(in_dir);
+		if(!in_fi.convertToAbs())
+		    in_dir = in_fi.filePath();
+		QFileInfo out_fi(out_dir);
+		if(!out_fi.convertToAbs())
+		    out_dir = out_fi.filePath();
+	    }
+	    QString in_canonical_dir = QDir(in_dir).canonicalPath(),
+		   out_canonical_dir = QDir(out_dir).canonicalPath();
+	    if(!in_canonical_dir.isEmpty())
+		in_dir = in_canonical_dir;
+	    if(!out_canonical_dir.isEmpty())
+		out_dir = out_canonical_dir;
+	}
+	if(out_dir != in_dir || !QDir::isRelativePath(qfile)) {
+	    if(QDir::isRelativePath(qfile)) {
+		if(file.left(Option::dir_sep.length()) != Option::dir_sep &&
+		   in_dir.right(Option::dir_sep.length()) != Option::dir_sep)
+		    file.prepend(Option::dir_sep);
+		file.prepend(in_dir);
+	    }
+	    file = Option::fixPathToTargetOS(file, FALSE, canon);
+	    if(canon && QFile::exists(file) && file == Option::fixPathToTargetOS(file, TRUE, canon)) {
+		QString real_file = QDir(file).canonicalPath();
+		if(!real_file.isEmpty())
+                    file = Option::fixPathToTargetOS(real_file, false, canon);
+	    }
+	    QString match_dir = Option::fixPathToTargetOS(out_dir, FALSE, canon);
+	    if(file == match_dir) {
+		file = "";
+	    } else if(file.startsWith(match_dir) &&
+	       file.mid(match_dir.length(), Option::dir_sep.length()) == Option::dir_sep) {
+		file = file.right(file.length() - (match_dir.length() + 1));
+	    } else {
+		for(int i = 1; i <= depth; i++) {
+		    int sl = match_dir.findRev(Option::dir_sep);
+		    if(sl == -1)
+			break;
+		    match_dir = match_dir.left(sl);
+		    if(match_dir.isEmpty())
+			break;
+		    if(file.startsWith(match_dir) &&
+		       file.mid(match_dir.length(), Option::dir_sep.length()) == Option::dir_sep) {
+			//concat
+			int remlen = file.length() - (match_dir.length() + 1);
+			if (remlen < 0)
+			    remlen = 0;
+			file = file.right(remlen);
+			//prepend
+			for(int o = 0; o < i; o++)
+			    file.prepend(".." + Option::dir_sep);
+		    }
+		}
+	    }
+	}
+    }
+    file = Option::fixPathToTargetOS(file, FALSE, canon);
+    if(file.isEmpty())
+	file = ".";
+    if(!quote.isNull())
+	file = quote + file + quote;
+    debug_msg(3, "Fixed %s :: to :: %s (%d) [%s::%s]", orig_file.latin1(), file.latin1(), depth,
+	      in_d.latin1(), out_d.latin1());
+    ((MakefileGenerator*)this)->fileFixed.insert(key, file);
+    return file;
+}
+
+QString
+MakefileGenerator::cleanFilePath(const QString &file) const
+{
+    return fileFixify(Option::fixPathToTargetOS(file));
+}
+
+void MakefileGenerator::logicWarn(const QString &f, const QString &w)
+{
+    if(!(Option::warn_level & WarnLogic))
+	return;
+    QString file = f;
+    int slsh = f.findRev(Option::dir_sep);
+    if(slsh != -1)
+	file = file.right(file.length() - slsh - 1);
+    QStringList &l = project->variables()[w];
+    for(QStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) {
+	QString file2((*val_it));
+	slsh = file2.findRev(Option::dir_sep);
+	if(slsh != -1)
+	    file2 = file2.right(file2.length() - slsh - 1);
+	if(file2 == file) {
+	    warn_msg(WarnLogic, "Found potential symbol conflict of %s (%s) in %s",
+		     file.latin1(), (*val_it).latin1(), w.latin1());
+	    break;
+	}
+    }
+}
+
+QString 
+MakefileGenerator::dependencyKey(const QString &file) const
+{
+     QString key = file;
+     Option::fixPathToTargetOS(key);
+     if(key.find(Option::dir_sep))
+ 	key = key.right(key.length() - key.findRev(Option::dir_sep) - 1);
+     return key;
+}
+
+void 
+MakefileGenerator::setProcessedDependencies(const QString &file, bool b)
+{
+    depProcessed[dependencyKey(file)] = b;
+}
+
+bool 
+MakefileGenerator::processedDependencies(const QString &file)
+{
+    QString key = dependencyKey(file);
+    if(!depProcessed.contains(key))
+	return FALSE;
+    return depProcessed[key];
+}
+
+QStringList
+&MakefileGenerator::findDependencies(const QString &file)
+{
+    return depends[dependencyKey(file)];
+}
+
+
+QString
+MakefileGenerator::specdir()
+{
+    if(!spec.isEmpty())
+	return spec;
+    spec = Option::mkfile::qmakespec;
+#if 0
+    if(const char *d = getenv("QTDIR")) {
+	QString qdir = Option::fixPathToTargetOS(QString(d));
+	if(qdir.endsWith(QString(QChar(QDir::separator()))))
+	    qdir.truncate(qdir.length()-1);
+	//fix path
+	QFileInfo fi(spec);
+	QString absSpec(fi.absFilePath());
+	absSpec = Option::fixPathToTargetOS(absSpec);
+	//replace what you can
+	if(absSpec.startsWith(qdir)) {
+	    absSpec.replace(0, qdir.length(), "$(QTDIR)");
+	    spec = absSpec;
+	}
+    }
+#else
+    spec = Option::fixPathToTargetOS(spec);
+#endif
+    return spec;
+}
+
+bool
+MakefileGenerator::openOutput(QFile &file) const
+{
+    {
+	QString outdir;
+	if(!file.name().isEmpty()) {
+	    if(QDir::isRelativePath(file.name()))
+		file.setName(Option::output_dir + file.name()); //pwd when qmake was run
+	    QFileInfo fi(file);
+	    if(fi.isDir())
+		outdir = file.name() + QDir::separator();
+	}
+	if(!outdir.isEmpty() || file.name().isEmpty()) {
+	    QString fname = "Makefile";
+	    if(!project->isEmpty("MAKEFILE"))
+	       fname = project->first("MAKEFILE");
+	    file.setName(outdir + fname);
+	}
+    }
+    if(QDir::isRelativePath(file.name()))
+	file.setName(Option::output_dir + file.name()); //pwd when qmake was run
+    if(project->isEmpty("QMAKE_MAKEFILE"))
+	project->variables()["QMAKE_MAKEFILE"].append(file.name());
+    int slsh = file.name().findRev(Option::dir_sep);
+    if(slsh != -1)
+	createDir(file.name().left(slsh));
+    if(file.open(IO_WriteOnly | IO_Translate)) {
+	QFileInfo fi(Option::output);
+	QString od = Option::fixPathToTargetOS((fi.isSymLink() ? fi.readLink() : fi.dirPath()) );
+	if(QDir::isRelativePath(od))
+	    od.prepend(Option::output_dir);
+	Option::output_dir = od;
+	return TRUE;
+    }
+    return FALSE;
+}
+
+
+
+//Factory thing
+#include "unixmake.h"
+#include "msvc_nmake.h"
+#include "borland_bmake.h"
+#include "mingw_make.h"
+#include "msvc_dsp.h"
+#include "msvc_vcproj.h"
+#include "metrowerks_xml.h"
+#include "pbuilder_pbx.h"
+#include "projectgenerator.h"
+
+MakefileGenerator *
+MakefileGenerator::create(QMakeProject *proj)
+{
+    if(Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT)
+	return new ProjectGenerator(proj);
+
+    MakefileGenerator *mkfile = NULL;
+    QString gen = proj->first("MAKEFILE_GENERATOR");
+    if(gen.isEmpty()) {
+	fprintf(stderr, "No generator specified in config file: %s\n",
+		proj->projectFile().latin1());
+    } else if(gen == "UNIX") {
+	mkfile = new UnixMakefileGenerator(proj);
+    } else if(gen == "MSVC") {
+	// Visual Studio =< v6.0
+	if(proj->first("TEMPLATE").find(QRegExp("^vc.*")) != -1)
+	    mkfile = new DspMakefileGenerator(proj);
+	else
+	    mkfile = new NmakeMakefileGenerator(proj);
+    } else if(gen == "MSVC.NET") {
+	// Visual Studio >= v7.0
+	if(proj->first("TEMPLATE").find(QRegExp("^vc.*")) != -1)
+	    mkfile = new VcprojGenerator(proj);
+	else
+	    mkfile = new NmakeMakefileGenerator(proj);
+    } else if(gen == "BMAKE") {
+	mkfile = new BorlandMakefileGenerator(proj);
+    } else if(gen == "MINGW") {
+	mkfile = new MingwMakefileGenerator(proj);
+    } else if(gen == "METROWERKS") {
+	mkfile = new MetrowerksMakefileGenerator(proj);
+    } else if(gen == "PROJECTBUILDER") {
+	mkfile = new ProjectBuilderMakefileGenerator(proj);
+    } else {
+	fprintf(stderr, "Unknown generator specified: %s\n", gen.latin1());
+    }
+    return mkfile;
+}
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
new file mode 100644
index 0000000..5c21897
--- /dev/null
+++ b/qmake/generators/makefile.h
@@ -0,0 +1,193 @@
+/****************************************************************************
+**
+** Definition of MakefileGenerator class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+#ifndef __MAKEFILE_H__
+#define __MAKEFILE_H__
+
+#include "option.h"
+#include "project.h"
+#include <qtextstream.h>
+
+#ifdef Q_OS_WIN32
+#define QT_POPEN _popen
+#else
+#define QT_POPEN popen
+#endif
+
+class MakefileGenerator
+{
+    QString spec;
+    bool init_opath_already, init_already, moc_aware, no_io;
+    QStringList createObjectList(const QString &var);
+    QString build_args();
+    QString dependencyKey(const QString &file) const;
+    QMap<QString, bool> depProcessed;
+    QMap<QString, QString> depHeuristics, fileFixed;
+    QMap<QString, QString> mocablesToMOC, mocablesFromMOC;
+    QMap<QString, QStringList> depends;
+
+protected:
+    void writeObj(QTextStream &, const QString &obj, const QString &src);
+    void writeUicSrc(QTextStream &, const QString &ui);
+    void writeMocObj(QTextStream &, const QString &obj, const QString &src);
+    void writeMocSrc(QTextStream &, const QString &src);
+    void writeLexSrc(QTextStream &, const QString &lex);
+    void writeYaccSrc(QTextStream &, const QString &yac);
+    void writeInstalls(QTextStream &t, const QString &installs);
+    void writeImageObj(QTextStream &t, const QString &obj);
+    void writeImageSrc(QTextStream &t, const QString &images);
+
+protected:
+
+    QMakeProject *project;
+
+    class MakefileDependDir {
+    public:
+	MakefileDependDir(const QString &r, const QString &l) : real_dir(r), local_dir(l) { }
+	QString real_dir, local_dir;
+    };
+    bool generateDependencies(QPtrList<MakefileDependDir> &dirs, const QString &x, bool recurse);
+
+    QString buildArgs();
+
+    QString specdir();
+    QString cleanFilePath(const QString &file) const;
+    bool generateMocList(const QString &fn);
+
+    QString findMocSource(const QString &moc_file) const;
+    QString findMocDestination(const QString &src_file) const;
+    virtual QStringList &findDependencies(const QString &file);
+
+    void setNoIO(bool o);
+    bool noIO() const;
+
+    void setMocAware(bool o);
+    bool mocAware() const;
+    void logicWarn(const QString &, const QString &);
+
+    virtual bool doDepends() const { return Option::mkfile::do_deps; }
+    bool writeHeader(QTextStream &);
+    virtual bool writeMakefile(QTextStream &);
+    virtual bool writeMakeQmake(QTextStream &);
+    void initOutPaths();
+    virtual void init();
+
+    //for cross-platform dependent directories
+    virtual void usePlatformDir();
+
+    //for installs
+    virtual QString defaultInstall(const QString &);
+
+    //for prl
+    bool processPrlFile(QString &);
+    virtual void processPrlVariable(const QString &, const QStringList &);
+    virtual void processPrlFiles();
+    virtual void writePrlFile(QTextStream &);
+
+    //make sure libraries are found
+    virtual bool findLibraries();
+    virtual QString findDependency(const QString &);
+
+    void setProcessedDependencies(const QString &file, bool b);
+    bool processedDependencies(const QString &file);
+
+    virtual QString var(const QString &var);
+    QString varGlue(const QString &var, const QString &before, const QString &glue, const QString &after);
+    QString varList(const QString &var);
+    QString val(const QStringList &varList);
+    QString valGlue(const QStringList &varList, const QString &before, const QString &glue, const QString &after);
+    QString valList(const QStringList &varList);
+
+
+    QString fileFixify(const QString& file, const QString &out_dir=QString::null, 
+		       const QString &in_dir=QString::null, bool force_fix=FALSE, bool canon=TRUE) const;
+    QStringList fileFixify(const QStringList& files, const QString &out_dir=QString::null, 
+			   const QString &in_dir=QString::null, bool force_fix=FALSE, bool canon=TRUE) const;
+public:
+    MakefileGenerator(QMakeProject *p);
+    virtual ~MakefileGenerator();
+
+    static MakefileGenerator *create(QMakeProject *);
+    virtual bool write();
+    virtual bool openOutput(QFile &) const;
+};
+
+inline QString MakefileGenerator::findMocSource(const QString &moc_file) const
+{
+    QString tmp = cleanFilePath(moc_file);
+    if (mocablesFromMOC.contains(tmp))
+	return mocablesFromMOC[tmp];
+    else
+	return QString("");
+}
+
+inline QString MakefileGenerator::findMocDestination(const QString &src_file) const
+{
+    QString tmp = cleanFilePath(src_file);
+    if (mocablesToMOC.contains(tmp))
+	return mocablesToMOC[tmp];
+    else
+	return QString("");
+}
+
+inline void MakefileGenerator::setMocAware(bool o)
+{ moc_aware = o; }
+
+inline bool MakefileGenerator::mocAware() const
+{ return moc_aware; }
+
+inline void MakefileGenerator::setNoIO(bool o)
+{ no_io = o; }
+
+inline bool MakefileGenerator::noIO() const
+{ return no_io; }
+
+inline QString MakefileGenerator::defaultInstall(const QString &)
+{ return QString(""); }
+
+inline bool MakefileGenerator::findLibraries()
+{ return TRUE; }
+
+inline QString MakefileGenerator::findDependency(const QString &)
+{ return QString(""); }
+
+inline MakefileGenerator::~MakefileGenerator()
+{ }
+
+QString mkdir_p_asstring(const QString &dir);
+
+#endif /* __MAKEFILE_H__ */
diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp
new file mode 100644
index 0000000..f3d4633
--- /dev/null
+++ b/qmake/generators/projectgenerator.cpp
@@ -0,0 +1,491 @@
+/****************************************************************************
+**
+** Implementation of ProjectGenerator class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#include "projectgenerator.h"
+#include "option.h"
+#include <qdir.h>
+#include <qfile.h>
+#include <qfileinfo.h>
+#include <qregexp.h>
+
+QString project_builtin_regx() //calculate the builtin regular expression..
+{ 
+    QString ret;
+    QStringList builtin_exts(".c");
+    builtin_exts << Option::ui_ext << Option::yacc_ext << Option::lex_ext << ".ts";
+    builtin_exts += Option::h_ext + Option::cpp_ext;
+    for(QStringList::Iterator ext_it = builtin_exts.begin(); 
+	ext_it != builtin_exts.end(); ++ext_it) {
+	if(!ret.isEmpty())
+	    ret += "; ";
+	ret += QString("*") + (*ext_it);
+    }
+    return ret;
+}
+
+
+
+ProjectGenerator::ProjectGenerator(QMakeProject *p) : MakefileGenerator(p), init_flag(FALSE)
+{
+}
+
+void
+ProjectGenerator::init()
+{
+    if(init_flag)
+	return;
+    int file_count = 0;
+    init_flag = TRUE;
+
+    QMap<QString, QStringList> &v = project->variables();
+    QString templ = Option::user_template.isEmpty() ? QString("app") : Option::user_template;
+    if(!Option::user_template_prefix.isEmpty())
+	templ.prepend(Option::user_template_prefix);
+    v["TEMPLATE_ASSIGN"] += templ;
+
+    //figure out target
+    if(Option::output.name() == "-" || Option::output.name().isEmpty())
+	v["TARGET"] = QStringList("unknown");
+
+    //the scary stuff
+    if(project->first("TEMPLATE_ASSIGN") != "subdirs") {
+	QString builtin_regex = project_builtin_regx();
+	QStringList dirs = Option::projfile::project_dirs;
+	if(Option::projfile::do_pwd) {
+	    if(!v["INCLUDEPATH"].contains("."))
+		v["INCLUDEPATH"] += ".";
+	    dirs.prepend(QDir::currentDirPath());
+	}
+
+	for(QStringList::Iterator pd = dirs.begin(); pd != dirs.end(); pd++) {
+	    QString dir, regex;
+	    bool add_depend = FALSE;
+	    if(QFile::exists((*pd))) {
+		QFileInfo fi((*pd));
+		if(fi.isDir()) {
+		    dir = (*pd);
+		    add_depend = TRUE;
+		    if(dir.right(1) != Option::dir_sep)
+			dir += Option::dir_sep;
+		    if(Option::projfile::do_recursive) {
+			QDir d(dir);
+			d.setFilter(QDir::Dirs);
+			for(int i = 0; i < (int)d.count(); i++) {
+			    if(d[i] != "." && d[i] != "..") 
+				dirs.append(dir + d[i] + QDir::separator() + builtin_regex);
+			}
+		    }
+		    regex = builtin_regex;
+		} else {
+		    QString file = (*pd);
+		    int s = file.findRev(Option::dir_sep);
+		    if(s != -1)
+			dir = file.left(s+1);
+		    if(addFile(file)) {
+			add_depend = TRUE;
+			file_count++;
+		    }
+		}
+	    } else { //regexp
+		regex = (*pd);
+	    }
+	    if(!regex.isEmpty()) {
+		int s = regex.findRev(Option::dir_sep);
+		if(s != -1) {
+		    dir = regex.left(s+1);
+		    regex = regex.right(regex.length() - (s+1));
+		}
+		if(Option::projfile::do_recursive) {
+		    QDir d(dir);
+		    d.setFilter(QDir::Dirs);
+		    for(int i = 0; i < (int)d.count(); i++) {
+			if(d[i] != "." && d[i] != "..") 
+			    dirs.append(dir + d[i] + QDir::separator() + regex);
+		    }
+		}
+		QDir d(dir, regex);
+		for(int i = 0; i < (int)d.count(); i++) {
+		    QString file = dir + d[i];
+		    if (addFile(file)) {
+			add_depend = TRUE;
+			file_count++;
+		    }
+		}
+	    }
+	    if(add_depend && !dir.isEmpty() && !v["DEPENDPATH"].contains(dir)) {
+		QFileInfo fi(dir);
+		if(fi.absFilePath() != QDir::currentDirPath()) 
+		    v["DEPENDPATH"] += fileFixify(dir);
+	    }
+	}
+    }
+    if(!file_count) { //shall we try a subdir?
+	QStringList dirs = Option::projfile::project_dirs;
+	if(Option::projfile::do_pwd)
+	    dirs.prepend(".");
+	const QString out_file = fileFixify(Option::output.name());
+	for(QStringList::Iterator pd = dirs.begin(); pd != dirs.end(); pd++) {
+	    if(QFile::exists((*pd))) {
+		QString newdir = (*pd);
+		QFileInfo fi(newdir);
+		if(fi.isDir()) {
+		    newdir = fileFixify(newdir);
+		    QStringList &subdirs = v["SUBDIRS"];
+		    if(QFile::exists(fi.filePath() + QDir::separator() + fi.fileName() + ".pro") &&
+		       !subdirs.contains(newdir)) {
+			subdirs.append(newdir);
+		    } else {
+			QDir d(newdir, "*.pro");
+			d.setFilter(QDir::Files);
+			for(int i = 0; i < (int)d.count(); i++) {
+			    QString nd = newdir;
+			    if(nd == ".")
+				nd = "";
+			    else if(!nd.isEmpty() && !nd.endsWith(QString(QChar(QDir::separator()))))
+				nd += QDir::separator();
+			    nd += d[i];
+			    fileFixify(nd);
+			    if(d[i] != "." && d[i] != ".." && !subdirs.contains(nd) && !out_file.endsWith(nd)) 
+				subdirs.append(nd);
+			}
+		    }
+		    if(Option::projfile::do_recursive) {
+			QDir d(newdir);
+			d.setFilter(QDir::Dirs);
+			for(int i = 0; i < (int)d.count(); i++) {
+			    QString nd = fileFixify(newdir + QDir::separator() + d[i]);
+			    if(d[i] != "." && d[i] != ".." && !dirs.contains(nd))
+				dirs.append(nd);
+			}
+		    }
+		}
+	    } else { //regexp
+		QString regx = (*pd), dir;
+		int s = regx.findRev(Option::dir_sep);
+		if(s != -1) {
+		    dir = regx.left(s+1);
+		    regx = regx.right(regx.length() - (s+1));
+		}
+		QDir d(dir, regx);
+		d.setFilter(QDir::Dirs);
+		QStringList &subdirs = v["SUBDIRS"];
+		for(int i = 0; i < (int)d.count(); i++) {
+		    QString newdir(dir + d[i]);
+		    QFileInfo fi(newdir);
+		    if(fi.fileName() != "." && fi.fileName() != "..") {
+			newdir = fileFixify(newdir);
+			if(QFile::exists(fi.filePath() + QDir::separator() + fi.fileName() + ".pro") &&
+			   !subdirs.contains(newdir)) {
+			   subdirs.append(newdir);
+			} else {
+			    QDir d(newdir, "*.pro");
+			    d.setFilter(QDir::Files);
+			    for(int i = 0; i < (int)d.count(); i++) {
+				QString nd = newdir + QDir::separator() + d[i];
+				fileFixify(nd);
+				if(d[i] != "." && d[i] != ".." && !subdirs.contains(nd)) {
+				    if(newdir + d[i] != Option::output_dir + Option::output.name())
+					subdirs.append(nd);
+				}
+			    }
+			}
+			if(Option::projfile::do_recursive && !dirs.contains(newdir))
+			    dirs.append(newdir);
+		    }
+		}
+	    }
+	}
+	v["TEMPLATE_ASSIGN"] = "subdirs";
+	return;
+    }
+
+    QPtrList<MakefileDependDir> deplist;
+    deplist.setAutoDelete(TRUE);
+    {
+	QStringList &d = v["DEPENDPATH"];
+	for(QStringList::Iterator it = d.begin(); it != d.end(); ++it) {
+	    QString r = (*it), l = Option::fixPathToLocalOS((*it));
+	    deplist.append(new MakefileDependDir(r, l));
+	}
+    }
+    QStringList &h = v["HEADERS"];
+    bool no_qt_files = TRUE;
+    QString srcs[] = { "SOURCES", "YACCSOURCES", "LEXSOURCES", "INTERFACES", QString::null };
+    for(int i = 0; !srcs[i].isNull(); i++) {
+	QStringList &l = v[srcs[i]];
+	for(QStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) {
+	    if(generateDependencies(deplist, (*val_it), TRUE)) {
+		QStringList &tmp = findDependencies((*val_it));
+		if(!tmp.isEmpty()) {
+		    for(QStringList::Iterator dep_it = tmp.begin(); dep_it != tmp.end(); ++dep_it) {
+			QString file_dir = (*dep_it).section(Option::dir_sep, 0, -2),
+			    file_no_path = (*dep_it).section(Option::dir_sep, -1);
+			if(!file_dir.isEmpty()) {
+			    for(MakefileDependDir *mdd = deplist.first(); mdd; mdd = deplist.next()) {
+				if(mdd->local_dir == file_dir && !v["INCLUDEPATH"].contains(mdd->real_dir))
+				    v["INCLUDEPATH"] += mdd->real_dir;
+			    }
+			}
+			if(no_qt_files && file_no_path.find(QRegExp("^q[a-z_0-9].h$")) != -1)
+			    no_qt_files = FALSE;
+			QString h_ext;
+			for(QStringList::Iterator hit = Option::h_ext.begin(); 
+			    hit != Option::h_ext.end(); ++hit) {
+			    if((*dep_it).endsWith((*hit))) {
+				h_ext = (*hit);
+				break;
+			    }
+			}
+			if(!h_ext.isEmpty()) {
+			    if((*dep_it).left(1).lower() == "q") {
+				QString qhdr = (*dep_it).lower();
+				if(file_no_path == "qthread.h")
+				    addConfig("thread");
+			    }
+			    for(QStringList::Iterator cppit = Option::cpp_ext.begin();
+				cppit != Option::cpp_ext.end(); ++cppit) {
+				QString src((*dep_it).left((*dep_it).length() - h_ext.length()) + 
+					    (*cppit));
+				if(QFile::exists(src)) {
+				    bool exists = FALSE;
+				    QStringList &srcl = v["SOURCES"];
+				    for(QStringList::Iterator src_it = srcl.begin(); 
+					src_it != srcl.end(); ++src_it) {
+					if((*src_it).lower() == src.lower()) {
+					    exists = TRUE;
+					    break;
+					}
+				    }
+				    if(!exists)
+					srcl.append(src);
+				}
+			    }
+			} else if((*dep_it).endsWith(Option::lex_ext) &&
+				  file_no_path.startsWith(Option::lex_mod)) {
+			    addConfig("lex_included");
+			}
+			if(!h.contains((*dep_it))) {
+			    if(generateMocList((*dep_it)) && !findMocDestination((*dep_it)).isEmpty())
+				h += (*dep_it);
+			}
+		    }
+		}
+	    }
+	}
+    }
+    if(h.isEmpty())
+	addConfig("moc", FALSE);
+
+    //if we find a file that matches an forms it needn't be included in the project
+    QStringList &u = v["INTERFACES"];
+    QString no_ui[] = { "SOURCES", "HEADERS", QString::null };
+    {
+	for(int i = 0; !no_ui[i].isNull(); i++) {
+	    QStringList &l = v[no_ui[i]];
+	    for(QStringList::Iterator val_it = l.begin(); val_it != l.end(); ) {
+		bool found = FALSE;
+		for(QStringList::Iterator ui_it = u.begin(); ui_it != u.end(); ++ui_it) {
+		    QString s1 = (*val_it).right((*val_it).length() - ((*val_it).findRev(Option::dir_sep) + 1));
+		    if(s1.findRev('.') != -1)
+			s1 = s1.left(s1.findRev('.')) + Option::ui_ext;
+		    QString u1 = (*ui_it).right((*ui_it).length() - ((*ui_it).findRev(Option::dir_sep) + 1));
+		    if(s1 == u1) {
+			found = TRUE;
+			break;
+		    }
+		}
+		if(!found && (*val_it).endsWith(Option::cpp_moc_ext))
+		    found = TRUE;
+		if(found)
+		    val_it = l.remove(val_it);
+		else
+		    ++val_it;
+	    }
+	}
+    }
+}
+
+
+bool
+ProjectGenerator::writeMakefile(QTextStream &t)
+{
+    t << "######################################################################" << endl;
+    t << "# Automatically generated by qmake (" << qmake_version() << ") " << QDateTime::currentDateTime().toString() << endl;
+    t << "######################################################################" << endl << endl;
+    QStringList::Iterator it;
+    for(it = Option::before_user_vars.begin(); it != Option::before_user_vars.end(); ++it)
+	t << (*it) << endl;
+    t << getWritableVar("TEMPLATE_ASSIGN", FALSE);
+    if(project->first("TEMPLATE_ASSIGN") == "subdirs") {
+	t << endl << "# Directories" << "\n"
+	  << getWritableVar("SUBDIRS");
+    } else {
+	t << getWritableVar("TARGET")
+	  << getWritableVar("CONFIG", FALSE)
+	  << getWritableVar("CONFIG_REMOVE", FALSE)
+	  << getWritableVar("DEPENDPATH")
+	  << getWritableVar("INCLUDEPATH") << endl;
+
+	t << "# Input" << "\n";
+	t << getWritableVar("HEADERS") 
+	  << getWritableVar("INTERFACES") 
+	  << getWritableVar("LEXSOURCES") 
+	  << getWritableVar("YACCSOURCES") 
+	  << getWritableVar("SOURCES")
+	  << getWritableVar("TRANSLATIONS");
+    }
+    for(it = Option::after_user_vars.begin(); it != Option::after_user_vars.end(); ++it)
+	t << (*it) << endl;
+    return TRUE;
+}
+
+bool
+ProjectGenerator::addConfig(const QString &cfg, bool add)
+{
+    QString where = "CONFIG";
+    if(!add)
+	where = "CONFIG_REMOVE";
+    if(!project->variables()[where].contains(cfg)) {
+	project->variables()[where] += cfg;
+	return TRUE;
+    }
+    return FALSE;
+}
+
+
+bool
+ProjectGenerator::addFile(QString file)
+{
+    file = fileFixify(file, QDir::currentDirPath());
+    QString dir;
+    int s = file.findRev(Option::dir_sep);
+    if(s != -1)
+	dir = file.left(s+1);
+    if(file.mid(dir.length(), Option::h_moc_mod.length()) == Option::h_moc_mod)
+	return FALSE;
+
+    QString where;
+    for(QStringList::Iterator cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit) {
+	if(file.endsWith((*cppit))) {
+	    if(QFile::exists(file.left(file.length() - (*cppit).length()) + Option::ui_ext))
+		return FALSE;
+	    else
+		where = "SOURCES";
+	    break;
+	}
+    }
+    if(where.isEmpty()) {
+	for(QStringList::Iterator hit = Option::h_ext.begin(); hit != Option::h_ext.end(); ++hit) {
+	    if(file.endsWith((*hit))) {
+		where = "HEADERS";
+		break;
+	    }
+	}
+    }
+    if(where.isEmpty()) {
+	if(file.endsWith(Option::ui_ext))
+	    where = "INTERFACES";
+	else if(file.endsWith(".c"))
+	    where = "SOURCES";
+	else if(file.endsWith(Option::lex_ext))
+	    where = "LEXSOURCES";
+	else if(file.endsWith(Option::yacc_ext))
+	    where = "YACCSOURCES";
+	else if(file.endsWith(".ts"))
+	    where = "TRANSLATIONS";
+    }
+
+    QString newfile = fileFixify(file);
+    if(!where.isEmpty() && !project->variables()[where].contains(file)) {
+	project->variables()[where] += newfile;
+	return TRUE;
+    }
+    return FALSE;
+}
+
+
+QString
+ProjectGenerator::getWritableVar(const QString &v, bool fixPath)
+{
+    QStringList &vals = project->variables()[v];
+    if(vals.isEmpty())
+	return "";
+
+    QString ret;
+    if(v.endsWith("_REMOVE"))
+	ret = v.left(v.length() - 7) + " -= ";
+    else if(v.endsWith("_ASSIGN"))
+	ret = v.left(v.length() - 7) + " = ";
+    else
+	ret = v + " += ";
+    QString join = vals.join(" ");
+    if(ret.length() + join.length() > 80) {
+	QString spaces;
+	for(unsigned int i = 0; i < ret.length(); i++)
+	    spaces += " ";
+	join = vals.join(" \\\n" + spaces);
+    } 
+#if 0
+    // ### Commented out for now so that project generation works.
+    // Sam: it had to do with trailing \'s (ie considered continuation lines)
+    if(fixPath)
+	join = join.replace("\\", "/");
+#else
+    Q_UNUSED(fixPath);
+#endif
+    return ret + join + "\n";
+}
+
+bool
+ProjectGenerator::openOutput(QFile &file) const
+{
+    QString outdir;
+    if(!file.name().isEmpty()) {
+	QFileInfo fi(file);
+	if(fi.isDir())
+	    outdir = fi.dirPath() + QDir::separator();
+    }
+    if(!outdir.isEmpty() || file.name().isEmpty()) {
+	QString dir = QDir::currentDirPath();
+	int s = dir.findRev('/');
+	if(s != -1)
+	    dir = dir.right(dir.length() - (s + 1));
+	file.setName(outdir + dir + ".pro");
+    }
+    return MakefileGenerator::openOutput(file);
+}
diff --git a/qmake/generators/projectgenerator.h b/qmake/generators/projectgenerator.h
new file mode 100644
index 0000000..e06f5c1
--- /dev/null
+++ b/qmake/generators/projectgenerator.h
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Definition of ProjectGenerator class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+#ifndef __PROJECTGENERATOR_H__
+#define __PROJECTGENERATOR_H__
+
+#include "makefile.h"
+
+class ProjectGenerator : public MakefileGenerator
+{
+    bool init_flag;
+    bool addFile(QString);
+    bool addConfig(const QString &, bool add=TRUE);
+    QString getWritableVar(const QString &, bool fixPath=TRUE);
+protected:
+    virtual void init();
+    virtual bool writeMakefile(QTextStream &);
+public:
+    ProjectGenerator(QMakeProject *p);
+    ~ProjectGenerator();
+    virtual bool openOutput(QFile &) const;
+};
+
+inline ProjectGenerator::~ProjectGenerator()
+{ }
+
+
+#endif /* __PROJECTGENERATOR_H__ */
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
new file mode 100644
index 0000000..e863495
--- /dev/null
+++ b/qmake/generators/unix/unixmake.cpp
@@ -0,0 +1,880 @@
+/****************************************************************************
+**
+** Implementation of UnixMakefileGenerator class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#include "unixmake.h"
+#include "option.h"
+#include <qregexp.h>
+#include <qfile.h>
+#include <qdict.h>
+#include <qdir.h>
+#include <time.h>
+
+
+void
+UnixMakefileGenerator::init()
+{
+    if(init_flag)
+	return;
+    init_flag = TRUE;
+
+    if(!project->isEmpty("QMAKE_FAILED_REQUIREMENTS")) /* no point */
+	return;
+
+    QStringList &configs = project->variables()["CONFIG"];
+    /* this should probably not be here, but I'm using it to wrap the .t files */
+    if(project->first("TEMPLATE") == "app")
+	project->variables()["QMAKE_APP_FLAG"].append("1");
+    else if(project->first("TEMPLATE") == "lib")
+	project->variables()["QMAKE_LIB_FLAG"].append("1");
+    else if(project->first("TEMPLATE") == "subdirs") {
+	MakefileGenerator::init();
+	if(project->isEmpty("MAKEFILE"))
+	    project->variables()["MAKEFILE"].append("Makefile");
+	if(project->isEmpty("QMAKE"))
+	    project->variables()["QMAKE"].append("qmake");
+	if(project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].findIndex("qmake_all") == -1)
+	    project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].append("qmake_all");
+	return; /* subdirs is done */
+    }
+
+    if( project->isEmpty("QMAKE_EXTENSION_SHLIB") ) {
+	if ( project->isEmpty("QMAKE_CYGWIN_SHLIB") ) {
+	    project->variables()["QMAKE_EXTENSION_SHLIB"].append( "so" );
+	} else {
+	    project->variables()["QMAKE_EXTENSION_SHLIB"].append( "dll" );
+	}
+    }
+    if( project->isEmpty("QMAKE_CFLAGS_PRECOMPILE"))
+	project->variables()["QMAKE_CFLAGS_PRECOMPILE"].append("-x c-header -c");
+    if( project->isEmpty("QMAKE_CXXFLAGS_PRECOMPILE"))
+	project->variables()["QMAKE_CXXFLAGS_PRECOMPILE"].append("-x c++-header -c");
+    if( project->isEmpty("QMAKE_CFLAGS_USE_PRECOMPILE"))
+	project->variables()["QMAKE_CFLAGS_USE_PRECOMPILE"].append("-include");
+    if( project->isEmpty("QMAKE_EXTENSION_PLUGIN") )
+	project->variables()["QMAKE_EXTENSION_PLUGIN"].append(project->first("QMAKE_EXTENSION_SHLIB"));
+    if( project->isEmpty("QMAKE_COPY_FILE") )
+	project->variables()["QMAKE_COPY_FILE"].append( "$(COPY)" );
+    if( project->isEmpty("QMAKE_COPY_DIR") )
+	project->variables()["QMAKE_COPY_DIR"].append( "$(COPY) -R" );
+    if( project->isEmpty("QMAKE_INSTALL_FILE") )
+	project->variables()["QMAKE_INSTALL_FILE"].append( "$(COPY_FILE)" );
+    if( project->isEmpty("QMAKE_INSTALL_DIR") )
+	project->variables()["QMAKE_INSTALL_DIR"].append( "$(COPY_DIR)" );
+    if( project->isEmpty("QMAKE_LIBTOOL") )
+	project->variables()["QMAKE_LIBTOOL"].append( "libtool --silent" );
+    //If the TARGET looks like a path split it into DESTDIR and the resulting TARGET
+    if(!project->isEmpty("TARGET")) {
+	QString targ = project->first("TARGET");
+	int slsh = QMAX(targ.findRev('/'), targ.findRev(Option::dir_sep));
+	if(slsh != -1) {
+	    if(project->isEmpty("DESTDIR"))
+		project->values("DESTDIR").append("");
+	    else if(project->first("DESTDIR").right(1) != Option::dir_sep)
+		project->variables()["DESTDIR"] = project->first("DESTDIR") + Option::dir_sep;
+	    project->variables()["DESTDIR"] = project->first("DESTDIR") + targ.left(slsh+1);
+	    project->variables()["TARGET"] = targ.mid(slsh+1);
+	}
+    }
+
+    project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
+    project->variables()["QMAKE_ORIG_DESTDIR"] = project->variables()["DESTDIR"];
+
+    bool is_qt = (project->first("TARGET") == "qt" || project->first("TARGET") == "qte" ||
+		  project->first("TARGET") == "qt-mt" || project->first("TARGET") == "qte-mt");
+    bool extern_libs = !project->isEmpty("QMAKE_APP_FLAG") ||
+		       (!project->isEmpty("QMAKE_LIB_FLAG") &&
+			project->isActiveConfig("dll")) || is_qt;
+    project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
+    if ( (!project->isEmpty("QMAKE_LIB_FLAG") && !project->isActiveConfig("staticlib") ) ||
+	 (project->isActiveConfig("qt") &&  project->isActiveConfig( "plugin" ) )) {
+	if(configs.findIndex("dll") == -1) configs.append("dll");
+    } else if ( !project->isEmpty("QMAKE_APP_FLAG") || project->isActiveConfig("dll") ) {
+	configs.remove("staticlib");
+    }
+    if ( project->isActiveConfig("warn_off") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_OFF"];
+    } else if ( project->isActiveConfig("warn_on") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_ON"];
+    }
+    if ( project->isActiveConfig("debug") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_DEBUG"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_DEBUG"];
+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_DEBUG"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RELEASE"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RELEASE"];
+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_RELEASE"];
+    }
+    if(!project->isEmpty("QMAKE_INCREMENTAL"))
+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_INCREMENTAL"];
+    else if(!project->isEmpty("QMAKE_LFLAGS_PREBIND") &&
+	    !project->variables()["QMAKE_LIB_FLAG"].isEmpty() &&
+	    project->isActiveConfig("dll"))
+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_PREBIND"];
+    if(!project->isEmpty("QMAKE_INCDIR"))
+	project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR"];
+    if(!project->isEmpty("QMAKE_LIBDIR")) {
+	if ( !project->isEmpty("QMAKE_RPATH") )
+	    project->variables()["QMAKE_LFLAGS"] += varGlue("QMAKE_LIBDIR", " " + var("QMAKE_RPATH"),
+							    " " + var("QMAKE_RPATH"), "");
+	project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue( "QMAKE_LIBDIR", "-L", " -L", "" );
+    }
+    if ( project->isActiveConfig("qtopia") ) {
+	if(configs.findIndex("qtopialib") == -1)
+	    configs.append("qtopialib");
+	if(configs.findIndex("qtopiainc") == -1)
+	    configs.append("qtopiainc");
+    }
+    if ( project->isActiveConfig("qtopiainc") )
+	project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QTOPIA"];
+    if ( project->isActiveConfig("qtopialib") ) {
+	if(!project->isEmpty("QMAKE_LIBDIR_QTOPIA"))
+	    project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR_QTOPIA", "-L", " -L", "");
+	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QTOPIA"];
+    }
+    if ( project->isActiveConfig("qt") ) {
+	if ( project->isActiveConfig("accessibility" ) )
+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT");
+	if ( project->isActiveConfig("tablet") )
+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_TABLET_SUPPORT");
+	if(configs.findIndex("moc")) configs.append("moc");
+	project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QT"];
+	if ( !project->isActiveConfig("debug") )
+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG");
+	if ( !is_qt ) {
+	    if ( !project->isEmpty("QMAKE_RPATH") ) {
+		if ( !project->isEmpty("QMAKE_RTLDIR_QT") )
+		    project->variables()["QMAKE_LFLAGS"] += varGlue("QMAKE_RTLDIR_QT", " " + var("QMAKE_RPATH"),
+								    " " + var("QMAKE_RPATH"), "");
+		else if ( !project->isEmpty("QMAKE_LIBDIR_QT") )
+		    project->variables()["QMAKE_LFLAGS"] += varGlue("QMAKE_LIBDIR_QT", " " + var("QMAKE_RPATH"),
+								    " " + var("QMAKE_RPATH"), "");
+	    }
+	    if ( !project->isEmpty("QMAKE_LIBDIR_QT") )
+		project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR_QT", "-L", " -L", "");
+	    if ( project->isActiveConfig("thread") && !project->isEmpty("QMAKE_LIBS_QT_THREAD") )
+		project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"];
+	    else
+		project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"];
+	}
+    }
+    if ( project->isActiveConfig("opengl") && !project->isActiveConfig("dlopen_opengl")) {
+	project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_OPENGL"];
+	if(!project->isEmpty("QMAKE_LIBDIR_OPENGL"))
+	    project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR_OPENGL", "-L", " -L", "");
+	if ( is_qt )
+	    project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL_QT"];
+	else
+	    project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"];
+    }
+    if ( extern_libs && (project->isActiveConfig("qt") || project->isActiveConfig("opengl")) ) {
+	if(configs.findIndex("x11lib") == -1)
+	    configs.append("x11lib");
+	if ( project->isActiveConfig("opengl") && configs.findIndex("x11inc") == -1 )
+	    configs.append("x11inc");
+    }
+    if ( project->isActiveConfig("x11") ) {
+	if(configs.findIndex("x11lib") == -1)
+	    configs.append("x11lib");
+	if(configs.findIndex("x11inc") == -1)
+	    configs.append("x11inc");
+    }
+    if ( project->isActiveConfig("x11inc") )
+	project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_X11"];
+    if ( project->isActiveConfig("x11lib") ) {
+	if(!project->isEmpty("QMAKE_LIBDIR_X11"))
+	    project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR_X11", "-L", " -L", "");
+	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_X11"];
+    }
+    if ( project->isActiveConfig("x11sm") )
+	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_X11SM"];
+    if ( project->isActiveConfig("dylib") )
+	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_DYNLOAD"];
+    if ( project->isActiveConfig("thread") ) {
+	if(project->isActiveConfig("qt"))
+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT");
+	if ( !project->isEmpty("QMAKE_CFLAGS_THREAD")) {
+	    project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_THREAD"];
+	    project->variables()["PRL_EXPORT_CFLAGS"] += project->variables()["QMAKE_CFLAGS_THREAD"];
+	}
+	if( !project->isEmpty("QMAKE_CXXFLAGS_THREAD")) {
+	    project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_THREAD"];
+	    project->variables()["PRL_EXPORT_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_THREAD"];
+	}
+	project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_THREAD"];
+	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_THREAD"];
+	if(!project->isEmpty("QMAKE_LFLAGS_THREAD"))
+	    project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_THREAD"];
+    }
+    if ( project->isActiveConfig("moc") )
+	setMocAware(TRUE);
+    QString compile_flag = var("QMAKE_COMPILE_FLAG");
+    if(compile_flag.isEmpty())
+	compile_flag = "-c";
+    if(doPrecompiledHeaders() && !project->isEmpty("PRECOMPILED_HEADER")) {
+	QString prefix_flags = project->first("QMAKE_CFLAGS_PREFIX_INCLUDE");
+	if(prefix_flags.isEmpty())
+	    prefix_flags = "-include";
+	compile_flag += " " + prefix_flags + " " + project->first("QMAKE_ORIG_TARGET");
+    }
+    if(!project->isEmpty("ALLMOC_HEADER")) {
+	initOutPaths(); 	// Need to fix outdirs since we do this before init() (because we could add to SOURCES et al)
+	QString allmoc = fileFixify(project->first("MOC_DIR") + "/allmoc.cpp", QDir::currentDirPath(), Option::output_dir);
+	project->variables()["SOURCES"].prepend(allmoc);
+	project->variables()["HEADERS_ORIG"] = project->variables()["HEADERS"];
+	project->variables()["HEADERS"].clear();
+    }
+    if ( project->isEmpty("QMAKE_RUN_CC") )
+	project->variables()["QMAKE_RUN_CC"].append("$(CC) " + compile_flag + " $(CFLAGS) $(INCPATH) -o $obj $src");
+    if ( project->isEmpty("QMAKE_RUN_CC_IMP") )
+	project->variables()["QMAKE_RUN_CC_IMP"].append("$(CC) " + compile_flag + " $(CFLAGS) $(INCPATH) -o $@ $<");
+    if ( project->isEmpty("QMAKE_RUN_CXX") )
+	project->variables()["QMAKE_RUN_CXX"].append("$(CXX) " + compile_flag + " $(CXXFLAGS) $(INCPATH) -o $obj $src");
+    if ( project->isEmpty("QMAKE_RUN_CXX_IMP") )
+	project->variables()["QMAKE_RUN_CXX_IMP"].append("$(CXX) " + compile_flag + " $(CXXFLAGS) $(INCPATH) -o $@ $<");
+    project->variables()["QMAKE_FILETAGS"] += QStringList::split("HEADERS SOURCES TARGET DESTDIR", " ");
+    if( project->isActiveConfig("GNUmake") && !project->isEmpty("QMAKE_CFLAGS_DEPS"))
+	include_deps = TRUE; //do not generate deps
+    if(project->isActiveConfig("compile_libtool"))
+	Option::obj_ext = ".lo"; //override the .o
+
+    MakefileGenerator::init();
+    if ( project->isActiveConfig("resource_fork") && !project->isActiveConfig("console")) {
+	if(!project->isEmpty("QMAKE_APP_FLAG")) {
+	    if(project->isEmpty("DESTDIR"))
+		project->values("DESTDIR").append("");
+	    project->variables()["DESTDIR"].first() += project->variables()["TARGET"].first() +
+						       ".app/Contents/MacOS/";
+	    project->variables()["QMAKE_PKGINFO"].append(project->first("DESTDIR") + "../PkgInfo");
+	    project->variables()["ALL_DEPS"] += project->first("QMAKE_PKGINFO");
+
+	    QString plist = fileFixify(project->first("QMAKE_INFO_PLIST"));
+	    if(plist.isEmpty())
+		plist = specdir() + QDir::separator() + "Info.plist." + project->first("TEMPLATE");
+	    if(QFile::exists(Option::fixPathToLocalOS(plist))) {
+		if(project->isEmpty("QMAKE_INFO_PLIST"))
+		    project->variables()["QMAKE_INFO_PLIST"].append(plist);
+		project->variables()["QMAKE_INFO_PLIST_OUT"].append(project->first("DESTDIR") +
+								    "../Info.plist");
+		project->variables()["ALL_DEPS"] += project->first("QMAKE_INFO_PLIST_OUT");
+		if(!project->isEmpty("RC_FILE"))
+		    project->variables()["ALL_DEPS"] += project->first("DESTDIR") +
+							"../Resources/application.icns";
+	    }
+	}
+    }
+
+    if(!project->isEmpty("QMAKE_INTERNAL_INCLUDED_FILES"))
+	project->variables()["DISTFILES"] += project->variables()["QMAKE_INTERNAL_INCLUDED_FILES"];
+    project->variables()["DISTFILES"] += Option::mkfile::project_files;
+
+    init2();
+    project->variables()["QMAKE_INTERNAL_PRL_LIBS"] << "QMAKE_LIBDIR_FLAGS" << "QMAKE_LIBS";
+    if(!project->isEmpty("QMAKE_MAX_FILES_PER_AR")) {
+	bool ok;
+	int max_files = project->first("QMAKE_MAX_FILES_PER_AR").toInt(&ok);
+	QStringList ar_sublibs, objs = project->variables()["OBJECTS"] + project->variables()["OBJMOC"];
+	if(ok && max_files > 5 && max_files < (int)objs.count()) {
+	    int obj_cnt = 0, lib_cnt = 0;
+	    QString lib;
+	    for(QStringList::Iterator objit = objs.begin(); objit != objs.end(); ++objit) {
+		if((++obj_cnt) >= max_files) {
+		    if(lib_cnt) {
+			lib.sprintf("lib%s-tmp%d.a", project->first("QMAKE_ORIG_TARGET").latin1(), lib_cnt);
+			ar_sublibs << lib;
+			obj_cnt = 0;
+		    }
+		    lib_cnt++;
+		}
+	    }
+	}
+	if(!ar_sublibs.isEmpty()) {
+	    project->variables()["QMAKE_AR_SUBLIBS"] = ar_sublibs;
+	    project->variables()["QMAKE_INTERNAL_PRL_LIBS"] << "QMAKE_AR_SUBLIBS";
+	}
+    }
+
+    if(project->isActiveConfig("compile_libtool")) {
+	const QString libtoolify[] = { "QMAKE_RUN_CC", "QMAKE_RUN_CC_IMP",
+				       "QMAKE_RUN_CXX", "QMAKE_RUN_CXX_IMP",
+				       "QMAKE_LINK_THREAD", "QMAKE_LINK", "QMAKE_AR_CMD", "QMAKE_LINK_SHLIB_CMD",
+				       QString::null };
+	for(int i = 0; !libtoolify[i].isNull(); i++) {
+	    QStringList &l = project->variables()[libtoolify[i]];
+	    if(!l.isEmpty()) {
+		QString libtool_flags, comp_flags;
+		if(libtoolify[i].startsWith("QMAKE_LINK") || libtoolify[i] == "QMAKE_AR_CMD") {
+		    libtool_flags += " --mode=link";
+		    if(project->isActiveConfig("staticlib")) {
+			libtool_flags += " -static";
+		    } else {
+			if(!project->isEmpty("QMAKE_LIB_FLAG")) {
+			    int maj = project->first("VER_MAJ").toInt();
+			    int min = project->first("VER_MIN").toInt();
+			    int pat = project->first("VER_PAT").toInt();
+			    comp_flags += " -version-info " + QString::number(10*maj + min) +
+					  ":" + QString::number(pat) + ":0";
+			    if(libtoolify[i] != "QMAKE_AR_CMD") {
+				QString rpath = Option::output_dir;
+				if(!project->isEmpty("DESTDIR")) {
+				    rpath = project->first("DESTDIR");
+				    if(QDir::isRelativePath(rpath))
+					rpath.prepend(Option::output_dir + Option::dir_sep);
+				}
+				comp_flags += " -rpath " + Option::fixPathToTargetOS(rpath, FALSE);
+			    }
+			}
+		    }
+		    if(project->isActiveConfig("plugin"))
+			libtool_flags += " -module";
+		} else {
+		    libtool_flags += " --mode=compile";
+		}
+		l.first().prepend("$(LIBTOOL)" + libtool_flags + " ");
+		if(!comp_flags.isEmpty())
+		    l.first() += comp_flags;
+	    }
+	}
+    }
+}
+
+QStringList
+UnixMakefileGenerator::combineSetLFlags(const QStringList &list1, const QStringList &list2)
+{
+    if(project->isActiveConfig("no_smart_library_merge"))
+	return list1 + list2;
+
+    QStringList ret;
+    for(int i = 0; i < 2; i++) {
+	const QStringList *lst = i ? &list2 : &list1;
+	for(QStringList::ConstIterator it = lst->begin(); it != lst->end(); ++it) {
+	    if((*it).startsWith("-")) {
+		if((*it).startsWith("-L")) {
+		    if(ret.findIndex((*it)) == -1)
+			ret.append((*it));
+		} else if((*it).startsWith("-l")) {
+		    while(1) {
+			QStringList::Iterator idx = ret.find((*it));
+			if(idx == ret.end())
+			    break;
+			ret.remove(idx);
+		    }
+		    ret.append((*it));
+		} else if(project->isActiveConfig("macx") && (*it).startsWith("-framework")) {
+		    int as_one = TRUE;
+		    QString framework_in;
+		    if((*it).length() > 11) {
+			framework_in = (*it).mid(11);
+		    } else {
+			if(it != lst->end()) {
+			    ++it;
+			    as_one = FALSE;
+			    framework_in = (*it);
+			}
+		    }
+		    if(!framework_in.isEmpty()) {
+			for(QStringList::Iterator outit = ret.begin(); outit != ret.end(); ++outit) {
+			    if((*outit).startsWith("-framework")) {
+				int found = 0;
+				if((*outit).length() > 11) {
+				    if(framework_in == (*outit).mid(11))
+					found = 1;
+				} else {
+				    if(it != lst->end()) {
+					++outit;
+					if(framework_in == (*outit)) {
+					    --outit;
+					    found = 2;
+					}
+				    }
+				}
+				for(int i = 0; i < found; i++)
+				    outit = ret.remove(outit);
+			    }
+			}
+			if(as_one) {
+			    ret.append("-framework " + framework_in);
+			} else {
+			    ret.append("-framework");
+			    ret.append(framework_in);
+			}
+		    }
+		} else {
+#if 1
+		    while(1) {
+			QStringList::Iterator idx = ret.find((*it));
+			if(idx == ret.end())
+			    break;
+			ret.remove(idx);
+		    }
+#endif
+		    ret.append((*it));
+		}
+	    } else /*if(QFile::exists((*it)))*/ {
+		while(1) {
+		    QStringList::Iterator idx = ret.find((*it));
+		    if(idx == ret.end())
+			break;
+		    ret.remove(idx);
+		}
+		ret.append((*it));
+	    }
+	}
+    }
+    return ret;
+}
+
+void
+UnixMakefileGenerator::processPrlVariable(const QString &var, const QStringList &l)
+{
+    if(var == "QMAKE_PRL_LIBS")
+	project->variables()["QMAKE_CURRENT_PRL_LIBS"] = combineSetLFlags(project->variables()["QMAKE_CURRENT_PRL_LIBS"] +
+									  project->variables()["QMAKE_LIBS"], l);
+    else
+	MakefileGenerator::processPrlVariable(var, l);
+}
+
+QString
+UnixMakefileGenerator::findDependency(const QString &dep)
+{
+    QStringList::Iterator it;
+    {
+	QStringList &qut = project->variables()["QMAKE_EXTRA_UNIX_TARGETS"];
+	for(it = qut.begin(); it != qut.end(); ++it) {
+	    QString targ = var((*it) + ".target");
+	    if(targ.isEmpty())
+		targ = (*it);
+	    if(targ.endsWith(dep))
+		return targ;
+	}
+    }
+    {
+	QStringList &quc = project->variables()["QMAKE_EXTRA_UNIX_COMPILERS"];
+	for(it = quc.begin(); it != quc.end(); ++it) {
+	    QString tmp_out = project->variables()[(*it) + ".output"].first();
+	    QString tmp_cmd = project->variables()[(*it) + ".commands"].join(" ");
+	    if(tmp_out.isEmpty() || tmp_cmd.isEmpty())
+		continue;
+	    QStringList &tmp = project->variables()[(*it) + ".input"];
+	    for(QStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
+		QStringList &inputs = project->variables()[(*it2)];
+		for(QStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
+		    QString out = tmp_out;
+		    QFileInfo fi(Option::fixPathToLocalOS((*input)));
+		    out.replace("${QMAKE_FILE_BASE}", fi.baseName());
+		    out.replace("${QMAKE_FILE_NAME}", fi.filePath());
+		    if(out.endsWith(dep))
+			return out;
+		}
+	    }
+	}
+    }
+    return MakefileGenerator::findDependency(dep);
+}
+
+QStringList
+&UnixMakefileGenerator::findDependencies(const QString &file)
+{
+    QStringList &ret = MakefileGenerator::findDependencies(file);
+    // Note: The QMAKE_IMAGE_COLLECTION file have all images
+    // as dependency, so don't add precompiled header then
+    if(doPrecompiledHeaders() && !project->isEmpty("PRECOMPILED_HEADER")
+       && file != project->first("QMAKE_IMAGE_COLLECTION")) {
+	QString header_prefix = project->first("QMAKE_ORIG_TARGET") + ".gch" + Option::dir_sep;
+	header_prefix += project->first("QMAKE_PRECOMP_PREFIX");
+	if(file.endsWith(".c")) {
+	    QString precomp_h = header_prefix + "c";
+	    if(!ret.contains(precomp_h))
+		ret += precomp_h;
+	} else {
+	    for(QStringList::Iterator it = Option::cpp_ext.begin(); it != Option::cpp_ext.end(); ++it) {
+		if(file.endsWith(*it)) {
+		    QString precomp_h = header_prefix + "c++";
+		    if(!ret.contains(precomp_h))
+			ret += precomp_h;
+		    break;
+		}
+	    }
+	}
+    }
+    return ret;
+}
+
+bool
+UnixMakefileGenerator::findLibraries()
+{
+    QPtrList<MakefileDependDir> libdirs;
+    libdirs.setAutoDelete(TRUE);
+    const QString lflags[] = { "QMAKE_LIBDIR_FLAGS", "QMAKE_LIBS", QString::null };
+    for(int i = 0; !lflags[i].isNull(); i++) {
+	QStringList &l = project->variables()[lflags[i]];
+	for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	    QString stub, dir, extn, opt = (*it).stripWhiteSpace();
+	    if(opt.startsWith("-")) {
+		if(opt.startsWith("-L")) {
+		    QString r = opt.right(opt.length() - 2), l = r;
+		    fixEnvVariables(l);
+		    libdirs.append(new MakefileDependDir(r.replace("\"",""),
+							 l.replace("\"","")));
+		} else if(opt.startsWith("-l")) {
+		    stub = opt.mid(2);
+		} else if(project->isActiveConfig("macx") && opt.startsWith("-framework")) {
+		    if(opt.length() > 11) {
+			opt = opt.mid(11);
+		    } else {
+			++it;
+			opt = (*it);
+		    }
+		    extn = "";
+		    dir = "/System/Library/Frameworks/" + opt + ".framework/";
+		    stub = opt;
+		}
+	    } else {
+		extn = dir = "";
+		stub = opt;
+		int slsh = opt.findRev(Option::dir_sep);
+		if(slsh != -1) {
+		    dir = opt.left(slsh);
+		    stub = opt.mid(slsh+1);
+		}
+		QRegExp stub_reg("^.*lib(" + stub + "[^./=]*)\\.(.*)$");
+		if(stub_reg.exactMatch(stub)) {
+		    stub = stub_reg.cap(1);
+		    extn = stub_reg.cap(2);
+		}
+	    }
+	    if(!stub.isEmpty()) {
+		const QString modifs[] = { "", "-mt", QString::null };
+		for(int modif = 0; !modifs[modif].isNull(); modif++) {
+		    bool found = FALSE;
+		    QStringList extens;
+		    if(!extn.isNull())
+			extens << extn;
+		    else
+			extens << project->variables()["QMAKE_EXTENSION_SHLIB"].first() << "a";
+		    for(QStringList::Iterator extit = extens.begin(); extit != extens.end(); ++extit) {
+			if(dir.isNull()) {
+			    QString lib_stub;
+			    for(MakefileDependDir *mdd = libdirs.first(); mdd; mdd = libdirs.next() ) {
+				if(QFile::exists(mdd->local_dir + Option::dir_sep + "lib" + stub +
+						 modifs[modif] + "." + (*extit))) {
+				    lib_stub = stub + modifs[modif];
+				    break;
+				}
+			    }
+			    if(!lib_stub.isNull()) {
+				(*it) = "-l" + lib_stub;
+				found = TRUE;
+				break;
+			    }
+			} else {
+			    if(QFile::exists("lib" + stub + modifs[modif] + "." + (*extit))) {
+				(*it) = "lib" + stub + modifs[modif] + "." + (*extit);
+				found = TRUE;
+				break;
+			    }
+			}
+		    }
+		    if(!found && project->isActiveConfig("compile_libtool")) {
+			for(MakefileDependDir *mdd = libdirs.first(); mdd; mdd = libdirs.next() ) {
+			    if(QFile::exists(mdd->local_dir + Option::dir_sep + "lib" + stub + modifs[modif] + Option::libtool_ext)) {
+				(*it) = mdd->real_dir + Option::dir_sep + "lib" + stub + modifs[modif] + Option::libtool_ext;
+				found = TRUE;
+				break;
+			    }
+			}
+		    }
+		    if(found)
+			break;
+
+		}
+	    }
+	}
+    }
+    return FALSE;
+}
+
+QString linkLib(const QString &file, const QString &libName) {
+  QString ret;
+  QRegExp reg("^.*lib(" + libName + "[^./=]*).*$");
+  if(reg.exactMatch(file))
+    ret = "-l" + reg.cap(1);
+  return ret;
+}
+
+void
+UnixMakefileGenerator::processPrlFiles()
+{
+    QDict<void> processed;
+    QPtrList<MakefileDependDir> libdirs;
+    libdirs.setAutoDelete(TRUE);
+    const QString lflags[] = { "QMAKE_LIBDIR_FLAGS", "QMAKE_LIBS", QString::null };
+    for(int i = 0; !lflags[i].isNull(); i++) {
+	for(bool ret = FALSE; TRUE; ret = FALSE) {
+	    QStringList l_out;
+	    QStringList &l = project->variables()[lflags[i]];
+	    for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+		project->variables()["QMAKE_CURRENT_PRL_LIBS"].clear();
+		QString opt = (*it).stripWhiteSpace();
+		if(opt.startsWith("-")) {
+		    if(opt.startsWith("-L")) {
+			QString r = opt.right(opt.length() - 2), l = r;
+			fixEnvVariables(l);
+			libdirs.append(new MakefileDependDir(r.replace("\"",""),
+							     l.replace("\"","")));
+		    } else if(opt.startsWith("-l") && !processed[opt]) {
+			QString lib = opt.right(opt.length() - 2);
+			for(MakefileDependDir *mdd = libdirs.first(); mdd; mdd = libdirs.next() ) {
+ 			    if(!project->isActiveConfig("compile_libtool")) { //give them the .libs..
+ 				QString la = mdd->local_dir + Option::dir_sep + "lib" + lib + Option::libtool_ext;
+ 				if(QFile::exists(la) && QFile::exists(mdd->local_dir + Option::dir_sep + ".libs")) {
+ 				    l_out.append("-L" + mdd->real_dir + Option::dir_sep + ".libs");
+ 				    libdirs.append(new MakefileDependDir(mdd->real_dir +  Option::dir_sep + ".libs",
+ 									 mdd->local_dir + Option::dir_sep + ".libs"));
+ 				}
+ 			    }
+
+			    QString prl = mdd->local_dir + Option::dir_sep + "lib" + lib;
+			    if(processPrlFile(prl)) {
+				if(prl.startsWith(mdd->local_dir))
+				    prl.replace(0, mdd->local_dir.length(), mdd->real_dir);
+				opt = linkLib(prl, lib);
+				processed.insert(opt, (void*)1);
+				ret = TRUE;
+				break;
+			    }
+			}
+		    } else if(project->isActiveConfig("macx") && opt.startsWith("-framework")) {
+			if(opt.length() > 11) {
+			    opt = opt.mid(11);
+			} else {
+			    ++it;
+			    opt = (*it);
+			}
+			QString prl = "/System/Library/Frameworks/" + opt +
+				      ".framework/" + opt;
+			if(processPrlFile(prl))
+			    ret = TRUE;
+			l_out.append("-framework");
+		    }
+		    if(!opt.isEmpty())
+			l_out.append(opt);
+		    l_out = combineSetLFlags(l_out, project->variables()["QMAKE_CURRENT_PRL_LIBS"]);
+		} else {
+		    QString lib = opt;
+		    if(!processed[lib] && processPrlFile(lib)) {
+		      processed.insert(lib, (void*)1);
+		      ret = TRUE;
+		    }
+#if 0
+		    if(ret)
+		      opt = linkLib(lib, "");
+#endif
+		    if(!opt.isEmpty())
+		      l_out.append(opt);
+		    l_out = combineSetLFlags(l_out, project->variables()["QMAKE_CURRENT_PRL_LIBS"]);
+		}
+	    }
+	    if(ret && l != l_out)
+		l = l_out;
+	    else
+		break;
+	}
+    }
+}
+
+QString
+UnixMakefileGenerator::defaultInstall(const QString &t)
+{
+    if(t != "target" || project->first("TEMPLATE") == "subdirs")
+	return QString();
+
+    bool resource = FALSE;
+    const QString root = "$(INSTALL_ROOT)";
+    QStringList &uninst = project->variables()[t + ".uninstall"];
+    QString ret, destdir=project->first("DESTDIR");
+    QString targetdir = Option::fixPathToTargetOS(project->first("target.path"), FALSE);
+    if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep)
+	destdir += Option::dir_sep;
+    targetdir = fileFixify(targetdir);
+    if(targetdir.right(1) != Option::dir_sep)
+	targetdir += Option::dir_sep;
+
+    QStringList links;
+    QString target="$(TARGET)";
+    if(project->first("TEMPLATE") == "app") {
+	target = "$(QMAKE_TARGET)";
+	if(project->isActiveConfig("resource_fork") && !project->isActiveConfig("console")) {
+	    destdir += "../../../";
+	    target += ".app";
+	    resource = TRUE;
+	}
+    } else if(project->first("TEMPLATE") == "lib") {
+	if(project->isActiveConfig("create_prl") && !project->isActiveConfig("no_install_prl") &&
+	   !project->isEmpty("QMAKE_INTERNAL_PRL_FILE")) {
+	    QString dst_prl = project->first("QMAKE_INTERNAL_PRL_FILE");
+	    int slsh = dst_prl.findRev('/');
+	    if(slsh != -1)
+		dst_prl = dst_prl.right(dst_prl.length() - slsh - 1);
+	    dst_prl = root + targetdir + dst_prl;
+	    ret += "-$(INSTALL_FILE) \"" + project->first("QMAKE_INTERNAL_PRL_FILE") + "\" \"" + dst_prl + "\"";
+	    if(!uninst.isEmpty())
+		uninst.append("\n\t");
+	    uninst.append("-$(DEL_FILE) \"" + dst_prl + "\"");
+	}
+	if(project->isActiveConfig("create_libtool") && !project->isActiveConfig("compile_libtool")) {
+	    QString src_lt = var("QMAKE_ORIG_TARGET");
+	    int slsh = src_lt.findRev(Option::dir_sep);
+	    if(slsh != -1)
+		src_lt = src_lt.right(src_lt.length() - slsh);
+	    int dot = src_lt.find('.');
+	    if(dot != -1)
+		src_lt = src_lt.left(dot);
+	    src_lt += Option::libtool_ext;
+	    src_lt.prepend("lib");
+	    QString dst_lt = root + targetdir + src_lt;
+	    if(!project->isEmpty("DESTDIR")) {
+		src_lt.prepend(var("DESTDIR"));
+		src_lt = Option::fixPathToLocalOS(fileFixify(src_lt,
+							     QDir::currentDirPath(), Option::output_dir));
+	    }
+	    if(!ret.isEmpty())
+		ret += "\n\t";
+	    ret += "-$(INSTALL_FILE) \"" + src_lt + "\" \"" + dst_lt + "\"";
+	    if(!uninst.isEmpty())
+		uninst.append("\n\t");
+	    uninst.append("-$(DEL_FILE) \"" + dst_lt + "\"");
+	}
+	if(project->isActiveConfig("create_pc")) {
+	    QString src_pc = var("QMAKE_ORIG_TARGET");
+	    int slsh = src_pc.findRev(Option::dir_sep);
+	    if(slsh != -1)
+		src_pc = src_pc.right(src_pc.length() - slsh);
+	    int dot = src_pc.find('.');
+	    if(dot != -1)
+		src_pc = src_pc.left(dot);
+	    src_pc += ".pc";
+	    QString d = root + targetdir + "pkgconfig" + Option::dir_sep;
+	    QString dst_pc = d + src_pc;
+	    if(!project->isEmpty("DESTDIR")) {
+		src_pc.prepend(var("DESTDIR"));
+		src_pc = Option::fixPathToLocalOS(fileFixify(src_pc,
+							     QDir::currentDirPath(), Option::output_dir));
+	    }
+	    if(!ret.isEmpty())
+		ret += "\n\t";
+	    ret += mkdir_p_asstring(d) + "\n\t";
+	    ret += "-$(INSTALL_FILE) \"" + src_pc + "\" \"" + dst_pc + "\"";
+	    if(!uninst.isEmpty())
+		uninst.append("\n\t");
+	    uninst.append("-$(DEL_FILE) \"" + dst_pc + "\"");
+	}
+	if ( project->isEmpty("QMAKE_CYGWIN_SHLIB") ) {
+	    if ( !project->isActiveConfig("staticlib") && !project->isActiveConfig("plugin") ) {
+		if ( project->isEmpty("QMAKE_HPUX_SHLIB") ) {
+		    links << "$(TARGET0)" << "$(TARGET1)" << "$(TARGET2)";
+		} else {
+		    links << "$(TARGET0)";
+	        }
+	    }
+	}
+    }
+
+    if(!resource && project->isActiveConfig("compile_libtool")) {
+	QString src_targ = target;
+	if(src_targ == "$(TARGET)")
+	    src_targ = "$(TARGETL)";
+	QString dst_dir = fileFixify(targetdir);
+	if(QDir::isRelativePath(dst_dir))
+	    dst_dir = Option::fixPathToTargetOS(Option::output_dir + Option::dir_sep + dst_dir);
+	ret = "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + root + dst_dir + "\"";
+	uninst.append("-$(LIBTOOL) --mode=uninstall \"" + src_targ + "\"");
+    } else {
+	QString src_targ = target;
+	if(!destdir.isEmpty())
+	    src_targ = Option::fixPathToTargetOS(destdir + target, FALSE);
+	QString dst_targ = root + targetdir + target;
+	if(!ret.isEmpty())
+	    ret += "\n\t";
+	if(resource)
+	    ret += "$(DEL_FILE) -r \"" + dst_targ + "\"" + "\n\t";
+	if(!ret.isEmpty())
+	    ret += "\n\t";
+	ret += QString(resource ? "-$(INSTALL_DIR)" : "-$(INSTALL_FILE)") + " \"" +
+	       src_targ + "\" \"" + dst_targ + "\"";
+	if(!project->isActiveConfig("debug") && !project->isEmpty("QMAKE_STRIP") &&
+	   (project->first("TEMPLATE") != "lib" || !project->isActiveConfig("staticlib"))) {
+	    ret += "\n\t-" + var("QMAKE_STRIP");
+	    if(project->first("TEMPLATE") == "lib" && !project->isEmpty("QMAKE_STRIPFLAGS_LIB"))
+		ret += " " + var("QMAKE_STRIPFLAGS_LIB");
+	    else if(project->first("TEMPLATE") == "app" && !project->isEmpty("QMAKE_STRIPFLAGS_APP"))
+		ret += " " + var("QMAKE_STRIPFLAGS_APP");
+	    if(resource)
+		ret = " \"" + dst_targ + "/Contents/MacOS/$(QMAKE_TARGET)\"";
+	    else
+		ret += " \"" + dst_targ + "\"";
+	}
+	if(!uninst.isEmpty())
+	    uninst.append("\n\t");
+	if(resource)
+	    uninst.append("-$(DEL_FILE) -r \"" + dst_targ + "\"");
+	else
+	    uninst.append("-$(DEL_FILE) \"" + dst_targ + "\"");
+	if(!links.isEmpty()) {
+	    for(QStringList::Iterator it = links.begin(); it != links.end(); it++) {
+		if(Option::target_mode == Option::TARG_WIN_MODE ||
+		   Option::target_mode == Option::TARG_MAC9_MODE) {
+		} else if(Option::target_mode == Option::TARG_UNIX_MODE ||
+			  Option::target_mode == Option::TARG_MACX_MODE) {
+		    QString link = Option::fixPathToTargetOS(destdir + (*it), FALSE);
+		    int lslash = link.findRev(Option::dir_sep);
+		    if(lslash != -1)
+			link = link.right(link.length() - (lslash + 1));
+		    QString dst_link = root + targetdir + link;
+		    ret += "\n\t-$(SYMLINK) \"$(TARGET)\" \"" + dst_link + "\"";
+		    if(!uninst.isEmpty())
+			uninst.append("\n\t");
+		    uninst.append("-$(DEL_FILE) \"" + dst_link + "\"");
+		}
+	    }
+	}
+    }
+    return ret;
+}
diff --git a/qmake/generators/unix/unixmake.h b/qmake/generators/unix/unixmake.h
new file mode 100644
index 0000000..2b4088b
--- /dev/null
+++ b/qmake/generators/unix/unixmake.h
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Definition of UnixMakefileGenerator class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#ifndef __UNIXMAKE_H__
+#define __UNIXMAKE_H__
+
+#include "makefile.h"
+
+class UnixMakefileGenerator : public MakefileGenerator
+{
+    bool init_flag, include_deps;
+    bool writeMakefile(QTextStream &);
+    void writeExtraVariables(QTextStream &);
+    QString libtoolFileName();
+    void writeLibtoolFile();     // for libtool
+    QString pkgConfigPrefix() const;
+    QString pkgConfigFileName();
+    QString pkgConfigFixPath(QString) const;
+    void writePkgConfigFile();   // for pkg-config
+    QStringList combineSetLFlags(const QStringList &list1, const QStringList &list2);
+    void writePrlFile(QTextStream &);
+
+public:
+    UnixMakefileGenerator(QMakeProject *p);
+    ~UnixMakefileGenerator();
+
+protected:
+    virtual bool doPrecompiledHeaders() const { return project->isActiveConfig("precompile_header"); }
+    virtual bool doDepends() const { return !include_deps && MakefileGenerator::doDepends(); }
+    virtual QString defaultInstall(const QString &);
+    virtual void processPrlVariable(const QString &, const QStringList &);
+    virtual void processPrlFiles();
+
+    virtual bool findLibraries();
+    virtual QString findDependency(const QString &);
+    virtual QStringList &findDependencies(const QString &);
+    virtual void init();
+
+    void writeMakeParts(QTextStream &);
+    void writeSubdirs(QTextStream &, bool=TRUE);
+    
+private:
+    void init2();
+};
+
+inline UnixMakefileGenerator::~UnixMakefileGenerator()
+{ }
+
+
+#endif /* __UNIXMAKE_H__ */
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
new file mode 100644
index 0000000..cd1c829
--- /dev/null
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -0,0 +1,1594 @@
+/****************************************************************************
+**
+** Implementation of UnixMakefileGenerator class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#include "unixmake.h"
+#include "option.h"
+#include "meta.h"
+#include <qregexp.h>
+#include <qfile.h>
+#include <qdir.h>
+#include <time.h>
+
+QString mkdir_p_asstring(const QString &dir);
+
+UnixMakefileGenerator::UnixMakefileGenerator(QMakeProject *p) : MakefileGenerator(p), init_flag(FALSE), include_deps(FALSE)
+{
+
+}
+
+void
+UnixMakefileGenerator::writePrlFile(QTextStream &t)
+{
+    MakefileGenerator::writePrlFile(t);
+    // libtool support
+    if(project->isActiveConfig("create_libtool") && project->first("TEMPLATE") == "lib") { //write .la
+	if(project->isActiveConfig("compile_libtool"))
+	    warn_msg(WarnLogic, "create_libtool specified with compile_libtool can lead to conflicting .la\n"
+		     "formats, create_libtool has been disabled\n");
+	else
+	    writeLibtoolFile();
+    }
+    // pkg-config support
+    if(project->isActiveConfig("create_pc") && project->first("TEMPLATE") == "lib")
+	writePkgConfigFile();
+}
+
+bool
+UnixMakefileGenerator::writeMakefile(QTextStream &t)
+{
+
+    writeHeader(t);
+    if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
+	t << "QMAKE    = "	<< (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : var("QMAKE_QMAKE")) << endl;
+	{ //write the extra unix targets..
+	    QStringList &qut = project->variables()["QMAKE_EXTRA_UNIX_TARGETS"];
+	    for(QStringList::ConstIterator it = qut.begin(); it != qut.end(); ++it)
+		t << *it << " ";
+	}
+	t << "all clean install distclean mocables uninstall uicables:" << "\n\t"
+	  << "@echo \"Some of the required modules ("
+	  << var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t"
+	  << "@echo \"Skipped.\"" << endl << endl;
+	writeMakeQmake(t);
+	return TRUE;
+    }
+
+    if (project->variables()["TEMPLATE"].first() == "app" ||
+	project->variables()["TEMPLATE"].first() == "lib") {
+	writeMakeParts(t);
+	return MakefileGenerator::writeMakefile(t);
+    } else if(project->variables()["TEMPLATE"].first() == "subdirs") {
+	writeSubdirs(t);
+	return TRUE;
+    }
+    return FALSE;
+}
+
+void
+UnixMakefileGenerator::writeExtraVariables(QTextStream &t)
+{
+    bool first = TRUE;
+    QMap<QString, QStringList> &vars = project->variables();
+    QStringList &exports = project->variables()["QMAKE_EXTRA_UNIX_VARIABLES"];
+    for(QMap<QString, QStringList>::Iterator it = vars.begin(); it != vars.end(); ++it) {
+	for(QStringList::Iterator exp_it = exports.begin(); exp_it != exports.end(); ++exp_it) {
+	    QRegExp rx((*exp_it), FALSE, TRUE);
+	    if(rx.exactMatch(it.key())) {
+		if(first) {
+		    t << "\n####### Custom Variables" << endl;
+		    first = FALSE;
+		}
+		t << "EXPORT_" << it.key() << " = " << it.data().join(" ") << endl;
+	    }
+	}
+    }
+    if(!first)
+	t << endl;
+}
+
+void
+UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+{
+    QString deps = fileFixify(Option::output.name()), target_deps, prl;
+    bool do_incremental = (project->isActiveConfig("incremental") &&
+			   !project->variables()["QMAKE_INCREMENTAL"].isEmpty() &&
+			   (!project->variables()["QMAKE_APP_FLAG"].isEmpty() ||
+			    !project->isActiveConfig("staticlib"))),
+	 src_incremental=FALSE, moc_incremental=FALSE;
+
+    t << "####### Compiler, tools and options" << endl << endl;
+    t << "CC       = ";
+    if (project->isActiveConfig("thread") &&
+	! project->variables()["QMAKE_CC_THREAD"].isEmpty())
+	t << var("QMAKE_CC_THREAD") << endl;
+    else
+	t << var("QMAKE_CC") << endl;
+
+    t << "CXX      = ";
+    if (project->isActiveConfig("thread") &&
+	! project->variables()["QMAKE_CXX_THREAD"].isEmpty())
+	t << var("QMAKE_CXX_THREAD") << endl;
+    else
+	t << var("QMAKE_CXX") << endl;
+
+    t << "LEX      = " << var("QMAKE_LEX") << endl;
+    t << "YACC     = " << var("QMAKE_YACC") << endl;
+    t << "CFLAGS   = " << var("QMAKE_CFLAGS") << " "
+      << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " "
+      << varGlue("DEFINES","-D"," -D","") << endl;
+    t << "CXXFLAGS = " << var("QMAKE_CXXFLAGS") << " "
+      << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " "
+      << varGlue("DEFINES","-D"," -D","") << endl;
+    t << "LEXFLAGS = " << var("QMAKE_LEXFLAGS") << endl;
+    t << "YACCFLAGS= " << var("QMAKE_YACCFLAGS") << endl;
+    t << "INCPATH  = " << "-I" << specdir();
+    if(!project->isActiveConfig("no_include_pwd")) {
+	QString pwd = fileFixify(QDir::currentDirPath());
+	if(pwd.isEmpty())
+	    pwd = ".";
+	t << " -I" << pwd;
+    }
+    t << varGlue("INCLUDEPATH"," -I", " -I", "") << endl;
+
+    if(!project->isActiveConfig("staticlib")) {
+	t << "LINK     = ";
+	if (project->isActiveConfig("thread") &&
+	    ! project->variables()["QMAKE_LINK_THREAD"].isEmpty())
+	    t << var("QMAKE_LINK_THREAD") << endl;
+	else
+	    t << var("QMAKE_LINK") << endl;
+
+	t << "LFLAGS   = " << var("QMAKE_LFLAGS") << endl;
+	t << "LIBS     = " << "$(SUBLIBS) " << var("QMAKE_LIBDIR_FLAGS") << " " << var("QMAKE_LIBS") << endl;
+    }
+
+    t << "AR       = " << var("QMAKE_AR") << endl;
+    t << "RANLIB   = " << var("QMAKE_RANLIB") << endl;
+    t << "MOC      = " << var("QMAKE_MOC") << endl;
+    t << "UIC      = "	<< var("QMAKE_UIC") << endl;
+    t << "QMAKE    = "	<< (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : var("QMAKE_QMAKE")) << endl;
+    t << "TAR      = "	<< var("QMAKE_TAR") << endl;
+    t << "GZIP     = " << var("QMAKE_GZIP") << endl;
+    if(project->isActiveConfig("compile_libtool"))
+	t << "LIBTOOL	= " << var("QMAKE_LIBTOOL") << endl;
+    t << "COPY     = " << var("QMAKE_COPY") << endl;
+    t << "COPY_FILE= " << var("QMAKE_COPY_FILE") << endl;
+    t << "COPY_DIR = " << var("QMAKE_COPY_DIR") << endl;
+    t << "INSTALL_FILE= " << var("QMAKE_INSTALL_FILE") << endl;
+    t << "INSTALL_DIR = " << var("QMAKE_INSTALL_DIR") << endl;
+
+    t << "DEL_FILE = " << var("QMAKE_DEL_FILE") << endl;
+    t << "SYMLINK  = " << var("QMAKE_SYMBOLIC_LINK") << endl;
+    t << "DEL_DIR  = " << var("QMAKE_DEL_DIR") << endl;
+    t << "MOVE     = " << var("QMAKE_MOVE") << endl;
+    t << "CHK_DIR_EXISTS= " << var("QMAKE_CHK_DIR_EXISTS") << endl;
+    t << "MKDIR    = " << var("QMAKE_MKDIR") << endl;
+    t << endl;
+
+    t << "####### Output directory" << endl << endl;
+    if (! project->variables()["OBJECTS_DIR"].isEmpty())
+	t << "OBJECTS_DIR = " << var("OBJECTS_DIR") << endl;
+    else
+	t << "OBJECTS_DIR = ./" << endl;
+    t << endl;
+
+    /* files */
+    t << "####### Files" << endl << endl;
+    t << "HEADERS = " << varList("HEADERS") << endl;
+    t << "SOURCES = " << varList("SOURCES") << endl;
+    if(do_incremental) {
+	QStringList &objs = project->variables()["OBJECTS"], &incrs = project->variables()["QMAKE_INCREMENTAL"], incrs_out;
+	t << "OBJECTS = ";
+	for(QStringList::Iterator objit = objs.begin(); objit != objs.end(); ++objit) {
+	    bool increment = FALSE;
+	    for(QStringList::Iterator incrit = incrs.begin(); incrit != incrs.end(); ++incrit) {
+		if((*objit).find(QRegExp((*incrit), TRUE, TRUE)) != -1) {
+		    increment = TRUE;
+		    incrs_out.append((*objit));
+		    break;
+		}
+	    }
+	    if(!increment)
+		t << "\\\n\t\t" << (*objit);
+	}
+	if(incrs_out.count() == objs.count()) { //we just switched places, no real incrementals to be done!
+	    t << incrs_out.join(" \\\n\t\t") << endl;
+	} else if(!incrs_out.count()) {
+	    t << endl;
+	} else {
+	    src_incremental = TRUE;
+	    t << endl;
+	    t << "INCREMENTAL_OBJECTS = " << incrs_out.join(" \\\n\t\t") << endl;
+	}
+    } else {
+	t << "OBJECTS = " << varList("OBJECTS") << endl;
+    }
+    t << "FORMS = " << varList("FORMS") << endl;
+    t << "UICDECLS = " << varList("UICDECLS") << endl;
+    t << "UICIMPLS = " << varList("UICIMPLS") << endl;
+    QString srcMoc = varList("SRCMOC"), objMoc = varList("OBJMOC");
+    t << "SRCMOC   = " << srcMoc << endl;
+    if(do_incremental) {
+	QStringList &objs = project->variables()["OBJMOC"],
+		   &incrs = project->variables()["QMAKE_INCREMENTAL"], incrs_out;
+	t << "OBJMOC = ";
+	for(QStringList::Iterator objit = objs.begin(); objit != objs.end(); ++objit) {
+	    bool increment = FALSE;
+	    for(QStringList::Iterator incrit = incrs.begin(); incrit != incrs.end(); ++incrit) {
+		if((*objit).find(QRegExp((*incrit), TRUE, TRUE)) != -1) {
+		    increment = TRUE;
+		    incrs_out.append((*objit));
+		    break;
+		}
+	    }
+	    if(!increment)
+		t << "\\\n\t\t" << (*objit);
+	}
+	if(incrs_out.count() == objs.count()) { //we just switched places, no real incrementals to be done!
+	    t << incrs_out.join(" \\\n\t\t") << endl;
+	} else if(!incrs_out.count()) {
+	    t << endl;
+	} else {
+	    moc_incremental = TRUE;
+	    t << endl;
+	    t << "INCREMENTAL_OBJMOC = " << incrs_out.join(" \\\n\t\t") << endl;
+	}
+    } else {
+	t << "OBJMOC = " << objMoc << endl;
+    }
+    if(do_incremental && !moc_incremental && !src_incremental)
+	do_incremental = FALSE;
+    if(!project->isEmpty("QMAKE_EXTRA_UNIX_COMPILERS")) {
+	t << "OBJCOMP = " << varList("OBJCOMP") << endl;
+	target_deps += " $(OBJCOMP)";
+
+	QStringList &comps = project->variables()["QMAKE_EXTRA_UNIX_COMPILERS"];
+	for(QStringList::Iterator compit = comps.begin(); compit != comps.end(); ++compit) {
+	    QStringList &vars = project->variables()[(*compit) + ".variables"];
+	    for(QStringList::Iterator varit = vars.begin(); varit != vars.end(); ++varit) {
+		QStringList vals = project->variables()[(*varit)];
+		if(!vals.isEmpty())
+		    t << "QMAKE_COMP_" << (*varit) << " = " << valList(vals) << endl;
+	    }
+	}
+    }
+    t << "DIST	   = " << valList(fileFixify(project->variables()["DISTFILES"])) << endl;
+    t << "QMAKE_TARGET = " << var("QMAKE_ORIG_TARGET") << endl;
+    t << "DESTDIR  = " << var("DESTDIR") << endl;
+    if(project->isActiveConfig("compile_libtool"))
+	t << "TARGETL	= " << var("TARGET_la") << endl;
+    t << "TARGET   = " << var("TARGET") << endl;
+    if(project->isActiveConfig("plugin") ) {
+	t << "TARGETD   = " << var("TARGET") << endl;
+    } else if (!project->isActiveConfig("staticlib") && project->variables()["QMAKE_APP_FLAG"].isEmpty()) {
+	t << "TARGETA	= " << var("TARGETA") << endl;
+	if (project->isEmpty("QMAKE_HPUX_SHLIB")) {
+	    t << "TARGETD	= " << var("TARGET_x.y.z") << endl;
+	    t << "TARGET0	= " << var("TARGET_") << endl;
+	    t << "TARGET1	= " << var("TARGET_x") << endl;
+	    t << "TARGET2	= " << var("TARGET_x.y") << endl;
+	} else {
+	    t << "TARGETD	= " << var("TARGET_x") << endl;
+	    t << "TARGET0	= " << var("TARGET_") << endl;
+	}
+    }
+    writeExtraVariables(t);
+    t << endl;
+
+    // blasted includes
+    QStringList &qeui = project->variables()["QMAKE_EXTRA_UNIX_INCLUDES"];
+    QStringList::Iterator it;
+    for( it = qeui.begin(); it != qeui.end(); ++it)
+	t << "include " << (*it) << endl;
+
+    /* rules */
+    t << "first: all" << endl;
+    t << "####### Implicit rules" << endl << endl;
+    t << ".SUFFIXES: .c " << Option::obj_ext;
+    QStringList::Iterator cppit;
+    for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
+	t << " " << (*cppit);
+    t << endl << endl;
+    for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
+	t << (*cppit) << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl;
+    t << ".c" << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CC_IMP") << endl << endl;
+
+    if(include_deps) {
+	QString cmd=var("QMAKE_CFLAGS_DEPS") + " ";
+	cmd += varGlue("DEFINES","-D"," -D","") + varGlue("PRL_EXPORT_DEFINES"," -D"," -D","");
+	if(!project->isEmpty("QMAKE_ABSOLUTE_SOURCE_PATH"))
+	    cmd += " -I" + project->first("QMAKE_ABSOLUTE_SOURCE_PATH") + " ";
+	cmd += " $(INCPATH) " + varGlue("DEPENDPATH", "-I", " -I", "");
+	QString odir;
+	if(!project->variables()["OBJECTS_DIR"].isEmpty())
+	    odir = project->first("OBJECTS_DIR");
+	t << "###### Dependencies" << endl << endl;
+	t << odir << ".deps/%.d: %.cpp\n\t"
+	  << "@echo Creating depend for $<" << "\n\t"
+	  << "@test -d $(@D) || mkdir -p $(@D)" << "\n\t"
+	  << "@$(CXX) " << cmd << " $< | sed \"s,^\\($(*F).o\\):," << odir << "\\1:,g\" >$@" << endl << endl;
+
+	t << odir << ".deps/%.d: %.c\n\t"
+	  << "@echo Creating depend for $<" << "\n\t"
+	  << "@test -d $(@D) || mkdir -p $(@D)" << "\n\t"
+	  << "@$(CC) " << cmd << " $< | sed \"s,^\\($(*F).o\\):," << odir << "\\1:,g\" >$@" << endl << endl;
+
+	QString src[] = { "SOURCES", "UICIMPLS", "SRCMOC", QString::null };
+	for(int x = 0; !src[x].isNull(); x++) {
+	    QStringList &l = project->variables()[src[x]];
+	    for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+		if(!(*it).isEmpty()) {
+		    QString d_file;
+		    if((*it).endsWith(".c")) {
+			d_file = (*it).left((*it).length() - 2);
+		    } else {
+			for(QStringList::Iterator cppit = Option::cpp_ext.begin();
+			    cppit != Option::cpp_ext.end(); ++cppit) {
+			    if((*it).endsWith((*cppit))) {
+				d_file = (*it).left((*it).length() - (*cppit).length());
+				break;
+			    }
+			}
+		    }
+		    if(!d_file.isEmpty()) {
+			d_file = odir + ".deps/" + d_file + ".d";
+			QStringList deps = findDependencies((*it)).grep(QRegExp(Option::cpp_moc_ext + "$"));
+			if(!deps.isEmpty())
+			    t << d_file << ": " << deps.join(" ") << endl;
+			t << var("QMAKE_CFLAGS_USE_PRECOMPILE") << " " << d_file << endl;
+		    }
+		}
+	    }
+	}
+    }
+
+    t << "####### Build rules" << endl << endl;
+    if(!project->variables()["SUBLIBS"].isEmpty()) {
+	QString libdir = "tmp/";
+	if(!project->isEmpty("SUBLIBS_DIR"))
+	    libdir = project->first("SUBLIBS_DIR");
+	t << "SUBLIBS= ";
+	QStringList &l = project->variables()["SUBLIBS"];
+	for(QStringList::Iterator it = l.begin(); it != l.end(); ++it)
+	    t << libdir << "lib" << (*it) << ".a ";
+	t << endl << endl;
+    }
+    if(project->isActiveConfig("depend_prl") && !project->isEmpty("QMAKE_PRL_INTERNAL_FILES")) {
+	QStringList &l = project->variables()["QMAKE_PRL_INTERNAL_FILES"];
+	QStringList::Iterator it;
+	for(it = l.begin(); it != l.end(); ++it) {
+	    QMakeMetaInfo libinfo;
+	    if(libinfo.readLib((*it)) && !libinfo.isEmpty("QMAKE_PRL_BUILD_DIR")) {
+		QString dir;
+		int slsh = (*it).findRev(Option::dir_sep);
+		if(slsh != -1)
+		    dir = (*it).left(slsh + 1);
+		QString targ = dir + libinfo.first("QMAKE_PRL_TARGET");
+		deps += " " + targ;
+		t << targ << ":" << "\n\t"
+		  << "@echo \"Creating '" << targ << "'\"" << "\n\t"
+		  << "(cd " << libinfo.first("QMAKE_PRL_BUILD_DIR") << ";"
+		  << "$(MAKE) )" << endl;
+	    }
+	}
+    }
+    if(!project->variables()["QMAKE_APP_FLAG"].isEmpty()) {
+	QString destdir = project->first("DESTDIR");
+	if(do_incremental) {
+	    //incremental target
+	    QString incr_target = var("TARGET") + "_incremental";
+	    if(incr_target.find(Option::dir_sep) != -1)
+		incr_target = incr_target.right(incr_target.length() -
+						(incr_target.findRev(Option::dir_sep) + 1));
+	    QString incr_deps, incr_objs;
+	    if(project->first("QMAKE_INCREMENTAL_STYLE") == "ld") {
+		QString incr_target_dir = var("OBJECTS_DIR") + incr_target + Option::obj_ext;
+		//actual target
+		t << incr_target_dir << ": $(OBJECTS)" << "\n\t"
+		  << "ld -r  -o "<< incr_target_dir << " $(OBJECTS)" << endl;
+		//communicated below
+		deps.prepend(incr_target_dir + " ");
+		incr_deps = "$(UICDECLS) $(INCREMENTAL_OBJECTS) $(INCREMENTAL_OBJMOC) $(OBJMOC)";
+		if(!incr_objs.isEmpty())
+		    incr_objs += " ";
+		incr_objs += incr_target_dir;
+	    } else {
+		//actual target
+		QString incr_target_dir = var("DESTDIR") + "lib" + incr_target + "." +
+					  project->variables()["QMAKE_EXTENSION_SHLIB"].first();
+		QString incr_lflags = var("QMAKE_LFLAGS_SHLIB") + " ";
+		if(project->isActiveConfig("debug"))
+		    incr_lflags += var("QMAKE_LFLAGS_DEBUG");
+		else
+		    incr_lflags += var("QMAKE_LFLAGS_RELEASE");
+		t << incr_target_dir << ": $(INCREMENTAL_OBJECTS) $(INCREMENTAL_OBJMOC)" << "\n\t";
+		if(!destdir.isEmpty())
+		    t << "\n\t" << "test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
+		t << "$(LINK) " << incr_lflags << " -o "<< incr_target_dir <<
+		    " $(INCREMENTAL_OBJECTS) $(INCREMENTAL_OBJMOC)" << endl;
+		//communicated below
+		if(!destdir.isEmpty()) {
+		    if(!incr_objs.isEmpty())
+			incr_objs += " ";
+		    incr_objs += "-L" + destdir;
+		} else {
+		    if(!incr_objs.isEmpty())
+			incr_objs += " ";
+		    incr_objs += "-L" + QDir::currentDirPath();
+		}
+		if(!incr_objs.isEmpty())
+		    incr_objs += " ";
+		incr_objs += " -l" + incr_target;
+		deps.prepend(incr_target_dir + " ");
+		incr_deps = "$(UICDECLS) $(OBJECTS) $(OBJMOC)";
+	    }
+	    t << "all: " << deps <<  " " << varGlue("ALL_DEPS",""," "," ") <<  "$(TARGET)"
+	      << endl << endl;
+
+	    //real target
+	    t << var("TARGET") << ": " << var("PRE_TARGETDEPS") << " " << incr_deps << " " << target_deps
+	      << " " << var("POST_TARGETDEPS") << "\n\t";
+	    if(!destdir.isEmpty())
+		t << "\n\t" << "test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
+	    if(!project->isEmpty("QMAKE_PRE_LINK"))
+		t << var("QMAKE_PRE_LINK") << "\n\t";
+	    t << "$(LINK) $(LFLAGS) -o $(TARGET) " << incr_deps << " " << incr_objs << " $(OBJCOMP) $(LIBS)";
+	    if(!project->isEmpty("QMAKE_POST_LINK"))
+		t << "\n\t" << var("QMAKE_POST_LINK");
+	    t << endl << endl;
+	} else {
+	    t << "all: " << deps <<  " " << varGlue("ALL_DEPS",""," "," ") <<  "$(TARGET)"
+	      << endl << endl;
+
+	    t << "$(TARGET): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC) "
+	      << target_deps << " " << var("POST_TARGETDEPS") << "\n\t";
+	    if(!destdir.isEmpty())
+		t << "test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
+	    if(!project->isEmpty("QMAKE_PRE_LINK"))
+		t << var("QMAKE_PRE_LINK") << "\n\t";
+	    t << "$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(OBJCOMP) $(LIBS)";
+	    if(!project->isEmpty("QMAKE_POST_LINK"))
+		t << "\n\t" << var("QMAKE_POST_LINK");
+	    t << endl << endl;
+	}
+    } else if(!project->isActiveConfig("staticlib")) {
+	QString destdir = project->first("DESTDIR"), incr_deps;
+	if(do_incremental) {
+	    QString s_ext = project->variables()["QMAKE_EXTENSION_SHLIB"].first();
+	    QString incr_target = var("QMAKE_ORIG_TARGET").replace(
+		QRegExp("\\." + s_ext), "").replace(QRegExp("^lib"), "") + "_incremental";
+	    if(incr_target.find(Option::dir_sep) != -1)
+		incr_target = incr_target.right(incr_target.length() -
+						(incr_target.findRev(Option::dir_sep) + 1));
+
+	    if(project->first("QMAKE_INCREMENTAL_STYLE") == "ld") {
+		QString incr_target_dir = var("OBJECTS_DIR") + incr_target + Option::obj_ext;
+		//actual target
+		const QString link_deps = "$(UICDECLS) $(OBJECTS) $(OBJMOC)";
+		t << incr_target_dir << ": " << link_deps << "\n\t"
+		  << "ld -r  -o " << incr_target_dir << " " << link_deps << endl;
+		//communicated below
+		QStringList &cmd = project->variables()["QMAKE_LINK_SHLIB_CMD"];
+		cmd.first().replace("$(OBJECTS) $(OBJMOC)",
+				    "$(INCREMENTAL_OBJECTS) $(INCREMENTAL_OBJMOC)"); //ick
+		cmd.append(incr_target_dir);
+		deps.prepend(incr_target_dir + " ");
+		incr_deps = "$(INCREMENTAL_OBJECTS) $(INCREMENTAL_OBJMOC)";
+	    } else {
+		//actual target
+		QString incr_target_dir = var("DESTDIR") + "lib" + incr_target + "." + s_ext;
+		QString incr_lflags = var("QMAKE_LFLAGS_SHLIB") + " ";
+		if(!project->isEmpty("QMAKE_LFLAGS_INCREMENTAL"))
+		    incr_lflags += var("QMAKE_LFLAGS_INCREMENTAL") + " ";
+		if(project->isActiveConfig("debug"))
+		    incr_lflags += var("QMAKE_LFLAGS_DEBUG");
+		else
+		    incr_lflags += var("QMAKE_LFLAGS_RELEASE");
+		t << incr_target_dir << ": $(INCREMENTAL_OBJECTS) $(INCREMENTAL_OBJMOC)" << "\n\t";
+		if(!destdir.isEmpty())
+		    t << "test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
+		t << "$(LINK) " << incr_lflags << " -o "<< incr_target_dir <<
+		    " $(INCREMENTAL_OBJECTS) $(INCREMENTAL_OBJMOC)" << endl;
+		//communicated below
+		QStringList &cmd = project->variables()["QMAKE_LINK_SHLIB_CMD"];
+		if(!destdir.isEmpty())
+		    cmd.append(" -L" + destdir);
+		cmd.append(" -l" + incr_target);
+		deps.prepend(incr_target_dir + " ");
+		incr_deps = "$(UICDECLS) $(OBJECTS) $(OBJMOC)";
+	    }
+
+	    t << "all: " << " " << deps << " " << varGlue("ALL_DEPS",""," ","")
+	      << " " <<  var("DESTDIR_TARGET") << endl << endl;
+
+	    //real target
+	    t << var("DESTDIR_TARGET") << ": " << var("PRE_TARGETDEPS") << " "
+	      << incr_deps << " $(SUBLIBS) " << target_deps << " " << var("POST_TARGETDEPS");
+	} else {
+	    t << "all: " << deps << " " << varGlue("ALL_DEPS",""," ","") << " " <<
+		var("DESTDIR_TARGET") << endl << endl;
+	    t << var("DESTDIR_TARGET") << ": " << var("PRE_TARGETDEPS")
+	      << " $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP) " << target_deps
+	      << " " << var("POST_TARGETDEPS");
+	}
+	if(!destdir.isEmpty())
+	    t << "\n\t" << "test -d " << destdir << " || mkdir -p " << destdir;
+	if(!project->isEmpty("QMAKE_PRE_LINK"))
+	    t << "\n\t" << var("QMAKE_PRE_LINK");
+
+	if(project->isActiveConfig("compile_libtool")) {
+	    t << "\n\t"
+	      << var("QMAKE_LINK_SHLIB_CMD");
+	} else if(project->isActiveConfig("plugin")) {
+	    t << "\n\t"
+	      << "-$(DEL_FILE) $(TARGET)" << "\n\t"
+	      << var("QMAKE_LINK_SHLIB_CMD");
+	    if(!destdir.isEmpty())
+		t << "\n\t"
+		  << "-$(MOVE) $(TARGET) " << var("DESTDIR");
+	    if(!project->isEmpty("QMAKE_POST_LINK"))
+		t << "\n\t" << var("QMAKE_POST_LINK") << "\n\t";
+	    t << endl << endl;
+	} else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
+	    t << "\n\t"
+	      << "-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)" << "\n\t"
+	      << var("QMAKE_LINK_SHLIB_CMD") << "\n\t";
+	    t << varGlue("QMAKE_LN_SHLIB","-"," "," $(TARGET) $(TARGET0)")  << "\n\t"
+	      << varGlue("QMAKE_LN_SHLIB","-"," "," $(TARGET) $(TARGET1)") << "\n\t"
+	      << varGlue("QMAKE_LN_SHLIB","-"," "," $(TARGET) $(TARGET2)");
+	    if(!destdir.isEmpty())
+		t << "\n\t"
+		  << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET)\n\t"
+		  << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET0)\n\t"
+		  << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET1)\n\t"
+		  << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET2)\n\t"
+		  << "-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) " << var("DESTDIR");
+	    if(!project->isEmpty("QMAKE_POST_LINK"))
+		t << "\n\t" << var("QMAKE_POST_LINK");
+	    t << endl << endl;
+	} else {
+	    t << "\n\t"
+	      << "-$(DEL_FILE) $(TARGET) $(TARGET0)" << "\n\t"
+	      << var("QMAKE_LINK_SHLIB_CMD") << "\n\t";
+	    t << varGlue("QMAKE_LN_SHLIB",""," "," $(TARGET) $(TARGET0)");
+	    if(!destdir.isEmpty())
+		t  << "\n\t"
+		   << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET)\n\t"
+		   << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET0)\n\t"
+		   << "-$(MOVE) $(TARGET) $(TARGET0) " << var("DESTDIR");
+	    if(!project->isEmpty("QMAKE_POST_LINK"))
+		t << "\n\t" << var("QMAKE_POST_LINK");
+	    t << endl << endl;
+	}
+	t << endl << endl;
+
+	if (! project->isActiveConfig("plugin")) {
+	    t << "staticlib: $(TARGETA)" << endl << endl;
+	    t << "$(TARGETA): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)";
+	    if(do_incremental)
+		t << " $(INCREMENTAL_OBJECTS) $(INCREMENTAL_OBJMOC)";
+	    t << var("POST_TARGETDEPS") << "\n\t"
+	      << "-$(DEL_FILE) $(TARGETA) " << "\n\t"
+	      << var("QMAKE_AR_CMD");
+	    if(do_incremental)
+		t << " $(INCREMENTAL_OBJECTS) $(INCREMENTAL_OBJMOC)";
+	    if(!project->isEmpty("QMAKE_RANLIB"))
+		t << "\n\t" << "$(RANLIB) $(TARGETA)";
+	    t << endl << endl;
+	}
+    } else {
+	t << "all: " << deps << " " << varGlue("ALL_DEPS",""," "," ") << var("DESTDIR") << "$(TARGET) "
+	  << varGlue("QMAKE_AR_SUBLIBS", var("DESTDIR"), " " + var("DESTDIR"), "") << "\n\n"
+	  << "staticlib: " << var("DESTDIR") << "$(TARGET)" << "\n\n";
+	if(project->isEmpty("QMAKE_AR_SUBLIBS")) {
+	    t << var("DESTDIR") << "$(TARGET): " << var("PRE_TARGETDEPS")
+	      << " $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP) " << var("POST_TARGETDEPS") << "\n\t";
+	    if(!project->isEmpty("DESTDIR")) {
+		QString destdir = project->first("DESTDIR");
+		t << "test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
+	    }
+	    t << "-$(DEL_FILE) $(TARGET)" << "\n\t"
+	      << var("QMAKE_AR_CMD") << "\n";
+	    if(!project->isEmpty("QMAKE_POST_LINK"))
+		t << "\t" << var("QMAKE_POST_LINK") << "\n";
+	    if(!project->isEmpty("QMAKE_RANLIB"))
+		t << "\t" << "$(RANLIB) $(TARGET)" << "\n";
+	    if(!project->isEmpty("DESTDIR"))
+		t << "\t" << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET)" << "\n"
+		  << "\t" << "-$(MOVE) $(TARGET) " << var("DESTDIR") << "\n";
+	} else {
+	    int max_files = project->first("QMAKE_MAX_FILES_PER_AR").toInt();
+	    QStringList objs = project->variables()["OBJECTS"] + project->variables()["OBJMOC"] +
+			       project->variables()["OBJCOMP"],
+			libs = project->variables()["QMAKE_AR_SUBLIBS"];
+	    libs.prepend("$(TARGET)");
+	    for(QStringList::Iterator libit = libs.begin(), objit = objs.begin();
+		libit != libs.end(); ++libit) {
+		QStringList build;
+		for(int cnt = 0; cnt < max_files && objit != objs.end(); ++objit, cnt++)
+		    build << (*objit);
+		QString ar;
+		if((*libit) == "$(TARGET)") {
+		    t << var("DESTDIR") << "$(TARGET): " << var("PRE_TARGETDEPS")
+		      << " $(UICDECLS) " << var("POST_TARGETDEPS") << valList(build) << "\n\t";
+		    ar = project->variables()["QMAKE_AR_CMD"].first();
+		    ar = ar.replace("$(OBJMOC)", "").replace("$(OBJECTS)",
+							     build.join(" "));
+		} else {
+		    t << (*libit) << ": " << valList(build) << "\n\t";
+		    ar = "$(AR) " + (*libit) + " " + build.join(" ");
+		}
+		if(!project->isEmpty("DESTDIR")) {
+		    QString destdir = project->first("DESTDIR");
+		    t << "test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
+		}
+		t << "-$(DEL_FILE) " << (*libit) << "\n\t"
+		  << ar << "\n";
+		if(!project->isEmpty("QMAKE_POST_LINK"))
+		    t << "\t" << var("QMAKE_POST_LINK") << "\n";
+		if(!project->isEmpty("QMAKE_RANLIB"))
+		    t << "\t" << "$(RANLIB) " << (*libit) << "\n";
+		if(!project->isEmpty("DESTDIR"))
+		    t << "\t" << "-$(DEL_FILE) " << var("DESTDIR") << (*libit) << "\n"
+		      << "\t" << "-$(MOVE) " << (*libit) << " " << var("DESTDIR") << "\n";
+	    }
+	}
+	t << endl << endl;
+    }
+
+    t << "mocables: $(SRCMOC)" << endl
+      << "uicables: $(UICDECLS) $(UICIMPLS)" << endl << endl;
+
+    if(!project->isActiveConfig("no_mocdepend")) {
+	//this is an implicity depend on moc, so it will be built if necesary, however
+	//moc itself shouldn't have this dependency - this is a little kludgy but it is
+	//better than the alternative for now.
+	QString moc = project->first("QMAKE_MOC"), target = project->first("TARGET"),
+	    moc_dir = "$(QTDIR)/src/moc";
+	if(!project->isEmpty("QMAKE_MOC_SRC"))
+	    moc_dir = project->first("QMAKE_MOC_SRC");
+	fixEnvVariables(target);
+	fixEnvVariables(moc);
+	if(target != moc)
+	    t << "$(MOC): \n\t"
+	      << "( cd " << moc_dir << " && $(MAKE) )"  << endl << endl;
+    }
+
+    writeMakeQmake(t);
+    if(project->isEmpty("QMAKE_FAILED_REQUIREMENTS") && !project->isActiveConfig("no_autoqmake")) {
+	QString meta_files;
+	if(project->isActiveConfig("create_libtool") && project->first("TEMPLATE") == "lib" &&
+	   !project->isActiveConfig("compile_libtool")) { //libtool
+	    if(!meta_files.isEmpty())
+		meta_files += " ";
+	    meta_files += libtoolFileName();
+	}
+	if(project->isActiveConfig("create_pc") && project->first("TEMPLATE") == "lib") { //pkg-config
+	    if(!meta_files.isEmpty())
+		meta_files += " ";
+	    meta_files += pkgConfigFileName();
+	}
+	if(!meta_files.isEmpty()) {
+	    QStringList files = fileFixify(Option::mkfile::project_files);
+	    t << meta_files << ": " << "\n\t"
+	      << "@$(QMAKE) -prl " << buildArgs() << " " << files.join(" ") << endl;
+	}
+    }
+
+    if(!project->first("QMAKE_PKGINFO").isEmpty()) {
+	QString pkginfo = project->first("QMAKE_PKGINFO");
+	QString destdir = project->first("DESTDIR");
+	t << pkginfo << ": " << "\n\t";
+	if(!destdir.isEmpty())
+	    t << "@test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
+	t << "@$(DEL_FILE) " << pkginfo << "\n\t"
+	  << "@echo \"APPL????\" >" << pkginfo << endl;
+    }
+    if(!project->first("QMAKE_INFO_PLIST").isEmpty()) {
+	QString info_plist = project->first("QMAKE_INFO_PLIST"),
+	    info_plist_out = project->first("QMAKE_INFO_PLIST_OUT");
+	QString destdir = project->first("DESTDIR");
+	t << info_plist_out << ": " << "\n\t";
+	if(!destdir.isEmpty())
+	    t << "@test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
+	t << "@$(DEL_FILE) " << info_plist_out << "\n\t"
+	  << "@sed -e \"s,@ICON@,application.icns,g\" -e \"s,@EXECUTABLE@," << var("QMAKE_ORIG_TARGET")
+	  << ",g\" \"" << info_plist << "\" >\"" << info_plist_out << "\"" << endl;
+	if(!project->first("RC_FILE").isEmpty()) {
+	    QString dir = destdir + "../Resources/";
+	    t << dir << "application.icns: " << fileFixify(var("RC_FILE")) << "\n\t"
+	      << "@test -d " << dir << " || mkdir -p " << dir << "\n\t"
+	      << "@$(DEL_FILE) " << dir << "application.icns" << "\n\t"
+	      << "@$(COPY_FILE) " << fileFixify(var("RC_FILE"))
+              << " " << dir << "application.icns" << endl;
+	}
+    }
+
+    QString ddir = project->isEmpty("QMAKE_DISTDIR") ? project->first("QMAKE_ORIG_TARGET") :
+		   project->first("QMAKE_DISTDIR");
+    QString ddir_c = fileFixify((project->isEmpty("OBJECTS_DIR") ? QString(".tmp/") :
+				 project->first("OBJECTS_DIR")) + ddir);
+    t << "dist: " << "\n\t"
+      << "@mkdir -p " << ddir_c << " && "
+      << "$(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) " << ddir_c << Option::dir_sep << " && ";
+    if(!project->isEmpty("TRANSLATIONS"))
+	t << "$(COPY_FILE) --parents " << var("TRANSLATIONS") << " " << ddir_c << Option::dir_sep << " && ";
+    if(!project->isEmpty("IMAGES"))
+	t << "$(COPY_FILE) --parents " << var("IMAGES") << " " << ddir_c << Option::dir_sep << " && ";
+    if(!project->isEmpty("FORMS")) {
+	QStringList &forms = project->variables()["FORMS"], ui_headers;
+	for(QStringList::Iterator formit = forms.begin(); formit != forms.end(); ++formit) {
+	    QString ui_h = fileFixify((*formit) + Option::h_ext.first());
+	    if(QFile::exists(ui_h) )
+	       ui_headers << ui_h;
+	}
+	if(!ui_headers.isEmpty())
+	    t << "$(COPY_FILE) --parents " << val(ui_headers) << " " << ddir_c << Option::dir_sep << " && ";
+    }
+    t << "( cd `dirname " << ddir_c << "` && "
+      << "$(TAR) " << var("QMAKE_ORIG_TARGET") << ".tar " << ddir << " && "
+      << "$(GZIP) " << var("QMAKE_ORIG_TARGET") << ".tar ) && "
+      << "$(MOVE) `dirname " << ddir_c << "`" << Option::dir_sep << var("QMAKE_ORIG_TARGET") << ".tar.gz . && "
+      << "$(DEL_FILE) -r " << ddir_c
+      << endl << endl;
+
+    QString clean_targets;
+    t << "mocclean:" << "\n";
+    if(mocAware()) {
+	if(!objMoc.isEmpty() || !srcMoc.isEmpty() || moc_incremental) {
+	    if(!objMoc.isEmpty())
+		t << "\t-$(DEL_FILE) $(OBJMOC)" << '\n';
+	    if(!srcMoc.isEmpty())
+		t << "\t-$(DEL_FILE) $(SRCMOC)" << '\n';
+	    if(moc_incremental)
+		t << "\t-$(DEL_FILE) $(INCREMENTAL_OBJMOC)" << '\n';
+	    clean_targets += " mocclean";
+	}
+	t << endl;
+    }
+    t << "uiclean:" << "\n";
+    if (!var("UICIMPLS").isEmpty() || !var("UICDECLS").isEmpty()) {
+	t << "\t-$(DEL_FILE) $(UICIMPLS) $(UICDECLS)" << "\n";
+	clean_targets += " uiclean";
+    }
+    t << endl;
+
+    t << "yaccclean:" << "\n";
+    if(!var("YACCSOURCES").isEmpty()) {
+	QStringList clean, &l = project->variables()["YACCSOURCES"];
+	for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	    QFileInfo fi((*it));
+	    QString dir;
+	    if(fi.dirPath() != ".")
+		dir = fi.dirPath() + Option::dir_sep;
+	    dir = fileFixify(dir, QDir::currentDirPath(), Option::output_dir);
+	    if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep)
+		dir += Option::dir_sep;
+	    clean << ( dir + fi.baseName(TRUE) + Option::yacc_mod + Option::cpp_ext.first() );
+	    clean << ( dir + fi.baseName(TRUE) + Option::yacc_mod + Option::h_ext.first() );
+	}
+	if(!clean.isEmpty()) {
+	    t << "\t-$(DEL_FILE) " << clean.join(" ") << "\n";
+	    clean_targets += " yaccclean";
+	}
+    }
+
+    t << "lexclean:" << "\n";
+    if(!var("LEXSOURCES").isEmpty()) {
+	QStringList clean, &l = project->variables()["LEXSOURCES"];
+	for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	    QFileInfo fi((*it));
+	    QString dir;
+	    if(fi.dirPath() != ".")
+		dir = fi.dirPath() + Option::dir_sep;
+	    dir = fileFixify(dir, QDir::currentDirPath(), Option::output_dir);
+	    if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep)
+		dir += Option::dir_sep;
+	    clean << ( dir + fi.baseName(TRUE) + Option::lex_mod + Option::cpp_ext.first() );
+	}
+	if(!clean.isEmpty()) {
+	    t << "\t-$(DEL_FILE) " << clean.join(" ") << "\n";
+	    clean_targets += " lexclean";
+	}
+    }
+
+    if(do_incremental) {
+	t << "incrclean:" << "\n";
+	if(src_incremental)
+	    t << "\t-$(DEL_FILE) $(INCREMENTAL_OBJECTS)" << "\n";
+	if(moc_incremental)
+	    t << "\t-$(DEL_FILE) $(INCREMENTAL_OBJMOC)" << '\n';
+	t << endl;
+    }
+
+    t << "clean:" << clean_targets << "\n\t";
+    if(!project->isEmpty("OBJECTS")) {
+	if(project->isActiveConfig("compile_libtool"))
+	    t << "-$(LIBTOOL) --mode=clean $(DEL_FILE) $(OBJECTS)" << "\n\t";
+	else
+	    t << "-$(DEL_FILE) $(OBJECTS)" << "\n\t";
+    }
+    if(doPrecompiledHeaders() && !project->isEmpty("PRECOMPILED_HEADER")) {
+	QString header_prefix = project->first("QMAKE_PRECOMP_PREFIX");
+	QString precomph_out_dir = project->first("QMAKE_ORIG_TARGET") + ".gch" + Option::dir_sep;
+	t << "-$(DEL_FILE) " << precomph_out_dir << (header_prefix + "c ")
+	  << precomph_out_dir << header_prefix << "c++" << "\n\t";
+    }
+    if(!project->isEmpty("IMAGES"))
+	t << varGlue("QMAKE_IMAGE_COLLECTION", "\t-$(DEL_FILE) ", " ", "") << "\n\t";
+    if(src_incremental)
+	t << "-$(DEL_FILE) $(INCREMENTAL_OBJECTS)" << "\n\t";
+    t << varGlue("QMAKE_CLEAN","-$(DEL_FILE) "," ","\n\t")
+      << "-$(DEL_FILE) *~ core *.core" << "\n"
+      << varGlue("CLEAN_FILES","\t-$(DEL_FILE) "," ","") << endl << endl;
+    t << "####### Sub-libraries" << endl << endl;
+    if ( !project->variables()["SUBLIBS"].isEmpty() ) {
+	QString libdir = "tmp/";
+	if(!project->isEmpty("SUBLIBS_DIR"))
+	    libdir = project->first("SUBLIBS_DIR");
+	QStringList &l = project->variables()["SUBLIBS"];
+	for(it = l.begin(); it != l.end(); ++it)
+	    t << libdir << "lib" << (*it) << ".a" << ":\n\t"
+	      << var(QString("MAKELIB") + (*it)) << endl << endl;
+    }
+
+    QString destdir = project->first("DESTDIR");
+    if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep)
+	destdir += Option::dir_sep;
+    t << "distclean: " << "clean\n";
+    if(project->first("TEMPLATE") == "app" &&
+       project->isActiveConfig("resource_fork") && !project->isActiveConfig("console"))
+	t << "\t-$(DEL_FILE) -r " << destdir.section(Option::dir_sep, 0, -4) << "\n";
+    else if(project->isActiveConfig("compile_libtool"))
+	t << "\t-$(LIBTOOL) --mode=clean $(DEL_FILE) " << "$(TARGET)" << "\n";
+    else
+	t << "\t-$(DEL_FILE) " << destdir << "$(TARGET)" << " " << "$(TARGET)" << "\n";
+    if(!project->isActiveConfig("staticlib") && project->variables()["QMAKE_APP_FLAG"].isEmpty() &&
+       !project->isActiveConfig("plugin") && !project->isActiveConfig("compile_libtool"))
+	t << "\t-$(DEL_FILE) " << destdir << "$(TARGET0) " << destdir << "$(TARGET1) "
+	  << destdir << "$(TARGET2) $(TARGETA)" << "\n";
+    t << endl << endl;
+
+    if(doPrecompiledHeaders() && !project->isEmpty("PRECOMPILED_HEADER") ) {
+	QString precomph = fileFixify(project->first("PRECOMPILED_HEADER"));
+	t << "###### Prefix headers" << endl;
+	QString comps[] = { "C", "CXX", QString::null };
+	for(int i = 0; !comps[i].isNull(); i++) {
+	    QString flags = var("QMAKE_" + comps[i] + "FLAGS_PRECOMPILE");
+	    flags += " $(" + comps[i] + "FLAGS)";
+
+	    QString header_prefix = project->first("QMAKE_PRECOMP_PREFIX");
+	    QString outdir = project->first("QMAKE_ORIG_TARGET") + ".gch" + Option::dir_sep, outfile = outdir;
+	    QString compiler;
+	    if(comps[i] == "C") {
+		outfile += header_prefix + "c";
+		compiler = "$(CC) ";
+	    } else {
+		outfile += header_prefix + "c++";
+		compiler = "$(CXX) ";
+	    }
+	    t << outfile << ": " << precomph << " " << findDependencies(precomph).join(" \\\n\t\t")
+	      << "\n\t" << "test -d " << outdir << " || mkdir -p " << outdir
+	      << "\n\t" << compiler << flags << " $(INCPATH) " << precomph << " -o " << outfile << endl << endl;
+	}
+    }
+    if(!project->isEmpty("ALLMOC_HEADER")) {
+	QString outdir = project->first("MOC_DIR");
+	QString precomph = fileFixify(project->first("ALLMOC_HEADER"));
+	t << "###### Combined headers" << endl << endl
+	  << outdir << "allmoc.cpp: " << precomph << " "
+	  << varList("HEADERS_ORIG") << "\n\t"
+	  << "echo '#include \"" << precomph << "\"' >" << outdir << "allmoc.cpp" << "\n\t"
+	  << "$(CXX) -E -DQT_MOC_CPP -DQT_NO_STL $(CXXFLAGS) $(INCPATH) >" << outdir << "allmoc.h "
+	  << outdir << "allmoc.cpp" << "\n\t"
+	  << "$(MOC) -o " << outdir << "allmoc.cpp " << outdir << "allmoc.h" << "\n\t"
+	  << "perl -pi -e 's{#include \"allmoc.h\"}{#define QT_H_CPP\\n#include \""
+	  << precomph << "\"}' " << outdir << "allmoc.cpp" << "\n\t"
+	  << "$(DEL_FILE) " << outdir << "allmoc.h" << endl << endl;
+    }
+
+    // user defined targets
+    QStringList &qut = project->variables()["QMAKE_EXTRA_UNIX_TARGETS"];
+    for(it = qut.begin(); it != qut.end(); ++it) {
+	QString targ = var((*it) + ".target"),
+		 cmd = var((*it) + ".commands"), deps;
+	if(targ.isEmpty())
+	    targ = (*it);
+	QStringList &deplist = project->variables()[(*it) + ".depends"];
+	for(QStringList::Iterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) {
+	    QString dep = var((*dep_it) + ".target");
+	    if(dep.isEmpty())
+		dep = (*dep_it);
+	    deps += " " + dep;
+	}
+	if(project->variables()[(*it) + ".CONFIG"].findIndex("phony") != -1)
+	    deps += QString(" ") + "FORCE";
+	t << targ << ":" << deps << "\n\t"
+	  << cmd << endl << endl;
+    }
+    // user defined compilers
+    QStringList &quc = project->variables()["QMAKE_EXTRA_UNIX_COMPILERS"];
+    for(it = quc.begin(); it != quc.end(); ++it) {
+	QString tmp_out = project->variables()[(*it) + ".output"].first();
+	QString tmp_cmd = project->variables()[(*it) + ".commands"].join(" ");
+	QString tmp_dep = project->variables()[(*it) + ".depends"].join(" ");
+	QStringList &vars = project->variables()[(*it) + ".variables"];
+	if(tmp_out.isEmpty() || tmp_cmd.isEmpty())
+	    continue;
+	QStringList &tmp = project->variables()[(*it) + ".input"];
+	for(QStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
+	    QStringList &inputs = project->variables()[(*it2)];
+	    for(QStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
+		QFileInfo fi(Option::fixPathToLocalOS((*input)));
+		QString in = Option::fixPathToTargetOS((*input), FALSE),
+		       out = tmp_out, cmd = tmp_cmd, deps;
+		out.replace("${QMAKE_FILE_BASE}", fi.baseName());
+		out.replace("${QMAKE_FILE_NAME}", fi.filePath());
+		cmd.replace("${QMAKE_FILE_BASE}", fi.baseName());
+		cmd.replace("${QMAKE_FILE_OUT}", out);
+		cmd.replace("${QMAKE_FILE_NAME}", fi.filePath());
+		for(QStringList::Iterator it3 = vars.begin(); it3 != vars.end(); ++it3)
+		    cmd.replace("$(" + (*it3) + ")", "$(QMAKE_COMP_" + (*it3)+")");
+		if(!tmp_dep.isEmpty()) {
+		    char buff[256];
+		    QString dep_cmd = tmp_dep;
+		    dep_cmd.replace("${QMAKE_FILE_NAME}", fi.filePath());
+		    if(FILE *proc = QT_POPEN(dep_cmd.latin1(), "r")) {
+			while(!feof(proc)) {
+			    int read_in = int(fread(buff, 1, 255, proc));
+			    if(!read_in)
+				break;
+			    int l = 0;
+			    for(int i = 0; i < read_in; i++) {
+				if(buff[i] == '\n' || buff[i] == ' ') {
+				    deps += " " + QCString(buff+l, (i - l) + 1);
+				    l = i;
+				}
+			    }
+			}
+			fclose(proc);
+		    }
+		}
+		t << out << ": " << in << deps << "\n\t"
+		  << cmd << endl << endl;
+	    }
+	}
+    }
+    t <<"FORCE:" << endl << endl;
+}
+
+struct SubDir
+{
+    QString directory, profile, target, makefile;
+};
+
+void
+UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
+{
+    // blasted includes
+    QStringList &qeui = project->variables()["QMAKE_EXTRA_UNIX_INCLUDES"];
+    for(QStringList::Iterator qeui_it = qeui.begin(); qeui_it != qeui.end(); ++qeui_it)
+	t << "include " << (*qeui_it) << endl;
+    writeExtraVariables(t);
+
+    QPtrList<SubDir> subdirs;
+    {
+	QStringList subdirs_in = project->variables()["SUBDIRS"];
+	for(QStringList::Iterator it = subdirs_in.begin(); it != subdirs_in.end(); ++it) {
+	    QString file = (*it);
+	    fileFixify(file);
+	    SubDir *sd = new SubDir;
+	    subdirs.append(sd);
+	    sd->makefile = "$(MAKEFILE)";
+	    if((*it).right(4) == ".pro") {
+		int slsh = file.findRev(Option::dir_sep);
+		if(slsh != -1) {
+		    sd->directory = file.left(slsh+1);
+		    sd->profile = file.mid(slsh+1);
+		} else {
+		    sd->profile = file;
+		}
+	    } else {
+		if(!file.isEmpty())
+		    sd->profile = file.section(Option::dir_sep, -1) + ".pro";
+		sd->directory = file;
+	    }
+	    while(sd->directory.right(1) == Option::dir_sep)
+		sd->directory = sd->directory.left(sd->directory.length() - 1);
+	    if(!sd->profile.isEmpty()) {
+		QString basename = sd->directory;
+		int new_slsh = basename.findRev(Option::dir_sep);
+		if(new_slsh != -1)
+		    basename = basename.mid(new_slsh+1);
+		if(sd->profile != basename + ".pro")
+		    sd->makefile += "." + sd->profile.left(sd->profile.length() - 4); //no need for the .pro
+	    }
+	    sd->target = "sub-" + (*it);
+	    sd->target.replace('/', '-');
+	    sd->target.replace('.', '_');
+	}
+    }
+    QPtrListIterator<SubDir> it(subdirs);
+
+    QString ofile = Option::output.name();
+    if(ofile.findRev(Option::dir_sep) != -1)
+	ofile = ofile.right(ofile.length() - ofile.findRev(Option::dir_sep) -1);
+    t << "MAKEFILE =	" << var("MAKEFILE") << endl;
+    t << "QMAKE    =	" << var("QMAKE") << endl;
+    t << "DEL_FILE =    " << var("QMAKE_DEL_FILE") << endl;
+    t << "CHK_DIR_EXISTS= " << var("QMAKE_CHK_DIR_EXISTS") << endl;
+    t << "MKDIR    = " << var("QMAKE_MKDIR") << endl;
+    t << "INSTALL_FILE= " << var("QMAKE_INSTALL_FILE") << endl;
+    t << "INSTALL_DIR = " << var("QMAKE_INSTALL_DIR") << endl;
+    t << "SUBTARGETS =	";     // subdirectory targets are sub-directory
+    for( it.toFirst(); it.current(); ++it)
+	t << " \\\n\t\t" << it.current()->target;
+    t << endl << endl;
+    t << "first: all\n\nall: " << ofile << " $(SUBTARGETS)" << endl << endl;
+
+    // generate target rules
+    for( it.toFirst(); it.current(); ++it) {
+	bool have_dir = !(*it)->directory.isEmpty();
+	QString mkfile = (*it)->makefile, out;
+	if(have_dir)
+	    mkfile.prepend((*it)->directory + Option::dir_sep);
+	if(direct || (*it)->makefile != "$(MAKEFILE)")
+	    out = " -o " + (*it)->makefile;
+	//qmake it
+	t << mkfile << ": " << "\n\t";
+	if(have_dir)
+	    t << mkdir_p_asstring((*it)->directory) << "\n\t"
+	      << "cd " << (*it)->directory << " && ";
+	QString profile = fileFixify((*it)->profile, (*it)->directory, (*it)->directory);
+	t << "$(QMAKE) " << profile << buildArgs() << out << endl;
+	//actually compile
+	t << (*it)->target << ": " << mkfile << " FORCE" << "\n\t";
+	if(have_dir)
+	    t << "cd " << (*it)->directory << " && ";
+	t << "$(MAKE) -f " << (*it)->makefile << endl << endl;
+    }
+
+    if (project->isActiveConfig("ordered")) { 	// generate dependencies
+	for( it.toFirst(); it.current(); ) {
+	    QString tar = it.current()->target;
+	    ++it;
+	    if (it.current())
+		t << it.current()->target << ": " << tar << endl;
+	}
+	t << endl;
+    }
+
+    writeMakeQmake(t);
+
+    if(project->isEmpty("SUBDIRS")) {
+	t << "all qmake_all distclean uicables mocables install_subdirs uninstall_subdirs"
+	  << " uiclean mocclean lexclean yaccclean clean " << var("SUBDIR_TARGETS") << ": FORCE" << endl;
+    } else {
+	t << "all: $(SUBTARGETS)" << endl;
+	t << "qmake_all:";
+	for( it.toFirst(); it.current(); ++it) {
+	    t << " ";
+	    if(!(*it)->directory.isEmpty())
+		t << (*it)->directory << Option::dir_sep;
+	    t << (*it)->makefile;
+	}
+	for( it.toFirst(); it.current(); ++it) {
+	    t << "\n\t ( ";
+	    if(!(*it)->directory.isEmpty())
+		t << "[ -d " << (*it)->directory << " ] && cd " << (*it)->directory << " ; ";
+	    t << "grep \"^qmake_all:\" " << (*it)->makefile
+	      << " && $(MAKE) -f " << (*it)->makefile << " qmake_all" << "; ) || true";
+	}
+	t << endl;
+	t << "clean uicables mocables uiclean mocclean lexclean yaccclean "
+	  << var("SUBDIR_TARGETS") << ": qmake_all FORCE";
+	for( it.toFirst(); it.current(); ++it) {
+	    t << "\n\t ( ";
+	    if(!(*it)->directory.isEmpty())
+		t << "[ -d " << (*it)->directory << " ] && cd " << (*it)->directory << " ; ";
+	    t << "$(MAKE) -f " << (*it)->makefile << " $@" << "; ) || true";
+	}
+	t << endl;
+	t << "uninstall_subdirs: qmake_all FORCE";
+	for( it.toFirst(); it.current(); ++it) {
+	    t << "\n\t ( ";
+	    if(!(*it)->directory.isEmpty())
+		t << "[ -d " << (*it)->directory << " ] && cd " << (*it)->directory << " ; ";
+	    t << "$(MAKE) -f " << (*it)->makefile << " uninstall" << "; ) || true";
+	}
+	t << endl;
+	t << "install_subdirs: qmake_all FORCE";
+	for( it.toFirst(); it.current(); ++it) {
+	    t << "\n\t ( ";
+	    if(!(*it)->directory.isEmpty())
+		t << "[ -d " << (*it)->directory << " ] && cd " << (*it)->directory << " ; ";
+	    t << "$(MAKE) -f " << (*it)->makefile << " install" << "; ) || true";
+	}
+	t << endl;
+	t << "distclean: qmake_all FORCE";
+	for( it.toFirst(); it.current(); ++it) {
+	    t << "\n\t ( ";
+	    if(!(*it)->directory.isEmpty())
+		t << "[ -d " << (*it)->directory << " ] && cd " << (*it)->directory << " ; ";
+	    t << "$(MAKE) -f " << (*it)->makefile << " $@; $(DEL_FILE) " << (*it)->makefile << "; ) || true";
+	}
+	t << endl << endl;
+    }
+
+    //installations
+    project->variables()["INSTALLDEPS"]   += "install_subdirs";
+    project->variables()["UNINSTALLDEPS"] += "uninstall_subdirs";
+    writeInstalls(t, "INSTALLS");
+
+    // user defined targets
+    QStringList &qut = project->variables()["QMAKE_EXTRA_UNIX_TARGETS"];
+    for(QStringList::Iterator qut_it = qut.begin(); qut_it != qut.end(); ++qut_it) {
+	QString targ = var((*qut_it) + ".target"),
+		 cmd = var((*qut_it) + ".commands"), deps;
+	if(targ.isEmpty())
+	    targ = (*qut_it);
+	QStringList &deplist = project->variables()[(*qut_it) + ".depends"];
+	for(QStringList::Iterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) {
+	    QString dep = var((*dep_it) + ".target");
+	    if(dep.isEmpty())
+		dep = (*dep_it);
+	    deps += " " + dep;
+	}
+	if(project->variables()[(*qut_it) + ".CONFIG"].findIndex("phony") != -1)
+	    deps += QString(" ") + "FORCE";
+	t << targ << ":" << deps << "\n";
+        if(!cmd.isEmpty())
+            t << "\t" << cmd << endl;
+        t << endl;
+    }
+    t <<"FORCE:" << endl << endl;
+}
+
+void UnixMakefileGenerator::init2()
+{
+    //version handling
+    if(project->variables()["VERSION"].isEmpty())
+	project->variables()["VERSION"].append("1.0." +
+					       (project->isEmpty("VER_PAT") ? QString("0") :
+						project->first("VER_PAT")) );
+    QStringList l = QStringList::split('.', project->first("VERSION"));
+    l << "0" << "0"; //make sure there are three
+    project->variables()["VER_MAJ"].append(l[0]);
+    project->variables()["VER_MIN"].append(l[1]);
+    project->variables()["VER_PAT"].append(l[2]);
+
+    if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) {
+#if 0
+	if ( project->isActiveConfig("dll") ) {
+	    project->variables()["TARGET"] += project->variables()["TARGET.so"];
+	    if(project->variables()["QMAKE_LFLAGS_SHAPP"].isEmpty())
+		project->variables()["QMAKE_LFLAGS_SHAPP"] += project->variables()["QMAKE_LFLAGS_SHLIB"];
+	    if(!project->variables()["QMAKE_LFLAGS_SONAME"].isEmpty())
+		project->variables()["QMAKE_LFLAGS_SONAME"].first() += project->first("TARGET");
+	}
+#endif
+	project->variables()["TARGET"].first().prepend(project->first("DESTDIR"));
+       if ( !project->variables()["QMAKE_CYGWIN_EXE"].isEmpty() )
+	    project->variables()["TARGET_EXT"].append(".exe");
+    } else if ( project->isActiveConfig("staticlib") ) {
+	project->variables()["TARGET"].first().prepend("lib");
+	project->variables()["TARGET"].first() += ".a";
+	if(project->variables()["QMAKE_AR_CMD"].isEmpty())
+	    project->variables()["QMAKE_AR_CMD"].append("$(AR) $(TARGET) $(OBJECTS) $(OBJMOC)");
+    } else {
+	project->variables()["TARGETA"].append(project->first("DESTDIR") + "lib" + project->first("TARGET") + ".a");
+	if( project->isActiveConfig("compile_libtool") )
+	    project->variables()["TARGET_la"] = project->first("DESTDIR") + "lib" + project->first("TARGET") + Option::libtool_ext;
+
+	if ( !project->variables()["QMAKE_AR_CMD"].isEmpty() )
+	    project->variables()["QMAKE_AR_CMD"].first().replace("(TARGET)","(TARGETA)");
+	else
+	    project->variables()["QMAKE_AR_CMD"].append("$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)");
+	if( project->isActiveConfig("compile_libtool") ) {
+	    project->variables()["TARGET"] = project->variables()["TARGET_la"];
+	} else if( project->isActiveConfig("plugin") ) {
+	    project->variables()["TARGET_x.y.z"].append("lib" +
+							project->first("TARGET") + "." +
+							project->first("QMAKE_EXTENSION_PLUGIN"));
+	    if(project->isActiveConfig("lib_version_first"))
+		project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
+							project->first("VER_MAJ") + "." +
+							project->first("QMAKE_EXTENSION_PLUGIN"));
+	    else
+		project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
+							project->first("QMAKE_EXTENSION_PLUGIN") +
+							"." + project->first("VER_MAJ"));
+
+	    project->variables()["TARGET"] = project->variables()["TARGET_x.y.z"];
+	    if(project->isActiveConfig("qt"))
+		project->variables()["DEFINES"].append("QT_PLUGIN");
+	} else if ( !project->isEmpty("QMAKE_HPUX_SHLIB") ) {
+	    project->variables()["TARGET_"].append("lib" + project->first("TARGET") + ".sl");
+	    if(project->isActiveConfig("lib_version_first"))
+		project->variables()["TARGET_x"].append("lib" + project->first("VER_MAJ") + "." +
+							project->first("TARGET"));
+	    else
+		project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
+							project->first("VER_MAJ"));
+	    project->variables()["TARGET"] = project->variables()["TARGET_x"];
+	} else if ( !project->isEmpty("QMAKE_AIX_SHLIB") ) {
+	    project->variables()["TARGET_"].append("lib" + project->first("TARGET") + ".a");
+	    if(project->isActiveConfig("lib_version_first")) {
+		project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
+							project->first("VER_MAJ") + "." +
+							project->first("QMAKE_EXTENSION_SHLIB"));
+		project->variables()["TARGET_x.y"].append("lib" + project->first("TARGET") + "." +
+							  project->first("VER_MAJ") +
+							  "." + project->first("VER_MIN") + "." +
+							  project->first("QMAKE_EXTENSION_SHLIB"));
+		project->variables()["TARGET_x.y.z"].append("lib" + project->first("TARGET") + "." +
+							    project->first("VER_MAJ") + "." +
+							    project->first("VER_MIN") + "." +
+							    project->first("VER_PAT") + "." +
+							    project->first("QMAKE_EXTENSION_SHLIB"));
+	    } else {
+		project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
+							project->first("QMAKE_EXTENSION_SHLIB") +
+							"." + project->first("VER_MAJ"));
+		project->variables()["TARGET_x.y"].append("lib" + project->first("TARGET") + "." +
+							  project->first("QMAKE_EXTENSION_SHLIB") +
+							  "." + project->first("VER_MAJ") +
+							  "." + project->first("VER_MIN"));
+		project->variables()["TARGET_x.y.z"].append("lib" + project->first("TARGET") + "." +
+							    project->first("QMAKE_EXTENSION_SHLIB") + "." +
+							    project->first("VER_MAJ") + "." +
+							    project->first("VER_MIN") + "." +
+							    project->first("VER_PAT"));
+	    }
+	    project->variables()["TARGET"] = project->variables()["TARGET_x.y.z"];
+	} else {
+	    project->variables()["TARGET_"].append("lib" + project->first("TARGET") + "." +
+						   project->first("QMAKE_EXTENSION_SHLIB"));
+	    if(project->isActiveConfig("lib_version_first")) {
+		project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
+							project->first("VER_MAJ") + "." +
+							project->first("QMAKE_EXTENSION_SHLIB"));
+		project->variables()["TARGET_x.y"].append("lib" + project->first("TARGET") + "." +
+							  project->first("VER_MAJ") +
+							  "." + project->first("VER_MIN") + "." +
+							  project->first("QMAKE_EXTENSION_SHLIB"));
+		project->variables()["TARGET_x.y.z"].append("lib" + project->first("TARGET") + "." +
+							    project->first("VER_MAJ") + "." +
+							    project->first("VER_MIN") +  "." +
+							    project->first("VER_PAT") + "." +
+							    project->variables()["QMAKE_EXTENSION_SHLIB"].first());
+	    } else {
+		project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
+							project->first("QMAKE_EXTENSION_SHLIB") +
+							"." + project->first("VER_MAJ"));
+		project->variables()["TARGET_x.y"].append("lib" + project->first("TARGET") + "." +
+						      project->first("QMAKE_EXTENSION_SHLIB")
+						      + "." + project->first("VER_MAJ") +
+						      "." + project->first("VER_MIN"));
+		project->variables()["TARGET_x.y.z"].append("lib" + project->first("TARGET") +
+							    "." +
+							    project->variables()[
+								"QMAKE_EXTENSION_SHLIB"].first() + "." +
+							    project->first("VER_MAJ") + "." +
+							    project->first("VER_MIN") +  "." +
+							    project->first("VER_PAT"));
+	    }
+	    project->variables()["TARGET"] = project->variables()["TARGET_x.y.z"];
+	}
+	if(project->isEmpty("QMAKE_LN_SHLIB"))
+	    project->variables()["QMAKE_LN_SHLIB"].append("ln -s");
+	project->variables()["DESTDIR_TARGET"].append("$(TARGET)");
+	if ( !project->variables()["DESTDIR"].isEmpty() )
+	    project->variables()["DESTDIR_TARGET"].first().prepend(project->first("DESTDIR"));
+	if ( !project->variables()["QMAKE_LFLAGS_SONAME"].isEmpty()) {
+	    if(project->isActiveConfig("plugin")) {
+		if(!project->variables()["TARGET"].isEmpty() )
+		    project->variables()["QMAKE_LFLAGS_SONAME"].first() += project->first("TARGET");
+	    } else {
+		if(!project->variables()["TARGET_x"].isEmpty() )
+		    project->variables()["QMAKE_LFLAGS_SONAME"].first() += project->first("TARGET_x");
+	    }
+	}
+	if ( project->variables()["QMAKE_LINK_SHLIB_CMD"].isEmpty() )
+	    project->variables()["QMAKE_LINK_SHLIB_CMD"].append(
+		"$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)");
+    }
+    if(project->isEmpty("QMAKE_SYMBOLIC_LINK"))
+	project->variables()["QMAKE_SYMBOLIC_LINK"].append("ln -sf");
+    if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_APP"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_APP"];
+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_APP"];
+    } else if ( project->isActiveConfig("dll") ) {
+	if( !project->isActiveConfig("plugin") || !project->isActiveConfig("plugin_no_share_shlib_cflags")) {
+	    project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_SHLIB"];
+	    project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_SHLIB"];
+	}
+	if ( project->isActiveConfig("plugin") ) {
+	    project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_PLUGIN"];
+	    project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_PLUGIN"];
+	    project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_PLUGIN"];
+	    if( project->isActiveConfig("plugin_with_soname") && !project->isActiveConfig("compile_libtool"))
+		project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_SONAME"];
+	} else {
+	    project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_SHLIB"];
+	    if(!project->isEmpty("QMAKE_LFLAGS_COMPAT_VERSION")) {
+		if(project->isEmpty("COMPAT_VERSION"))
+		    project->variables()["QMAKE_LFLAGS"] += QString(project->first("QMAKE_LFLAGS_COMPAT_VERSION") +
+								    project->first("VER_MAJ") + "." +
+								    project->first("VER_MIN"));
+		else
+		    project->variables()["QMAKE_LFLAGS"] += QString(project->first("QMAKE_LFLAGS_COMPAT_VERSION") +
+								    project->first("COMPATIBILITY_VERSION"));
+	    }
+	    if(!project->isEmpty("QMAKE_LFLAGS_VERSION")) {
+		project->variables()["QMAKE_LFLAGS"] += QString(project->first("QMAKE_LFLAGS_VERSION") +
+								project->first("VER_MAJ") + "." +
+								project->first("VER_MIN") + "." +
+								project->first("VER_PAT"));
+	    }
+	    if(!project->isActiveConfig("compile_libtool"))
+		project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_SONAME"];
+	}
+	QString destdir = project->first("DESTDIR");
+	if ( !destdir.isEmpty() && !project->variables()["QMAKE_RPATH"].isEmpty() ) {
+	    QString rpath_destdir = destdir;
+	    if(QDir::isRelativePath(rpath_destdir)) {
+		QFileInfo fi(Option::fixPathToLocalOS(rpath_destdir));
+		if(fi.convertToAbs())  //strange, shouldn't really happen
+		    rpath_destdir = Option::fixPathToTargetOS(rpath_destdir, FALSE);
+		else
+		    rpath_destdir = fi.filePath();
+	    } else {
+		rpath_destdir = Option::fixPathToTargetOS(rpath_destdir, FALSE);
+	    }
+	    project->variables()["QMAKE_LFLAGS"] += project->first("QMAKE_RPATH") + rpath_destdir;
+	}
+    }
+    QStringList &quc = project->variables()["QMAKE_EXTRA_UNIX_COMPILERS"];
+    for(QStringList::Iterator it = quc.begin(); it != quc.end(); ++it) {
+	QString tmp_out = project->variables()[(*it) + ".output"].first();
+	if(tmp_out.isEmpty())
+	    continue;
+	QStringList &tmp = project->variables()[(*it) + ".input"];
+	for(QStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
+	    QStringList &inputs = project->variables()[(*it2)];
+	    for(QStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
+		QFileInfo fi(Option::fixPathToLocalOS((*input)));
+		QString in = Option::fixPathToTargetOS((*input), FALSE),
+		       out = tmp_out;
+		out.replace("${QMAKE_FILE_BASE}", fi.baseName());
+		out.replace("${QMAKE_FILE_NAME}", fi.filePath());
+		if(project->variables()[(*it) + ".CONFIG"].findIndex("no_link") == -1)
+		    project->variables()["OBJCOMP"] += out;
+	    }
+	}
+    }
+}
+
+QString
+UnixMakefileGenerator::libtoolFileName()
+{
+    QString ret = var("TARGET");
+    int slsh = ret.findRev(Option::dir_sep);
+    if(slsh != -1)
+	ret = ret.right(ret.length() - slsh);
+    int dot = ret.find('.');
+    if(dot != -1)
+	ret = ret.left(dot);
+    ret += Option::libtool_ext;
+    if(!project->isEmpty("DESTDIR"))
+	ret.prepend(var("DESTDIR"));
+    return ret;
+}
+
+void
+UnixMakefileGenerator::writeLibtoolFile()
+{
+    QString fname = libtoolFileName(), lname = fname;
+    int slsh = lname.findRev(Option::dir_sep);
+    if(slsh != -1)
+	lname = lname.right(lname.length() - slsh - 1);
+    QFile ft(fname);
+    if(!ft.open(IO_WriteOnly))
+	return;
+    project->variables()["ALL_DEPS"].append(fname);
+
+    QTextStream t(&ft);
+    t << "# " << lname << " - a libtool library file\n";
+    time_t now = time(NULL);
+    t << "# Generated by qmake/libtool (" << qmake_version() << ") (Qt "
+      << QT_VERSION_STR << ") on: " << ctime(&now) << "\n";
+
+    t << "# The name that we can dlopen(3).\n"
+      << "dlname='" << var(project->isActiveConfig("plugin") ? "TARGET" : "TARGET_x")
+      << "'\n\n";
+
+    t << "# Names of this library.\n";
+    t << "library_names='";
+    if(project->isActiveConfig("plugin")) {
+	t << var("TARGET");
+    } else {
+    	if (project->isEmpty("QMAKE_HPUX_SHLIB"))
+	    t << var("TARGET_x.y.z") << " ";
+    	t << var("TARGET_x") << " " << var("TARGET_");
+    }
+    t << "'\n\n";
+
+    t << "# The name of the static archive.\n"
+      << "old_library='" << lname.left(lname.length()-Option::libtool_ext.length()) << ".a'\n\n";
+
+    t << "# Libraries that this one depends upon.\n";
+    QStringList libs;
+    if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
+	libs = project->variables()["QMAKE_INTERNAL_PRL_LIBS"];
+    else
+	libs << "QMAKE_LIBS"; //obvious one
+    t << "dependency_libs='";
+    for(QStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it)
+	t << project->variables()[(*it)].join(" ") << " ";
+    t << "'\n\n";
+
+    t << "# Version information for " << lname << "\n";
+    int maj = project->first("VER_MAJ").toInt();
+    int min = project->first("VER_MIN").toInt();
+    int pat = project->first("VER_PAT").toInt();
+    t << "current=" << (10*maj + min) << "\n" // best I can think of
+      << "age=0\n"
+      << "revision=" << pat << "\n\n";
+
+    t << "# Is this an already installed library.\n"
+	"installed=yes\n\n"; // ###
+
+    t << "# Files to dlopen/dlpreopen.\n"
+	"dlopen=''\n"
+	"dlpreopen=''\n\n";
+
+    QString install_dir = project->first("target.path");
+    if(install_dir.isEmpty())
+	install_dir = project->first("DESTDIR");
+    t << "# Directory that this library needs to be installed in:\n"
+	"libdir='" << Option::fixPathToTargetOS(install_dir, FALSE) << "'\n";
+}
+
+QString
+UnixMakefileGenerator::pkgConfigFileName()
+{
+    QString ret = var("TARGET");
+    int slsh = ret.findRev(Option::dir_sep);
+    if(slsh != -1)
+	ret = ret.right(ret.length() - slsh);
+    if(ret.startsWith("lib"))
+	ret = ret.mid(3);
+    int dot = ret.find('.');
+    if(dot != -1)
+	ret = ret.left(dot);
+    ret += Option::pkgcfg_ext;
+    if(!project->isEmpty("DESTDIR")) {
+	ret.prepend(var("DESTDIR"));
+	ret = Option::fixPathToLocalOS(fileFixify(ret,QDir::currentDirPath(), Option::output_dir));
+    }
+    return ret;
+}
+
+QString
+UnixMakefileGenerator::pkgConfigPrefix() const
+{
+    if(!project->isEmpty("QMAKE_PKGCONFIG_PREFIX"))
+	return project->first("QMAKE_PKGCONFIG_PREFIX");
+    return qInstallPath();
+}
+
+QString
+UnixMakefileGenerator::pkgConfigFixPath(QString path) const
+{
+    QString prefix = pkgConfigPrefix();
+    if(path.startsWith(prefix))
+	path = path.replace(prefix, "${prefix}");
+    return path;
+}
+
+void
+UnixMakefileGenerator::writePkgConfigFile()     // ### does make sense only for libqt so far
+{
+    QString fname = pkgConfigFileName(), lname = fname;
+    int slsh = lname.findRev(Option::dir_sep);
+    if(slsh != -1)
+	lname = lname.right(lname.length() - slsh - 1);
+    QFile ft(fname);
+    if(!ft.open(IO_WriteOnly))
+	return;
+    project->variables()["ALL_DEPS"].append(fname);
+    QTextStream t(&ft);
+
+    QString prefix = pkgConfigPrefix();
+    QString libDir = project->first("QMAKE_PKGCONFIG_LIBDIR");
+    if(libDir.isEmpty())
+	libDir = prefix + "/lib";
+    QString includeDir = project->first("QMAKE_PKGCONFIG_INCDIR");
+    if(includeDir.isEmpty())
+	includeDir = prefix + "/include";
+
+    t << "prefix=" << prefix << endl;
+    t << "exec_prefix=${prefix}\n"
+      << "libdir=" << pkgConfigFixPath(libDir) << "\n"
+      << "includedir=" << pkgConfigFixPath(includeDir) << endl;
+    // non-standard entry. Provides useful info normally only
+    // contained in the internal .qmake.cache file
+    t << varGlue("CONFIG", "qt_config=", " ", "") << endl << endl;
+
+    t << "Name: Qt" << endl;
+    QString desc = project->first("QMAKE_PKGCONFIG_DESCRIPTION");
+    if(desc.isEmpty()) {
+	desc = project->first("TARGET").lower();
+	desc.replace(0, 1, desc[0].upper());
+	if(project->first("TEMPLATE") == "lib") {
+	    if(project->isActiveConfig("plugin"))
+	       desc += " Plugin";
+	    else
+	       desc += " Library";
+	} else if(project->first("TEMPLATE") == "app") {
+	    desc += " Application";
+	}
+    }
+    t << "Description: " << desc << endl;
+    t << "Version: " << project->first("VERSION") << endl;
+
+    // libs
+    QStringList libs;
+    if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
+	libs = project->variables()["QMAKE_INTERNAL_PRL_LIBS"];
+    else
+	libs << "QMAKE_LIBS"; //obvious one
+    if(project->isActiveConfig("thread"))
+	libs << "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread?
+    t << "Libs: -L${libdir} -l" << lname.left(lname.length()-Option::libtool_ext.length()) << " ";
+    for(QStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it)
+	t << project->variables()[(*it)].join(" ") << " ";
+    t << endl;
+
+    // flags
+    // ### too many
+    t << "Cflags: "
+	// << var("QMAKE_CXXFLAGS") << " "
+      << varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ")
+      << project->variables()["PRL_EXPORT_CXXFLAGS"].join(" ")
+	//      << varGlue("DEFINES","-D"," -D"," ")
+      << " -I${includedir}";
+    t << endl;
+}
diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp
new file mode 100644
index 0000000..dae8a97
--- /dev/null
+++ b/qmake/generators/win32/borland_bmake.cpp
@@ -0,0 +1,664 @@
+/****************************************************************************
+**
+** NmakeMakefileGenerator of BorlandMakefileGenerator class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#include "borland_bmake.h"
+#include "option.h"
+#include <qdir.h>
+#include <qregexp.h>
+#include <time.h>
+#include <stdlib.h>
+
+
+BorlandMakefileGenerator::BorlandMakefileGenerator(QMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE)
+{
+
+}
+
+bool
+BorlandMakefileGenerator::writeMakefile(QTextStream &t)
+{
+    writeHeader(t);
+    if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
+	t << "all clean:" << "\n\t"
+	  << "@echo \"Some of the required modules ("
+	  << var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t"
+	  << "@echo \"Skipped.\"" << endl << endl;
+	return TRUE;
+    }
+
+    if(project->first("TEMPLATE") == "app" ||
+       project->first("TEMPLATE") == "lib") {
+	writeBorlandParts(t);
+	return MakefileGenerator::writeMakefile(t);
+    }
+    else if(project->first("TEMPLATE") == "subdirs") {
+	writeSubDirs(t);
+	return TRUE;
+    }
+    return FALSE;
+}
+
+void
+BorlandMakefileGenerator::writeBorlandParts(QTextStream &t)
+{
+    t << "!if !$d(BCB)" << endl;
+    t << "BCB = $(MAKEDIR)\\.." << endl;
+    t << "!endif" << endl << endl;
+    t << "####### Compiler, tools and options" << endl << endl;
+    t << "CC	=	" << var("QMAKE_CC") << endl;
+    t << "CXX	=	" << var("QMAKE_CXX") << endl;
+    t << "LEX     = " << var("QMAKE_LEX") << endl;
+    t << "YACC    = " << var("QMAKE_YACC") << endl;
+    t << "CFLAGS	=	" << var("QMAKE_CFLAGS") << " "
+      << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " "
+      <<  varGlue("DEFINES","-D"," -D","") << endl;
+    t << "CXXFLAGS=	" << var("QMAKE_CXXFLAGS") << " "
+      << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " "
+      << varGlue("DEFINES","-D"," -D","") << endl;
+    t << "LEXFLAGS=" << var("QMAKE_LEXFLAGS") << endl;
+    t << "YACCFLAGS=" << var("QMAKE_YACCFLAGS") << endl;
+
+    t << "INCPATH	=	";
+    QStringList &incs = project->variables()["INCLUDEPATH"];
+    for(QStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) {
+	QString inc = (*incit);
+	inc.replace(QRegExp("\\\\*$"), "");
+	inc.replace("\"", "");
+	t << " -I\"" << inc << "\"";
+    }
+    t << " -I\"" << specdir() << "\""
+      << endl;
+
+    if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) {
+	t << "LINK	=	" << var("QMAKE_LINK") << endl;
+	t << "LFLAGS	=	";
+	if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() )
+	    t << varGlue("QMAKE_LIBDIR","-L",";","") << " ";
+	t << var("QMAKE_LFLAGS") << endl;
+	t << "LIBS	=	" << var("QMAKE_LIBS") << endl;
+    }
+    else {
+	t << "LIB	=	" << var("QMAKE_LIB") << endl;
+    }
+    t << "MOC	=	" << (project->isEmpty("QMAKE_MOC") ? QString("moc") :
+			      Option::fixPathToTargetOS(var("QMAKE_MOC"), FALSE)) << endl;
+    t << "UIC	=	" << (project->isEmpty("QMAKE_UIC") ? QString("uic") :
+			      Option::fixPathToTargetOS(var("QMAKE_UIC"), FALSE)) << endl;
+    t << "QMAKE =       " << (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") :
+			      Option::fixPathToTargetOS(var("QMAKE_QMAKE"), FALSE)) << endl;
+    t << "IDC		=	" << (project->isEmpty("QMAKE_IDC") ? QString("idc") :
+			      Option::fixPathToTargetOS(var("QMAKE_IDC"), FALSE)) << endl;
+    t << "IDL		=	" << (project->isEmpty("QMAKE_IDL") ? QString("midl") :
+			      Option::fixPathToTargetOS(var("QMAKE_IDL"), FALSE)) << endl;
+    t << "ZIP	=	" << var("QMAKE_ZIP") << endl;
+    t << "DEF_FILE =	" << varList("DEF_FILE") << endl;
+    t << "RES_FILE =	" << varList("RES_FILE") << endl;
+    t << "COPY_FILE  =       " << var("QMAKE_COPY") << endl;
+    t << "COPY_DIR  =       " << var("QMAKE_COPY") << endl;
+    t << "DEL_FILE   =       " << var("QMAKE_DEL_FILE") << endl;
+    t << "DEL_DIR    =       " << var("QMAKE_DEL_DIR") << endl;
+    t << "MOVE  =       " << var("QMAKE_MOVE") << endl;
+    t << "CHK_DIR_EXISTS =	" << var("QMAKE_CHK_DIR_EXISTS") << endl;
+    t << "MKDIR		=	" << var("QMAKE_MKDIR") << endl;
+    t << "INSTALL_FILE= " << var("QMAKE_INSTALL_FILE") << endl;
+    t << "INSTALL_DIR = " << var("QMAKE_INSTALL_DIR") << endl;
+    t << endl;
+
+    t << "####### Files" << endl << endl;
+    t << "HEADERS =	" << varList("HEADERS") << endl;
+    t << "SOURCES =	" << varList("SOURCES") << endl;
+    t << "OBJECTS =	" << varList("OBJECTS") << endl;
+    t << "FORMS =	" << varList("FORMS") << endl;
+    t << "UICDECLS =	" << varList("UICDECLS") << endl;
+    t << "UICIMPLS =	" << varList("UICIMPLS") << endl;
+    t << "SRCMOC	=	" << varList("SRCMOC") << endl;
+    t << "OBJMOC	=	" << varList("OBJMOC") << endl;
+
+    QString extraCompilerDeps;
+    if(!project->isEmpty("QMAKE_EXTRA_WIN_COMPILERS")) {
+	t << "OBJCOMP = " << varList("OBJCOMP") << endl;
+	extraCompilerDeps += " $(OBJCOMP) ";
+
+	QStringList &comps = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"];
+	for(QStringList::Iterator compit = comps.begin(); compit != comps.end(); ++compit) {
+	    QStringList &vars = project->variables()[(*compit) + ".variables"];
+	    for(QStringList::Iterator varit = vars.begin(); varit != vars.end(); ++varit) {
+		QStringList vals = project->variables()[(*varit)];
+		if(!vals.isEmpty())
+		    t << "QMAKE_COMP_" << (*varit) << " = " << valList(vals) << endl;
+	    }
+	}
+    }
+
+    t << "DIST	=	" << varList("DISTFILES") << endl;
+    t << "TARGET	=	"
+      << varGlue("TARGET",project->first("DESTDIR"),"",project->first("TARGET_EXT"))
+      << endl;
+    t << endl;
+
+    t << "####### Implicit rules" << endl << endl;
+    t << ".SUFFIXES: .c";
+    QStringList::Iterator cppit;
+    for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
+	t << " " << (*cppit);
+    t << endl << endl;
+    for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
+	t << (*cppit) << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl;
+    t << ".c" << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CC_IMP") << endl << endl;
+
+    t << "####### Build rules" << endl << endl;
+    t << "all: " << fileFixify(Option::output.name()) << " " << varGlue("ALL_DEPS"," "," "," ") << " $(TARGET)" << endl << endl;
+    t << "$(TARGET): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC) "
+      << extraCompilerDeps << var("POST_TARGETDEPS");
+    if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) {
+	t << "\n\t" << "$(LINK) @&&|" << "\n\t"
+	  << "$(LFLAGS) $(OBJECTS) $(OBJMOC),$(TARGET),,$(LIBS),$(DEF_FILE),$(RES_FILE)";
+    } else {
+	t << "\n\t-$(DEL_FILE) $(TARGET)"
+	  << "\n\t" << "$(LIB) $(TARGET) @&&|" << " \n+"
+	  << project->variables()["OBJECTS"].join(" \\\n+") << " \\\n+"
+	  << project->variables()["OBJMOC"].join(" \\\n+");
+    }
+    t << extraCompilerDeps;
+    t << endl << "|" << endl;
+
+    if ( !project->variables()["QMAKE_POST_LINK"].isEmpty() )
+	t << "\t" <<var("QMAKE_POST_LINK") << endl;
+
+    if(project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty()) {
+	QStringList dlldirs = project->variables()["DLLDESTDIR"];
+	for ( QStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) {
+	    t << "\n\t" << "-$(COPY_FILE) \"$(TARGET)\" " << *dlldir;
+	}
+    }
+    QString targetfilename = project->variables()["TARGET"].first();
+    if(project->isActiveConfig("activeqt")) {
+	QString version = project->variables()["VERSION"].first();
+	if ( version.isEmpty() )
+	    version = "1.0";
+
+	if ( project->isActiveConfig("dll")) {
+	    t << "\n\t" << ("-$(IDC) $(TARGET) /idl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version);
+	    t << "\n\t" << ("-$(IDL) /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb");
+	    t << "\n\t" << ("-$(IDC) $(TARGET) /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb");
+	    t << "\n\t" << ("-$(IDC) $(TARGET) /regserver" );
+	} else {
+	    t << "\n\t" << ("-$(TARGET) -dumpidl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version);
+	    t << "\n\t" << ("-$(IDL) /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb");
+	    t << "\n\t" << ("-$(IDC) $(TARGET) /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb");
+	    t << "\n\t" << ("-$(TARGET) -regserver");
+	}
+    }
+    t << endl << endl;
+
+    if(!project->variables()["RC_FILE"].isEmpty()) {
+	t << var("RES_FILE") << ": " << var("RC_FILE") << "\n\t"
+	  << var("QMAKE_RC") << " " << var("RC_FILE") << endl << endl;
+    }
+    t << "mocables: $(SRCMOC)" << endl
+      << "uicables: $(UICIMPLS) $(UICDECLS)" << endl << endl;
+
+    writeMakeQmake(t);
+
+    QStringList dist_files = Option::mkfile::project_files;
+    if(!project->isEmpty("QMAKE_INTERNAL_INCLUDED_FILES"))
+	dist_files += project->variables()["QMAKE_INTERNAL_INCLUDED_FILES"];
+    if(!project->isEmpty("TRANSLATIONS"))
+	dist_files << var("TRANSLATIONS");
+    if(!project->isEmpty("FORMS")) {
+	QStringList &forms = project->variables()["FORMS"];
+	for(QStringList::Iterator formit = forms.begin(); formit != forms.end(); ++formit) {
+	    QString ui_h = fileFixify((*formit) + Option::h_ext.first());
+	    if(QFile::exists(ui_h) )
+		dist_files << ui_h;
+	}
+    }
+    t << "dist:" << "\n\t"
+      << "$(ZIP) " << var("QMAKE_ORIG_TARGET") << ".zip " << "$(SOURCES) $(HEADERS) $(DIST) $(FORMS) "
+      << dist_files.join(" ") << " " << var("TRANSLATIONS") << " " << var("IMAGES") << endl << endl;
+
+    t << "uiclean:";
+    QString uiclean = varGlue("UICDECLS" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") + varGlue("UICIMPLS" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","");
+    if ( uiclean.isEmpty() ) {
+	// Borland make does not like an empty command section
+	uiclean = "\n\t@cd .";
+    }
+    t << uiclean << endl;
+
+    t << "mocclean:";
+    QString mocclean = varGlue("SRCMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") + varGlue("OBJMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","");
+    if ( mocclean.isEmpty() ) {
+	// Borland make does not like an empty command section
+	mocclean = "\n\t@cd .";
+    }
+    t << mocclean << endl;
+
+    t << "clean: uiclean mocclean"
+      << varGlue("OBJECTS","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","")
+      << varGlue("QMAKE_CLEAN","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","")
+      << varGlue("CLEAN_FILES","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","");
+    if ( project->isActiveConfig("activeqt")) {
+	t << ("\n\t-$(DEL_FILE) " + var("OBJECTS_DIR") + targetfilename + ".idl");
+	t << ("\n\t-$(DEL_FILE) " + var("OBJECTS_DIR") + targetfilename + ".tlb");
+    }
+    if(!project->isEmpty("IMAGES"))
+	t << varGlue("QMAKE_IMAGE_COLLECTION", "\n\t-$(DEL_FILE) ", "\n\t-$(DEL_FILE) ", "");
+    t << endl;
+
+    // user defined targets
+    QStringList::Iterator it;
+    QStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"];
+    for(it = qut.begin(); it != qut.end(); ++it) {
+	QString targ = var((*it) + ".target"),
+		 cmd = var((*it) + ".commands"), deps;
+	if(targ.isEmpty())
+	    targ = (*it);
+	QStringList &deplist = project->variables()[(*it) + ".depends"];
+	for(QStringList::Iterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) {
+	    QString dep = var((*dep_it) + ".target");
+	    if(dep.isEmpty())
+		dep = (*dep_it);
+	    deps += " " + dep;
+	}
+	if(!project->variables()["QMAKE_NOFORCE"].isEmpty() &&
+	   project->variables()[(*it) + ".CONFIG"].findIndex("phony") != -1)
+	    deps += QString(" ") + "FORCE";
+	t << "\n\n" << targ << ":" << deps << "\n\t"
+	  << cmd;
+    }
+
+    t << endl << endl;
+
+    QStringList &quc = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"];
+    for(it = quc.begin(); it != quc.end(); ++it) {
+	QString tmp_out = project->variables()[(*it) + ".output"].first();
+	QString tmp_cmd = project->variables()[(*it) + ".commands"].join(" ");
+	QString tmp_dep = project->variables()[(*it) + ".depends"].join(" ");
+	QStringList &vars = project->variables()[(*it) + ".variables"];
+	if(tmp_out.isEmpty() || tmp_cmd.isEmpty())
+	    continue;
+	QStringList &tmp = project->variables()[(*it) + ".input"];
+	for(QStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
+	    QStringList &inputs = project->variables()[(*it2)];
+	    for(QStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
+		QFileInfo fi(Option::fixPathToLocalOS((*input)));
+		QString in = Option::fixPathToTargetOS((*input), FALSE),
+		       out = tmp_out, cmd = tmp_cmd, deps;
+		out.replace("${QMAKE_FILE_BASE}", fi.baseName());
+		out.replace("${QMAKE_FILE_NAME}", fi.filePath());
+		cmd.replace("${QMAKE_FILE_BASE}", fi.baseName());
+		cmd.replace("${QMAKE_FILE_OUT}", out);
+		cmd.replace("${QMAKE_FILE_NAME}", fi.filePath());
+		for(QStringList::Iterator it3 = vars.begin(); it3 != vars.end(); ++it3)
+		    cmd.replace("$(" + (*it3) + ")", "$(QMAKE_COMP_" + (*it3)+")");
+		if(!tmp_dep.isEmpty()) {
+		    char buff[256];
+		    QString dep_cmd = tmp_dep;
+		    dep_cmd.replace("${QMAKE_FILE_NAME}", fi.filePath());
+		    if(FILE *proc = QT_POPEN(dep_cmd.latin1(), "r")) {
+			while(!feof(proc)) {
+			    int read_in = int(fread(buff, 1, 255, proc));
+			    if(!read_in)
+				break;
+			    int l = 0;
+			    for(int i = 0; i < read_in; i++) {
+				if(buff[i] == '\n' || buff[i] == ' ') {
+				    deps += " " + QCString(buff+l, (i - l) + 1);
+				    l = i;
+				}
+			    }
+			}
+			fclose(proc);
+		    }
+		}
+		t << out << ": " << in << deps << "\n\t"
+		  << cmd << endl << endl;
+	    }
+	}
+    }
+    t << endl;
+
+    t << "distclean: clean"
+      << "\n\t-$(DEL_FILE) $(TARGET)"
+      << endl << endl;
+}
+
+void
+BorlandMakefileGenerator::init()
+{
+    if(init_flag)
+	return;
+    init_flag = TRUE;
+
+    project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
+
+    /* this should probably not be here, but I'm using it to wrap the .t files */
+    if(project->first("TEMPLATE") == "app")
+	project->variables()["QMAKE_APP_FLAG"].append("1");
+    else if(project->first("TEMPLATE") == "lib")
+	project->variables()["QMAKE_LIB_FLAG"].append("1");
+    else if(project->first("TEMPLATE") == "subdirs") {
+	MakefileGenerator::init();
+	if(project->variables()["MAKEFILE"].isEmpty())
+	    project->variables()["MAKEFILE"].append("Makefile");
+	if(project->variables()["QMAKE"].isEmpty())
+	    project->variables()["QMAKE"].append("qmake");
+	return;
+    }
+
+    if(project->isEmpty("QMAKE_INSTALL_FILE"))
+	project->variables()["QMAKE_INSTALL_FILE"].append("$(COPY_FILE)");
+    if(project->isEmpty("QMAKE_INSTALL_DIR"))
+	project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)");
+
+    bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qtmt"QTDLL_POSTFIX);
+    QStringList &configs = project->variables()["CONFIG"];
+    if (project->isActiveConfig("shared"))
+	project->variables()["DEFINES"].append("QT_DLL");
+    if (project->isActiveConfig("qt_dll"))
+	if(configs.findIndex("qt") == -1) configs.append("qt");
+    if ( project->isActiveConfig("qtopia") ) {
+	if(configs.findIndex("qtopialib") == -1)
+	    configs.append("qtopialib");
+	if(configs.findIndex("qtopiainc") == -1)
+	    configs.append("qtopiainc");
+    }
+    if ( project->isActiveConfig("qt") ) {
+	if ( project->isActiveConfig("plugin") ) {
+	    project->variables()["CONFIG"].append("dll");
+	    project->variables()["DEFINES"].append("QT_PLUGIN");
+	}
+	if ( (project->variables()["DEFINES"].findIndex("QT_NODLL") == -1) &&
+	     ((project->variables()["DEFINES"].findIndex("QT_MAKEDLL") != -1 ||
+	       project->variables()["DEFINES"].findIndex("QT_DLL") != -1) ||
+	      (getenv("QT_DLL") && !getenv("QT_NODLL"))) ) {
+	    project->variables()["QMAKE_QT_DLL"].append("1");
+	    if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() )
+		project->variables()["CONFIG"].append("dll");
+	}
+    }
+    if ( project->isActiveConfig("dll") || !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) {
+	project->variables()["CONFIG"].remove("staticlib");
+	project->variables()["QMAKE_APP_OR_DLL"].append("1");
+    } else {
+	project->variables()["CONFIG"].append("staticlib");
+    }
+    if ( project->isActiveConfig("warn_off") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_OFF"];
+    } else if ( project->isActiveConfig("warn_on") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_ON"];
+    }
+    if(project->isActiveConfig("qt")) {
+	if ( project->isActiveConfig("thread") )
+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT");
+	if ( project->isActiveConfig("accessibility" ) )
+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT");
+	if ( project->isActiveConfig("tablet") )
+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_TABLET_SUPPORT");
+    }
+
+    if ( project->isActiveConfig("debug") ) {
+        if ( project->isActiveConfig("thread") ) {
+	    if ( project->isActiveConfig("dll") ) {
+		project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DLLDBG"];
+		project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DLLDBG"];
+	    } else {
+		project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DBG"];
+		project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DBG"];
+	    }
+        }
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_DEBUG"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_DEBUG"];
+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_DEBUG"];
+    } else {
+	if ( project->isActiveConfig("thread") ) {
+	    if ( project->isActiveConfig("dll") ) {
+		project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DLL"];
+		project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DLL"];
+	    } else {
+		project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT"];
+		project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT"];
+	    }
+	}
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RELEASE"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RELEASE"];
+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_RELEASE"];
+    }
+
+    if ( !project->variables()["QMAKE_INCDIR"].isEmpty()) {
+	project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR"];
+    }
+    if ( project->isActiveConfig("qt") || project->isActiveConfig("opengl") ) {
+	project->variables()["CONFIG"].append("windows");
+    }
+    if ( project->isActiveConfig("qtopiainc") )
+	project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QTOPIA"];
+    if ( project->isActiveConfig("qtopialib") ) {
+	if(!project->isEmpty("QMAKE_LIBDIR_QTOPIA"))
+	    project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QTOPIA"];
+	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QTOPIA"];
+    }
+    if ( project->isActiveConfig("qt") ) {
+	project->variables()["CONFIG"].append("moc");
+	project->variables()["INCLUDEPATH"] +=	project->variables()["QMAKE_INCDIR_QT"];
+	project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"];
+	if ( !project->isActiveConfig("debug") )
+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG");
+	if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) {
+	    if ( !project->variables()["QMAKE_QT_DLL"].isEmpty()) {
+		project->variables()["DEFINES"].append("QT_MAKEDLL");
+		project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_QT_DLL"];
+	    }
+	} else {
+	    if(project->isActiveConfig("thread"))
+		project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"];
+	    else
+		project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"];
+	    if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) {
+		int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt");
+		if ( hver == -1 )
+		    hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qtmt");
+		if(hver != -1) {
+		    QString ver;
+		    ver.sprintf("qt%s" QTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "mt" : ""), hver);
+		    QStringList &libs = project->variables()["QMAKE_LIBS"];
+		    for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit)
+			(*libit).replace(QRegExp("qt(mt)?\\.lib"), ver);
+		}
+	    }
+	    if ( project->isActiveConfig( "activeqt" ) ) {
+		project->variables().remove("QMAKE_LIBS_QT_ENTRY");
+		project->variables()["QMAKE_LIBS_QT_ENTRY"] = "qaxserver.lib";
+		if ( project->isActiveConfig( "dll" ) )
+		    project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"];
+	    }
+	    if ( !project->isActiveConfig("dll") && !project->isActiveConfig("plugin") ) {
+		project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"];
+	    }
+	}
+    }
+    if ( project->isActiveConfig("opengl") ) {
+	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"];
+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"];
+    }
+    if ( project->isActiveConfig("dll") ) {
+	project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE_DLL"];
+	project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE_DLL"];
+	project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE_DLL"];
+	project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS_DLL"];
+	if ( !project->variables()["QMAKE_LIB_FLAG"].isEmpty()) {
+	    project->variables()["TARGET_EXT"].append(
+		QStringList::split('.',project->first("VERSION")).join("") + ".dll");
+	} else {
+	    project->variables()["TARGET_EXT"].append(".dll");
+	}
+    } else {
+	project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE"];
+	project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE"];
+	project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE"];
+	project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS"];
+	if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty()) {
+	    project->variables()["TARGET_EXT"].append(".exe");
+	} else {
+	    project->variables()["TARGET_EXT"].append(".lib");
+	}
+    }
+    if ( project->isActiveConfig("windows") ) {
+	if ( project->isActiveConfig("console") ) {
+	    project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"];
+	    project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"];
+	    project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"];
+	    project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"];
+	} else {
+	    project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"];
+	}
+	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_WINDOWS"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"];
+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"];
+	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"];
+    }
+    if ( project->isActiveConfig("stl") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_ON"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_OFF"];
+    }
+    if ( project->isActiveConfig("exceptions") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_ON"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_OFF"];
+    }
+    if ( project->isActiveConfig("rtti") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_ON"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_OFF"];
+    }
+
+    if ( project->isActiveConfig("thread") ) {
+        project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_RTMT"];
+    } else {
+        project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_RT"];
+    }
+    if ( project->isActiveConfig("moc") ) {
+	setMocAware(TRUE);
+    }
+    project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
+    // Update -lname to name.lib, and -Ldir to
+    QStringList &libList = project->variables()["QMAKE_LIBS"];
+    for( QStringList::Iterator stIt = libList.begin(); stIt != libList.end(); ) {
+	QString s = *stIt;
+	if( s.startsWith( "-l" ) ) {
+	    stIt = libList.remove( stIt );
+	    stIt = libList.insert( stIt, s.mid( 2 ) + ".lib" );
+        } else if( s.startsWith( "-L" ) ) {
+	    stIt = libList.remove( stIt );
+	    project->variables()["QMAKE_LIBDIR"].append(QDir::convertSeparators(s.mid( 2 )));
+	} else {
+	    stIt++;
+	}
+    }
+    project->variables()["QMAKE_FILETAGS"] += QStringList::split(' ',
+	"HEADERS SOURCES DEF_FILE RC_FILE TARGET QMAKE_LIBS DESTDIR DLLDESTDIR INCLUDEPATH");
+    QStringList &l = project->variables()["QMAKE_FILETAGS"];
+    QStringList::Iterator it;
+    for(it = l.begin(); it != l.end(); ++it) {
+	QStringList &gdmf = project->variables()[(*it)];
+	for(QStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner)
+	    (*inner) = Option::fixPathToTargetOS((*inner), FALSE);
+    }
+
+    if ( !project->variables()["RC_FILE"].isEmpty()) {
+	if ( !project->variables()["RES_FILE"].isEmpty()) {
+	    fprintf(stderr, "Both .rc and .res file specified.\n");
+	    fprintf(stderr, "Please specify one of them, not both.");
+	    exit(666);
+	}
+	project->variables()["RES_FILE"] = project->variables()["RC_FILE"];
+	project->variables()["RES_FILE"].first().replace(".rc",".res");
+	project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"];
+	project->variables()["CLEAN_FILES"] += project->variables()["RES_FILE"];
+    }
+    MakefileGenerator::init();
+    if ( !project->variables()["VERSION"].isEmpty()) {
+	QStringList l = QStringList::split('.', project->first("VERSION"));
+	project->variables()["VER_MAJ"].append(l[0]);
+	project->variables()["VER_MIN"].append(l[1]);
+    }
+
+    if ( project->isActiveConfig("dll") || !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) {
+	// bcc does not generate a .tds file for static libs
+	QString tdsPostfix;
+	if ( !project->variables()["VERSION"].isEmpty() ) {
+	    tdsPostfix = QStringList::split( '.', project->first("VERSION") ).join("")
+		+ ".tds";
+	} else {
+	    tdsPostfix = ".tds";
+	}
+	project->variables()["QMAKE_CLEAN"].append(
+		project->first("DESTDIR") + project->first("TARGET") + tdsPostfix );
+    }
+
+    QStringList &quc = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"];
+    for(it = quc.begin(); it != quc.end(); ++it) {
+	QString tmp_out = project->variables()[(*it) + ".output"].first();
+	if(tmp_out.isEmpty())
+	    continue;
+	QStringList &tmp = project->variables()[(*it) + ".input"];
+	for(QStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
+	    QStringList &inputs = project->variables()[(*it2)];
+	    for(QStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
+		QFileInfo fi(Option::fixPathToLocalOS((*input)));
+		QString in = Option::fixPathToTargetOS((*input), FALSE),
+		    out = tmp_out;
+		out.replace("${QMAKE_FILE_BASE}", fi.baseName());
+		out.replace("${QMAKE_FILE_NAME}", fi.filePath());
+		if(project->variables()[(*it) + ".CONFIG"].findIndex("no_link") == -1)
+		    project->variables()["OBJCOMP"] += out;
+	    }
+	}
+    }
+}
diff --git a/qmake/generators/win32/borland_bmake.h b/qmake/generators/win32/borland_bmake.h
new file mode 100644
index 0000000..78ca7f2
--- /dev/null
+++ b/qmake/generators/win32/borland_bmake.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Definition of BorlandMakefileGenerator class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#ifndef __BORLAND_BMAKE_H__
+#define __BORLAND_BMAKE_H__
+
+#include "winmakefile.h"
+
+class BorlandMakefileGenerator : public Win32MakefileGenerator
+{
+    bool init_flag;
+    void writeBorlandParts(QTextStream &);
+
+    bool writeMakefile(QTextStream &);
+    void init();
+
+public:
+    BorlandMakefileGenerator(QMakeProject *p);
+    ~BorlandMakefileGenerator();
+};
+
+inline BorlandMakefileGenerator::~BorlandMakefileGenerator()
+{ }
+
+#endif /* __BORLAND_BMAKE_H__ */
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
new file mode 100644
index 0000000..b2060c5
--- /dev/null
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -0,0 +1,717 @@
+/****************************************************************************
+**
+** Implementation of MingwMakefileGenerator class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#include "mingw_make.h"
+#include "option.h"
+#include <qregexp.h>
+#include <qdir.h>
+#include <stdlib.h>
+#include <time.h>
+
+
+MingwMakefileGenerator::MingwMakefileGenerator(QMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE)
+{
+    Option::obj_ext = ".o";
+}
+
+bool
+MingwMakefileGenerator::findLibraries() // todo - pascal
+{
+    return TRUE;
+}
+
+bool
+MingwMakefileGenerator::writeMakefile(QTextStream &t)
+{
+    writeHeader(t);
+    if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
+	t << "all clean:" << "\n\t"
+	  << "@echo \"Some of the required modules ("
+	  << var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t"
+	  << "@echo \"Skipped.\"" << endl << endl;
+	writeMakeQmake(t);
+	return TRUE;
+    }
+
+    if(project->first("TEMPLATE") == "app" ||
+       project->first("TEMPLATE") == "lib") {
+	writeMingwParts(t);
+	return MakefileGenerator::writeMakefile(t);
+    }
+    else if(project->first("TEMPLATE") == "subdirs") {
+	writeSubDirs(t);
+	return TRUE;
+    }
+    return FALSE;
+ }
+
+void createLdObjectScriptFile(const QString & fileName, QStringList & objList)
+{
+    QString filePath = Option::output_dir + QDir::separator() + fileName;
+    QFile file(filePath);
+    if (file.open(IO_WriteOnly | IO_Translate )) {
+	QTextStream t(&file);
+	t << "INPUT(" << endl;
+	for (QStringList::Iterator it = objList.begin(); it != objList.end(); ++it ) {
+	    if (QDir::isRelativePath(*it))
+		t << "./" << *it << endl;
+	    else
+		t << *it << endl;
+	}
+	t << ");" << endl;
+	file.close();
+    }
+}
+
+void
+MingwMakefileGenerator::writeMingwParts(QTextStream &t)
+{
+    t << "####### Compiler, tools and options" << endl << endl;
+    t << "CC		=	" << var("QMAKE_CC") << endl;
+    t << "CXX		=	" << var("QMAKE_CXX") << endl;
+    t << "LEX		= " << var("QMAKE_LEX") << endl;
+    t << "YACC		= " << var("QMAKE_YACC") << endl;
+    t << "CFLAGS	=	" << var("QMAKE_CFLAGS") << " "
+      << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " "
+      <<  varGlue("DEFINES","-D"," -D","") << endl;
+    t << "CXXFLAGS	=	" << var("QMAKE_CXXFLAGS") << " "
+      << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " "
+      << varGlue("DEFINES","-D"," -D","") << endl;
+    t << "LEXFLAGS	=" << var("QMAKE_LEXFLAGS") << endl;
+    t << "YACCFLAGS	=" << var("QMAKE_YACCFLAGS") << endl;
+
+    t << "INCPATH	=	";
+    QStringList &incs = project->variables()["INCLUDEPATH"];
+    for(QStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) {
+	QString inc = (*incit);
+	inc.replace(QRegExp("\\\\$"), "");
+	inc.replace(QRegExp("\""), "");
+	t << " -I" << "\"" << inc << "\"";
+    }
+    t << " -I" << "\"" << specdir()  << "\"" << endl;
+    if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) {
+	t << "LINK	=	" << var("QMAKE_LINK") << endl;
+	t << "LFLAGS	=	" << var("QMAKE_LFLAGS") << endl;
+	t << "LIBS	=	";
+	if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() )
+	    t << varGlue("QMAKE_LIBDIR","-L\"","\" -L\"","\"") << " ";
+	t << var("QMAKE_LIBS").replace(QRegExp("(\\slib|^lib)")," -l") << endl;
+    }
+    else {
+	t << "LIB	=	" << var("QMAKE_LIB") << endl;
+    }
+    t << "MOC		=	" << (project->isEmpty("QMAKE_MOC") ? QString("moc") :
+			      Option::fixPathToTargetOS(var("QMAKE_MOC"), FALSE)) << endl;
+    t << "UIC		=	" << (project->isEmpty("QMAKE_UIC") ? QString("uic") :
+			      Option::fixPathToTargetOS(var("QMAKE_UIC"), FALSE)) << endl;
+    t << "QMAKE		=	" << (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") :
+			      Option::fixPathToTargetOS(var("QMAKE_QMAKE"), FALSE)) << endl;
+    t << "IDC		=	" << (project->isEmpty("QMAKE_IDC") ? QString("idc") :
+			      Option::fixPathToTargetOS(var("QMAKE_IDC"), FALSE)) << endl;
+    t << "IDL		=	" << (project->isEmpty("QMAKE_IDL") ? QString("midl") :
+			      Option::fixPathToTargetOS(var("QMAKE_IDL"), FALSE)) << endl;
+    t << "ZIP		=	" << var("QMAKE_ZIP") << endl;
+    t << "DEF_FILE      =	" << varList("DEF_FILE") << endl;
+    t << "COPY_FILE	=       " << var("QMAKE_COPY") << endl;
+    t << "COPY_DIR	=       " << var("QMAKE_COPY") << endl;
+    t << "DEL_FILE	=       " << var("QMAKE_DEL_FILE") << endl;
+    t << "DEL_DIR	=       " << var("QMAKE_DEL_DIR") << endl;
+    t << "MOVE		=       " << var("QMAKE_MOVE") << endl;
+    t << "CHK_DIR_EXISTS =	" << var("QMAKE_CHK_DIR_EXISTS") << endl;
+    t << "MKDIR		=	" << var("QMAKE_MKDIR") << endl;
+    t << "INSTALL_FILE= " << var("QMAKE_INSTALL_FILE") << endl;
+    t << "INSTALL_DIR = " << var("QMAKE_INSTALL_DIR") << endl;
+    t << endl;
+
+    t << "####### Output directory" << endl << endl;
+    if (! project->variables()["OBJECTS_DIR"].isEmpty())
+	t << "OBJECTS_DIR = " << var("OBJECTS_DIR").replace(QRegExp("\\\\$"),"") << endl;
+    else
+	t << "OBJECTS_DIR = . " << endl;
+    if (! project->variables()["MOC_DIR"].isEmpty())
+	t << "MOC_DIR = " << var("MOC_DIR").replace(QRegExp("\\\\$"),"") << endl;
+    else
+	t << "MOC_DIR = . " << endl;
+    t << endl;
+
+    t << "####### Files" << endl << endl;
+    t << "HEADERS =	" << varList("HEADERS") << endl;
+    t << "SOURCES =	" << varList("SOURCES") << endl;
+    QString objectsLinkLine;
+    if (!project->variables()["QMAKE_APP_OR_DLL"].isEmpty() &&
+	project->variables()["OBJECTS"].count() > var("QMAKE_LINK_OBJECT_MAX").toUInt()) {
+	createLdObjectScriptFile(var("QMAKE_LINK_OBJECT_SCRIPT"), project->variables()["OBJECTS"]);
+	objectsLinkLine = var("QMAKE_LINK_OBJECT_SCRIPT");
+    } else {
+	objectsLinkLine = "$(OBJECTS)";
+    }
+    t << "OBJECTS =	" << varList("OBJECTS") << endl;
+    t << "FORMS =	" << varList("FORMS") << endl;
+    t << "UICDECLS =	" << varList("UICDECLS") << endl;
+    t << "UICIMPLS =	" << varList("UICIMPLS") << endl;
+    t << "SRCMOC	=	" << varList("SRCMOC") << endl;
+    QString objmocLinkLine;
+    if (!project->variables()["QMAKE_APP_OR_DLL"].isEmpty() &&
+	project->variables()["OBJMOC"].count() > var("QMAKE_LINK_OBJECT_MAX").toUInt()) {
+	createLdObjectScriptFile(var("QMAKE_LINK_OBJMOC_SCRIPT"), project->variables()["OBJMOC"]);
+	objmocLinkLine = var("QMAKE_LINK_OBJMOC_SCRIPT");
+    } else {
+	objmocLinkLine = "$(OBJMOC)";
+    }
+    t << "OBJMOC	=	" << varList("OBJMOC") << endl;
+    QString extraCompilerDeps;
+    if(!project->isEmpty("QMAKE_EXTRA_WIN_COMPILERS")) {
+	t << "OBJCOMP = " << varList("OBJCOMP") << endl;
+	extraCompilerDeps += " $(OBJCOMP) ";
+
+	QStringList &comps = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"];
+	for(QStringList::Iterator compit = comps.begin(); compit != comps.end(); ++compit) {
+	    QStringList &vars = project->variables()[(*compit) + ".variables"];
+	    for(QStringList::Iterator varit = vars.begin(); varit != vars.end(); ++varit) {
+		QStringList vals = project->variables()[(*varit)];
+		if(!vals.isEmpty())
+		    t << "QMAKE_COMP_" << (*varit) << " = " << valList(vals) << endl;
+	    }
+	}
+    }
+
+    t << "DIST	=	" << varList("DISTFILES") << endl;
+    t << "TARGET	=	";
+    if( !project->variables()[ "DESTDIR" ].isEmpty() )
+	t << varGlue("TARGET",project->first("DESTDIR"),"",project->first("TARGET_EXT"));
+    else
+	t << project->variables()[ "TARGET" ].first() << project->variables()[ "TARGET_EXT" ].first();
+    t << endl;
+    t << endl;
+
+    t << "####### Implicit rules" << endl << endl;
+    t << ".SUFFIXES: .cpp .cxx .cc .C .c" << endl << endl;
+    t << ".cpp.o:\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl;
+    t << ".cxx.o:\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl;
+    t << ".cc.o:\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl;
+    t << ".c.o:\n\t" << var("QMAKE_RUN_CC_IMP") << endl << endl;
+
+    t << "####### Build rules" << endl << endl;
+    t << "all: " << "$(OBJECTS_DIR) " << "$(MOC_DIR) " << varGlue("ALL_DEPS",""," "," ") << "$(TARGET)" << endl << endl;
+    t << "$(TARGET): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC) "
+      << extraCompilerDeps << var("POST_TARGETDEPS");
+    if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) {
+	t << "\n\t" << "$(LINK) $(LFLAGS) -o $(TARGET) " << objectsLinkLine << " " << objmocLinkLine << " $(LIBS)";
+    } else {
+	t << "\n\t" << "$(LIB) $(TARGET) " << objectsLinkLine << " " << objmocLinkLine;
+    }
+    t << extraCompilerDeps;
+    if(project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty()) {
+	QStringList dlldirs = project->variables()["DLLDESTDIR"];
+	for ( QStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) {
+	    t << "\n\t" << "$(COPY_FILE) \"$(TARGET)\" " << *dlldir;
+	}
+    }
+    QString targetfilename = project->variables()["TARGET"].first();
+    if(project->isActiveConfig("activeqt")) {
+	QString version = project->variables()["VERSION"].first();
+	if ( version.isEmpty() )
+	    version = "1.0";
+
+	if ( project->isActiveConfig("dll")) {
+	    t << "\n\t" << ("-$(IDC) $(TARGET) /idl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version);
+	    t << "\n\t" << ("-$(IDL) /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb");
+	    t << "\n\t" << ("-$(IDC) $(TARGET) /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb");
+	    t << "\n\t" << ("-$(IDC) $(TARGET) /regserver" );
+	} else {
+	    t << "\n\t" << ("-$(TARGET) -dumpidl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version);
+	    t << "\n\t" << ("-$(IDL) /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb");
+	    t << "\n\t" << ("-$(IDC) $(TARGET) /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb");
+	    t << "\n\t" << "-$(TARGET) -regserver";
+	}
+    }
+    t << endl << endl;
+
+    if(!project->variables()["RC_FILE"].isEmpty()) {
+	t << var("RES_FILE") << ": " << var("RC_FILE") << "\n\t"
+	  << var("QMAKE_RC") << " -i " << var("RC_FILE") << " -o " << var("RC_FILE").replace(QRegExp("\\.rc"),".o") << " --include-dir=" << QFileInfo(var("RC_FILE")).dirPath() << endl << endl;
+    }
+	project->variables()["RES_FILE"].first().replace(QRegExp("\\.rc"),".o");
+
+    t << "mocables: $(SRCMOC)" << endl << endl;
+
+    t << "$(OBJECTS_DIR):" << "\n\t"
+      << "@if not exist $(OBJECTS_DIR) $(MKDIR) $(OBJECTS_DIR)" << endl << endl;
+
+    t << "$(MOC_DIR):" << "\n\t"
+      << "@if not exist $(MOC_DIR) $(MKDIR) $(MOC_DIR)" << endl << endl;
+
+    writeMakeQmake(t);
+
+    t << "dist:" << "\n\t"
+      << "$(ZIP) " << var("PROJECT") << ".zip "
+      << var("PROJECT") << ".pro $(SOURCES) $(HEADERS) $(DIST) $(FORMS)" << endl << endl;
+
+    t << "clean:"
+      << varGlue("OBJECTS","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","").replace(QRegExp("\\.obj"),".o")
+      << varGlue("SRCMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","")
+      << varGlue("OBJMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","").replace(QRegExp("\\.obj"),".o")
+      << varGlue("UICDECLS" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","")
+      << varGlue("UICIMPLS" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","")
+      << "\n\t-$(DEL_FILE) $(TARGET)"
+      << varGlue("QMAKE_CLEAN","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","")
+      << varGlue("CLEAN_FILES","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","");
+    if ( project->isActiveConfig("activeqt")) {
+	t << ("\n\t-$(DEL_FILE) " + var("OBJECTS_DIR") + targetfilename + ".idl");
+	t << ("\n\t-$(DEL_FILE) " + var("OBJECTS_DIR") + targetfilename + ".tlb");
+    }
+    if(!project->isEmpty("IMAGES"))
+	t << varGlue("QMAKE_IMAGE_COLLECTION", "\n\t-$(DEL_FILE) ", "\n\t-$(DEL_FILE) ", "");
+
+    // user defined targets
+    QStringList::Iterator it;
+    QStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"];
+
+    for(it = qut.begin(); it != qut.end(); ++it) {
+	QString targ = var((*it) + ".target"),
+		 cmd = var((*it) + ".commands"), deps;
+	if(targ.isEmpty())
+	    targ = (*it);
+	QStringList &deplist = project->variables()[(*it) + ".depends"];
+	for(QStringList::Iterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) {
+	    QString dep = var((*dep_it) + ".target");
+	    if(dep.isEmpty())
+		dep = (*dep_it);
+	    deps += " " + dep;
+	}
+	t << "\n\n" << targ << ":" << deps << "\n\t"
+	  << cmd;
+    }
+
+    t << endl << endl;
+
+    QStringList &quc = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"];
+    for(it = quc.begin(); it != quc.end(); ++it) {
+	QString tmp_out = project->variables()[(*it) + ".output"].first();
+	QString tmp_cmd = project->variables()[(*it) + ".commands"].join(" ");
+	QString tmp_dep = project->variables()[(*it) + ".depends"].join(" ");
+	QStringList &vars = project->variables()[(*it) + ".variables"];
+	if(tmp_out.isEmpty() || tmp_cmd.isEmpty())
+	    continue;
+	QStringList &tmp = project->variables()[(*it) + ".input"];
+	for(QStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
+	    QStringList &inputs = project->variables()[(*it2)];
+	    for(QStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
+		QFileInfo fi(Option::fixPathToLocalOS((*input)));
+		QString in = Option::fixPathToTargetOS((*input), FALSE),
+		       out = tmp_out, cmd = tmp_cmd, deps;
+		out.replace("${QMAKE_FILE_BASE}", fi.baseName());
+		out.replace("${QMAKE_FILE_NAME}", fi.filePath());
+		cmd.replace("${QMAKE_FILE_BASE}", fi.baseName());
+		cmd.replace("${QMAKE_FILE_OUT}", out);
+		cmd.replace("${QMAKE_FILE_NAME}", fi.filePath());
+		for(QStringList::Iterator it3 = vars.begin(); it3 != vars.end(); ++it3)
+		    cmd.replace("$(" + (*it3) + ")", "$(QMAKE_COMP_" + (*it3)+")");
+		if(!tmp_dep.isEmpty()) {
+		    char buff[256];
+		    QString dep_cmd = tmp_dep;
+		    dep_cmd.replace("${QMAKE_FILE_NAME}", fi.filePath());
+		    if(FILE *proc = QT_POPEN(dep_cmd.latin1(), "r")) {
+			while(!feof(proc)) {
+			    int read_in = int(fread(buff, 1, 255, proc));
+			    if(!read_in)
+				break;
+			    int l = 0;
+			    for(int i = 0; i < read_in; i++) {
+				if(buff[i] == '\n' || buff[i] == ' ') {
+				    deps += " " + QCString(buff+l, (i - l) + 1);
+				    l = i;
+				}
+			    }
+			}
+			fclose(proc);
+		    }
+		}
+		t << out << ": " << in << deps << "\n\t"
+		  << cmd << endl << endl;
+	    }
+	}
+    }
+    t << endl;
+}
+
+
+void
+MingwMakefileGenerator::init()
+{
+    if(init_flag)
+	return;
+    init_flag = TRUE;
+
+    /* this should probably not be here, but I'm using it to wrap the .t files */
+    if(project->first("TEMPLATE") == "app")
+	project->variables()["QMAKE_APP_FLAG"].append("1");
+    else if(project->first("TEMPLATE") == "lib")
+	project->variables()["QMAKE_LIB_FLAG"].append("1");
+    else if(project->first("TEMPLATE") == "subdirs") {
+	MakefileGenerator::init();
+	if(project->variables()["MAKEFILE"].isEmpty())
+	    project->variables()["MAKEFILE"].append("Makefile");
+	if(project->variables()["QMAKE"].isEmpty())
+	    project->variables()["QMAKE"].append("qmake");
+	return;
+    }
+
+    if(project->isEmpty("QMAKE_INSTALL_FILE"))
+	project->variables()["QMAKE_INSTALL_FILE"].append("$(COPY_FILE)");
+    if(project->isEmpty("QMAKE_INSTALL_DIR"))
+	project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)");
+
+    bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qt-mt"QTDLL_POSTFIX);
+    project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
+
+    // LIBS defined in Profile comes first for gcc
+    project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
+
+    QString targetfilename = project->variables()["TARGET"].first();
+    QStringList &configs = project->variables()["CONFIG"];
+
+    if (project->isActiveConfig("qt") && project->isActiveConfig("shared"))
+	project->variables()["DEFINES"].append("QT_DLL");
+
+    if (project->isActiveConfig("qt_dll"))
+	if (configs.findIndex("qt") == -1)
+	    configs.append("qt");
+
+    if ( project->isActiveConfig("qt") ) {
+	if ( project->isActiveConfig( "plugin" ) ) {
+	    project->variables()["CONFIG"].append("dll");
+	    if(project->isActiveConfig("qt"))
+		project->variables()["DEFINES"].append("QT_PLUGIN");
+	}
+	if ( (project->variables()["DEFINES"].findIndex("QT_NODLL") == -1) &&
+         ((project->variables()["DEFINES"].findIndex("QT_MAKEDLL") != -1 ||
+           project->variables()["DEFINES"].findIndex("QT_DLL") != -1) ||
+          (getenv("QT_DLL") && !getenv("QT_NODLL"))) ) {
+	    project->variables()["QMAKE_QT_DLL"].append("1");
+	    if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() )
+		project->variables()["CONFIG"].append("dll");
+	}
+	if ( project->isActiveConfig("thread") ) {
+            project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT");
+            project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_THREAD"];
+            project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_THREAD"];
+            project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_THREAD"];
+        }
+	if ( project->isActiveConfig("accessibility" ) )
+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT");
+	if ( project->isActiveConfig("tablet") )
+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_TABLET_SUPPORT");
+    }
+
+    if ( project->isActiveConfig("dll") || !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) {
+	project->variables()["CONFIG"].remove("staticlib");
+	project->variables()["QMAKE_APP_OR_DLL"].append("1");
+    } else {
+	project->variables()["CONFIG"].append("staticlib");
+    }
+
+    if ( project->isActiveConfig("warn_off") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_OFF"];
+    } else if ( project->isActiveConfig("warn_on") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_ON"];
+    }
+
+    if ( project->isActiveConfig("debug") ) {
+        if ( project->isActiveConfig("thread") ) {
+	    // use the DLL RT even here
+	    if ( project->variables()["DEFINES"].contains("QT_DLL") ) {
+		project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DLLDBG"];
+		project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DLLDBG"];
+	    } else {
+		project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DBG"];
+		project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DBG"];
+	    }
+	}
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_DEBUG"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_DEBUG"];
+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_DEBUG"];
+    } else {
+	if ( project->isActiveConfig("thread") ) {
+	    if ( project->variables()["DEFINES"].contains("QT_DLL") ) {
+		project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DLL"];
+		project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DLL"];
+	    } else {
+		project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT"];
+		project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT"];
+	    }
+	}
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RELEASE"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RELEASE"];
+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_RELEASE"];
+    }
+
+    if ( !project->variables()["QMAKE_INCDIR"].isEmpty())
+	project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR"];
+
+    if ( project->isActiveConfig("qt") || project->isActiveConfig("opengl") )
+	project->variables()["CONFIG"].append("windows");
+
+    if ( project->isActiveConfig("qt") ) {
+	project->variables()["CONFIG"].append("moc");
+	project->variables()["INCLUDEPATH"] +=	project->variables()["QMAKE_INCDIR_QT"];
+	project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"];
+	if ( !project->isActiveConfig("debug") )
+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG");
+	if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) {
+	    if ( !project->variables()["QMAKE_QT_DLL"].isEmpty()) {
+		project->variables()["DEFINES"].append("QT_MAKEDLL");
+		project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_QT_DLL"];
+	    }
+	} else {
+
+	    if(project->isActiveConfig("thread"))
+		project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"];
+	    else
+		project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"];
+	    if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) {
+		int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt");
+		if ( hver == -1 )
+		    hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt-mt");
+		if(hver != -1) {
+		    QString ver;
+		    ver.sprintf("-lqt%s" QTDLL_POSTFIX "%d", (project->isActiveConfig("thread") ? "-mt" : ""), hver);
+		    QStringList &libs = project->variables()["QMAKE_LIBS"];
+// @@@HGTODO maybe we must change the replace regexp if we understand what's going on
+		    for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit)
+			(*libit).replace(QRegExp("-lqt(-mt)?"), ver);
+		}
+	    }
+	    if ( project->isActiveConfig( "activeqt" ) ) {
+		project->variables().remove("QMAKE_LIBS_QT_ENTRY");
+		project->variables()["QMAKE_LIBS_QT_ENTRY"] = "-lqaxserver";
+		if ( project->isActiveConfig( "dll" ) ) {
+		   project->variables()["QMAKE_LIBS"]  += project->variables()["QMAKE_LIBS_QT_ENTRY"];
+		}
+	    }
+	    if ( !project->isActiveConfig("dll") && !project->isActiveConfig("plugin") ) {
+		project->variables()["QMAKE_LIBS"] +=project->variables()["QMAKE_LIBS_QT_ENTRY"];
+	    }
+
+            // QMAKE_LIBS_QT_ENTRY should be first on the link line as it needs qt
+            project->variables()["QMAKE_LIBS"].remove(project->variables()["QMAKE_LIBS_QT_ENTRY"].first());
+	    project->variables()["QMAKE_LIBS"].prepend(project->variables()["QMAKE_LIBS_QT_ENTRY"].first());
+
+	}
+    }
+
+    if ( project->isActiveConfig("opengl") ) {
+	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"];
+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"];
+    }
+
+    if ( project->isActiveConfig("dll") ) {
+	project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE_DLL"];
+	project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE_DLL"];
+	project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE_DLL"];
+	project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS_DLL"];
+	if ( !project->variables()["QMAKE_LIB_FLAG"].isEmpty()) {
+	    project->variables()["TARGET_EXT"].append(
+		QStringList::split('.',project->first("VERSION")).join("") + ".dll");
+	} else {
+	    project->variables()["TARGET_EXT"].append(".dll");
+	}
+    } else {
+	project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE"];
+	project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE"];
+	project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE"];
+	project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS"];
+	if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty()) {
+	    project->variables()["TARGET_EXT"].append(".exe");
+	} else {
+	    project->variables()["TARGET_EXT"].append(".a");
+	    project->variables()["QMAKE_LFLAGS"].append("-static");
+	    if(project->variables()["TARGET"].first().left(3) != "lib")
+		project->variables()["TARGET"].first().prepend("lib");
+	}
+    }
+
+    if ( project->isActiveConfig("windows") ) {
+	if ( project->isActiveConfig("console") ) {
+	    project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"];
+	    project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"];
+	    project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"];
+	    project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"];
+	} else {
+	    project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"];
+	}
+	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_WINDOWS"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"];
+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"];
+	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"];
+    }
+
+    if ( project->isActiveConfig("exceptions") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_ON"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_OFF"];
+    }
+
+    if ( project->isActiveConfig("rtti") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_ON"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_OFF"];
+    }
+
+    if ( project->isActiveConfig("moc") )
+	setMocAware(TRUE);
+
+    // add -L libs to libdir
+    QStringList &libs = project->variables()["QMAKE_LIBS"];
+    for ( QStringList::Iterator libit = libs.begin(); libit != libs.end();  ) {
+	if ( (*libit).startsWith( "-L" ) ) {
+	    project->variables()["QMAKE_LIBDIR"] += (*libit).mid(2);
+	    libit = libs.remove( libit );
+	} else {
+	    ++libit;
+	}
+    }
+
+    project->variables()["QMAKE_FILETAGS"] += QStringList::split(' ',
+	"HEADERS SOURCES DEF_FILE RC_FILE TARGET QMAKE_LIBS DESTDIR DLLDESTDIR INCLUDEPATH");
+    QStringList &l = project->variables()["QMAKE_FILETAGS"];
+    QStringList::Iterator it;
+    for(it = l.begin(); it != l.end(); ++it) {
+	QStringList &gdmf = project->variables()[(*it)];
+	for(QStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner)
+	    (*inner) = Option::fixPathToTargetOS((*inner), FALSE);
+    }
+
+    if ( project->isActiveConfig("dll") ) {
+		QString destDir = "";
+		if (!project->first("DESTDIR").isEmpty())
+			destDir = project->first("DESTDIR") + Option::dir_sep;
+		project->variables()["QMAKE_LFLAGS"].append(QString("-Wl,--out-implib,") +
+					  destDir + "lib" + project->first("TARGET") + ".a");
+    }
+
+    if ( !project->variables()["DEF_FILE"].isEmpty() )
+	project->variables()["QMAKE_LFLAGS"].append(QString("-Wl,") + project->first("DEF_FILE"));
+//    if(!project->isActiveConfig("incremental"))
+//	project->variables()["QMAKE_LFLAGS"].append(QString("/incremental:no"));
+
+#if 0
+    if ( !project->variables()["VERSION"].isEmpty() ) {
+	QString version = project->variables()["VERSION"][0];
+	int firstDot = version.find( "." );
+	QString major = version.left( firstDot );
+	QString minor = version.right( version.length() - firstDot - 1 );
+	minor.replace( ".", "" );
+	project->variables()["QMAKE_LFLAGS"].append( "/VERSION:" + major + "." + minor );
+    }
+#endif
+
+    if ( !project->variables()["RC_FILE"].isEmpty()) {
+	if ( !project->variables()["RES_FILE"].isEmpty()) {
+	    fprintf(stderr, "Both .rc and .res file specified.\n");
+	    fprintf(stderr, "Please specify one of them, not both.");
+	    exit(666);
+	}
+	project->variables()["RES_FILE"] = project->variables()["RC_FILE"];
+	project->variables()["RES_FILE"].first().replace(".rc",".o");
+	project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"];
+	project->variables()["CLEAN_FILES"] += project->variables()["RES_FILE"];
+    }
+
+    if ( !project->variables()["RES_FILE"].isEmpty())
+	project->variables()["QMAKE_LIBS"] += project->variables()["RES_FILE"];
+
+    MakefileGenerator::init();
+
+    if ( !project->variables()["VERSION"].isEmpty()) {
+	QStringList l = QStringList::split('.', project->first("VERSION"));
+	project->variables()["VER_MAJ"].append(l[0]);
+	project->variables()["VER_MIN"].append(l[1]);
+    }
+
+    if(project->isActiveConfig("dll")) {
+	project->variables()["QMAKE_CLEAN"].append(project->first("DESTDIR") +"lib" + project->first("TARGET") + ".a");
+    }
+
+    QStringList &quc = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"];
+    for(it = quc.begin(); it != quc.end(); ++it) {
+	QString tmp_out = project->variables()[(*it) + ".output"].first();
+	if(tmp_out.isEmpty())
+	    continue;
+	QStringList &tmp = project->variables()[(*it) + ".input"];
+	for(QStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
+	    QStringList &inputs = project->variables()[(*it2)];
+	    for(QStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
+		QFileInfo fi(Option::fixPathToLocalOS((*input)));
+		QString in = Option::fixPathToTargetOS((*input), FALSE),
+		       out = tmp_out;
+		out.replace("${QMAKE_FILE_BASE}", fi.baseName());
+		out.replace("${QMAKE_FILE_NAME}", fi.filePath());
+		if(project->variables()[(*it) + ".CONFIG"].findIndex("no_link") == -1)
+		    project->variables()["OBJCOMP"] += out;
+	    }
+	}
+    }
+}
+
+void
+MingwMakefileGenerator::writeSubDirs(QTextStream &t)
+{
+    QString qs ;
+    QTextStream ts (&qs, IO_WriteOnly) ;
+    Win32MakefileGenerator::writeSubDirs( ts ) ;
+    QRegExp rx("(\\n\\tcd [^\\n\\t]+)(\\n\\t.+)\\n\\t@cd ..") ;
+    rx.setMinimal(TRUE);
+    int pos = 0 ;
+    while ( -1 != (pos = rx.search( qs, pos)))
+    {
+	QString qsMatch = rx.cap(2);
+	qsMatch.replace("\n\t"," && \\\n\t");
+	qs.replace(pos+rx.cap(1).length(), rx.cap(2).length(), qsMatch );
+	pos += (rx.cap(1).length()+qsMatch.length());
+    }
+    t << qs ;
+}
diff --git a/qmake/generators/win32/mingw_make.h b/qmake/generators/win32/mingw_make.h
new file mode 100644
index 0000000..c881c66
--- /dev/null
+++ b/qmake/generators/win32/mingw_make.h
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Definition of MingwMakefileGenerator class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#ifndef __MINGW_MAKE_H__
+#define __MINGW_MAKE_H__
+
+#include "winmakefile.h"
+
+class MingwMakefileGenerator : public Win32MakefileGenerator
+{
+    bool init_flag;
+    void writeMingwParts(QTextStream &);
+    void writeSubDirs(QTextStream &t) ;
+
+    bool writeMakefile(QTextStream &);
+    void init();
+    
+    virtual bool findLibraries();
+
+public:
+    MingwMakefileGenerator(QMakeProject *p);
+    ~MingwMakefileGenerator();
+
+};
+
+inline MingwMakefileGenerator::~MingwMakefileGenerator()
+{ }
+
+#endif /* __MINGW_MAKE_H__ */
diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp
new file mode 100644
index 0000000..1d82224
--- /dev/null
+++ b/qmake/generators/win32/msvc_dsp.cpp
@@ -0,0 +1,1145 @@
+/****************************************************************************
+**
+** Implementation of DspMakefileGenerator class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#include "msvc_dsp.h"
+#include "option.h"
+#include <qdir.h>
+#include <qregexp.h>
+#include <stdlib.h>
+#include <time.h>
+
+DspMakefileGenerator::DspMakefileGenerator(QMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE)
+{
+
+}
+
+bool
+DspMakefileGenerator::writeMakefile(QTextStream &t)
+{
+    if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
+	/* for now just dump, I need to generated an empty dsp or something.. */
+	fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n",
+		var("QMAKE_FAILED_REQUIREMENTS").latin1());
+	return TRUE;
+    }
+
+    if(project->first("TEMPLATE") == "vcapp" ||
+       project->first("TEMPLATE") == "vclib") {
+	return writeDspParts(t);
+    }
+    else if(project->first("TEMPLATE") == "subdirs") {
+	writeHeader(t);
+	writeSubDirs(t);
+	return TRUE;
+    }
+    return FALSE;
+}
+
+bool
+DspMakefileGenerator::writeDspParts(QTextStream &t)
+{
+    QString dspfile;
+    if ( !project->variables()["DSP_TEMPLATE"].isEmpty() ) {
+	dspfile = project->first("DSP_TEMPLATE");
+    } else {
+	dspfile = project->first("MSVCDSP_TEMPLATE");
+    }
+    if (dspfile.startsWith("\"") && dspfile.endsWith("\""))
+	dspfile = dspfile.mid(1, dspfile.length() - 2);
+    QString dspfile_loc = findTemplate(dspfile);
+
+    QFile file(dspfile_loc);
+    if(!file.open(IO_ReadOnly)) {
+	fprintf(stderr, "Cannot open dsp file: %s\n", dspfile.latin1());
+	return FALSE;
+    }
+    QTextStream dsp(&file);
+
+    QString platform = "Win32";
+    if ( !project->variables()["QMAKE_PLATFORM"].isEmpty() )
+	platform = varGlue("QMAKE_PLATFORM", "", " ", "");
+
+    // Setup PCH variables
+    precompH = project->first("PRECOMPILED_HEADER");
+    QString namePCH = QFileInfo(precompH).fileName();
+    usePCH = !precompH.isEmpty() && project->isActiveConfig("precompile_header");
+    if (usePCH) {
+	// Created files
+	QString origTarget = project->first("QMAKE_ORIG_TARGET");
+	origTarget.replace(QRegExp("-"), "_");
+	precompObj = "\"$(IntDir)\\" + origTarget + Option::obj_ext + "\"";
+	precompPch = "\"$(IntDir)\\" + origTarget + ".pch\"";
+	// Add PRECOMPILED_HEADER to HEADERS
+	if (!project->variables()["HEADERS"].contains(precompH))
+	    project->variables()["HEADERS"] += precompH;
+	// Add precompile compiler options
+	project->variables()["PRECOMPILED_FLAGS_REL"]  = "/Yu\"" + namePCH + "\" /FI\"" + namePCH + "\" ";
+	project->variables()["PRECOMPILED_FLAGS_DEB"]  = "/Yu\"" + namePCH + "\" /FI\"" + namePCH + "\" ";
+	// Return to variable pool
+	project->variables()["PRECOMPILED_OBJECT"] = precompObj;
+	project->variables()["PRECOMPILED_PCH"]    = precompPch;
+    }
+    int rep;
+    QString line;
+    while ( !dsp.eof() ) {
+	line = dsp.readLine();
+	while((rep = line.find(QRegExp("\\$\\$[a-zA-Z0-9_-]*"))) != -1) {
+	    QString torep = line.mid(rep, line.find(QRegExp("[^\\$a-zA-Z0-9_-]"), rep) - rep);
+	    QString variable = torep.right(torep.length()-2);
+
+	    t << line.left(rep); //output the left side
+	    line = line.right(line.length() - (rep + torep.length())); //now past the variable
+	    if(variable == "MSVCDSP_SOURCES") {
+		if(project->variables()["SOURCES"].isEmpty())
+		    continue;
+
+		QString mocpath = var( "QMAKE_MOC" );
+		mocpath = mocpath.replace( QRegExp( "\\..*$" ), "" ) + " ";
+
+		QStringList list = project->variables()["SOURCES"] + project->variables()["DEF_FILE"];
+		if(!project->isActiveConfig("flat"))
+		    list.sort();
+		QStringList::Iterator it;
+		for( it = list.begin(); it != list.end(); ++it) {
+		    beginGroupForFile((*it), t);
+		    t << "# Begin Source File\n\nSOURCE=" << (*it) << endl;
+		    if (usePCH && (*it).endsWith(".c"))
+			t << "# SUBTRACT CPP /FI\"" << namePCH << "\" /Yu\"" << namePCH << "\" /Fp" << endl;
+		    if ( project->isActiveConfig("moc") && (*it).endsWith(Option::cpp_moc_ext)) {
+			QString base = (*it);
+			base.replace(QRegExp("\\..*$"), "").upper();
+			base.replace(QRegExp("[^a-zA-Z]"), "_");
+
+			QString build = "\n\n# Begin Custom Build - Moc'ing " + findMocSource((*it)) +
+					"...\n" "InputPath=.\\" + (*it) + "\n\n" "\"" + (*it) + "\""
+					" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n"
+					"\t" + mocpath + findMocSource((*it)) + " -o " +
+					(*it) + "\n\n" "# End Custom Build\n\n";
+
+			t << "USERDEP_" << base << "=\".\\" << findMocSource((*it)) << "\" \"$(QTDIR)\\bin\\moc.exe\"" << endl << endl;
+
+			t << "!IF  \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Release\"" << build
+			  << "!ELSEIF  \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Debug\""
+			  << build << "!ENDIF " << endl << endl;
+		    }
+		    t << "# End Source File" << endl;
+		}
+		endGroups(t);
+	    } else if(variable == "MSVCDSP_IMAGES") {
+		if(project->variables()["IMAGES"].isEmpty())
+		    continue;
+		t << "# Begin Source File\n\nSOURCE=" << project->first("QMAKE_IMAGE_COLLECTION") << endl;
+		t << "# End Source File" << endl;
+	    } else if(variable == "MSVCDSP_HEADERS") {
+		if(project->variables()["HEADERS"].isEmpty())
+		    continue;
+
+		QStringList list = project->variables()["HEADERS"];
+		if(!project->isActiveConfig("flat"))
+		    list.sort();
+		for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+//		    beginGroupForFile((*it), t);
+		    t << "# Begin Source File\n\nSOURCE=" << (*it) << endl << endl;
+		    QString compilePCH;
+		    QStringList customDependencies;
+		    QString createMOC;
+		    QString buildCmdsR, buildCmdsD;
+		    QString buildCmds = "\nBuildCmds= \\\n";
+		    // Create unique baseID
+		    QString base = (*it);
+		    {
+			base.replace(QRegExp("\\..*$"), "").upper();
+			base.replace(QRegExp("[^a-zA-Z]"), "_");
+		    }
+		    if (usePCH && precompH.endsWith(*it)) {
+			QString basicBuildCmd = QString("\tcl.exe /TP /W3 /FD /c /D \"WIN32\" /Yc /Fp\"%1\" /Fo\"%2\" %3 %4 %5 %6 %7 %8 %9 /D \"")
+							.arg(precompPch)
+							.arg(precompObj)
+							.arg(var("MSVCDSP_INCPATH"))
+							.arg(var("MSVCDSP_DEFINES"))
+							.arg(var("MSVCDSP_CXXFLAGS"));
+			buildCmdsR = basicBuildCmd
+					    .arg("/D \"NDEBUG\"")
+					    .arg(var("QMAKE_CXXFLAGS_RELEASE"))
+					    .arg(var("MSVCDSP_MTDEF"))
+					    .arg(var("MSVCDSP_RELDEFS"));
+			buildCmdsD = basicBuildCmd
+					    .arg("/D \"_DEBUG\" /Od")
+					    .arg(var("QMAKE_CXXFLAGS_DEBUG"))
+					    .arg(var("MSVCDSP_MTDEFD"))
+					    .arg(var("MSVCDSP_DEBUG_OPT"));
+			if (project->first("TEMPLATE") == "vcapp") {	// App
+			    buildCmdsR += var("MSVCDSP_WINCONDEF");
+			    buildCmdsD += var("MSVCDSP_WINCONDEF");
+			} else if (project->isActiveConfig("dll")) {	// Dll
+			    buildCmdsR += "_WINDOWS\" /D \"_USRDLL";
+			    buildCmdsD += "_WINDOWS\" /D \"_USRDLL";
+			} else {					// Lib
+			    buildCmdsR += "_LIB";
+			    buildCmdsD += "_LIB";
+			}
+			buildCmdsR += "\" /Fd\"$(IntDir)\\\\\" " + (*it) + " \\\n";
+			buildCmdsD += "\" /Fd\"$(IntDir)\\\\\" " + (*it) + " \\\n";
+
+			compilePCH = precompPch + " : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n   $(BuildCmds)\n\n";
+
+			QStringList &tmp = findDependencies(precompH);
+			if(!tmp.isEmpty()) // Got Deps for PCH
+			    customDependencies += tmp;
+		    }
+		    if (project->isActiveConfig("moc") && !findMocDestination((*it)).isEmpty()) {
+			QString mocpath = var( "QMAKE_MOC" );
+			mocpath = mocpath.replace( QRegExp( "\\..*$" ), "" ) + " ";
+			buildCmds += "\t" + mocpath + (*it)  + " -o " + findMocDestination((*it)) + " \\\n";
+			createMOC  = "\"" + findMocDestination((*it)) +	"\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n   $(BuildCmds)\n\n";
+			customDependencies += "\"$(QTDIR)\\bin\\moc.exe\"";
+		    }
+		    if (!createMOC.isEmpty() || !compilePCH.isEmpty()) {
+			bool doMOC = !createMOC.isEmpty();
+			bool doPCH = !compilePCH.isEmpty();
+			QString build = "\n\n# Begin Custom Build - "+ 
+					QString(doMOC?"Moc'ing ":"") +
+					QString((doMOC&&doPCH)?" and ":"") +
+					QString(doPCH?"Creating PCH cpp from ":"") +
+					(*it) + "...\nInputPath=.\\" + (*it) + "\n\n" +
+					buildCmds + "%1\n" +
+					createMOC + 
+					compilePCH +
+					"# End Custom Build\n\n";
+
+			t << "USERDEP_" << base << "=" << valGlue(customDependencies, "\"", "\" \"", "\"") << endl << endl;
+			t << "!IF  \"$(CFG)\" == \""     << var("MSVCDSP_PROJECT") << " - " << platform << " Release\"" << build.arg(buildCmdsR)
+			  << "!ELSEIF  \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Debug\""   << build.arg(buildCmdsD)
+			  << "!ENDIF " << endl << endl;
+		    }
+		    t << "# End Source File" << endl;
+		}
+//		endGroups(t);
+	    } else if(variable == "MSVCDSP_FORMSOURCES" || variable == "MSVCDSP_FORMHEADERS") {
+		if(project->variables()["FORMS"].isEmpty())
+		    continue;
+
+		QString uiSourcesDir;
+		QString uiHeadersDir;
+		if(!project->variables()["UI_DIR"].isEmpty()) {
+		    uiSourcesDir = project->first("UI_DIR");
+		    uiHeadersDir = project->first("UI_DIR");
+		} else {
+		    if ( !project->variables()["UI_SOURCES_DIR"].isEmpty() )
+			uiSourcesDir = project->first("UI_SOURCES_DIR");
+		    else
+			uiSourcesDir = "";
+		    if ( !project->variables()["UI_HEADERS_DIR"].isEmpty() )
+			uiHeadersDir = project->first("UI_HEADERS_DIR");
+		    else
+			uiHeadersDir = "";
+		}
+
+		QStringList list = project->variables()["FORMS"];
+		if(!project->isActiveConfig("flat"))
+		    list.sort();
+		QString ext = variable == "MSVCDSP_FORMSOURCES" ? ".cpp" : ".h";
+		for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+		    QString base = (*it);
+		    int dot = base.findRev(".");
+  		    base.replace( dot, base.length() - dot, ext );
+		    QString fname = base;
+
+		    int lbs = fname.findRev( "\\" );
+		    QString fpath;
+		    if ( lbs != -1 )
+			fpath = fname.left( lbs + 1 );
+		    fname = fname.right( fname.length() - lbs - 1 );
+
+		    if ( ext == ".cpp" && !uiSourcesDir.isEmpty() )
+			fname.prepend(uiSourcesDir);
+		    else if ( ext == ".h" && !uiHeadersDir.isEmpty() )
+			fname.prepend(uiHeadersDir);
+		    else
+			fname = base;
+//		    beginGroupForFile(fname, t);
+		    t << "# Begin Source File\n\nSOURCE=" << fname
+		      << "\n# End Source File" << endl;
+		}
+//		endGroups(t);
+	    } else if(variable == "MSVCDSP_TRANSLATIONS" ) {
+		if(project->variables()["TRANSLATIONS"].isEmpty())
+		    continue;
+
+		t << "# Begin Group \"Translations\"\n";
+		t << "# Prop Default_Filter \"ts\"\n";
+
+		QStringList list = project->variables()["TRANSLATIONS"];
+		if(!project->isActiveConfig("flat"))
+		    list.sort();
+		for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+		    QString sify = *it;
+		    sify.replace('/', '\\' );
+		    QString base = (*it);
+		    base.replace(QRegExp("\\..*$"), "").upper();
+		    base.replace(QRegExp("[^a-zA-Z]"), "_");
+
+//		    beginGroupForFile(sify, t);
+		    t << "# Begin Source File\n\nSOURCE=" << sify << endl;
+		    t << "\n# End Source File" << endl;
+		}
+//		endGroups(t);
+		t << "\n# End Group\n";
+	    } else if (variable == "MSVCDSP_MOCSOURCES" && project->isActiveConfig("moc")) {
+		if ( project->variables()["SRCMOC"].isEmpty())
+		    continue;
+
+		QString mocpath = var( "QMAKE_MOC" );
+		mocpath = mocpath.replace( QRegExp( "\\..*$" ), "" ) + " ";
+
+		QStringList list = project->variables()["SRCMOC"];
+		if(!project->isActiveConfig("flat"))
+		    list.sort();
+		for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+//		    beginGroupForFile((*it), t);
+		    t << "# Begin Source File\n\nSOURCE=" << (*it) << endl;
+		    if ( project->isActiveConfig("moc") && (*it).endsWith(Option::cpp_moc_ext)) {
+			QString base = (*it);
+			base.replace(QRegExp("\\..*$"), "").upper();
+			base.replace(QRegExp("[^a-zA-Z]"), "_");
+
+			QString build = "\n\n# Begin Custom Build - Moc'ing " + findMocSource((*it)) +
+					"...\n" "InputPath=.\\" + (*it) + "\n\n" "\"" + (*it) + "\""
+					" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n"
+					"\t" + mocpath + findMocSource((*it)) + " -o " +
+					(*it) + "\n\n" "# End Custom Build\n\n";
+
+			t << "USERDEP_" << base << "=\".\\" << findMocSource((*it)) << "\" \"$(QTDIR)\\bin\\moc.exe\"" << endl << endl;
+
+			t << "!IF  \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Release\"" << build
+			  << "!ELSEIF  \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Debug\""
+			  << build << "!ENDIF " << endl << endl;
+		    }
+		    t << "# End Source File" << endl;
+		}
+//		endGroups(t);
+	    } else if(variable == "MSVCDSP_PICTURES") {
+		if(project->variables()["IMAGES"].isEmpty())
+		    continue;
+
+		t << "# Begin Group \"Images\"\n"
+		  << "# Prop Default_Filter \"png jpeg bmp xpm\"\n";
+
+		QStringList list = project->variables()["IMAGES"];
+		if(!project->isActiveConfig("flat"))
+		    list.sort();
+		QStringList::Iterator it;
+
+		// dump the image list to a file UIC can read.
+		QFile f( "images.tmp" );
+		f.open( IO_WriteOnly );
+		QTextStream ts( &f );
+		for( it = list.begin(); it != list.end(); ++it )
+		    ts << " " << *it;
+		f.close();
+
+		// create an output step for images not more than once
+		bool imagesBuildDone = FALSE;
+		for( it = list.begin(); it != list.end(); ++it ) {
+//		    beginGroupForFile((*it), t);
+		    t << "# Begin Source File\n\nSOURCE=" << (*it) << endl;
+
+		    QString base = (*it);
+		    QString uicpath = var("QMAKE_UIC");
+		    uicpath = uicpath.replace(QRegExp("\\..*$"), "") + " ";
+
+		    if ( !imagesBuildDone ) {
+			imagesBuildDone = TRUE;
+			QString build = "\n\n# Begin Custom Build - Creating image collection...\n"
+			    "InputPath=.\\" + base + "\n\n";
+
+			build += "\"" + project->first("QMAKE_IMAGE_COLLECTION") + "\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n";
+			build += "\t" + uicpath + "-embed " + project->first("QMAKE_ORIG_TARGET") + " -f images.tmp -o "
+				      + project->first("QMAKE_IMAGE_COLLECTION") + "\n\n";
+			build.append("# End Custom Build\n\n");
+
+			t << "USERDEP_" << base << "=";
+			QStringList::Iterator it2 = list.begin();
+			while ( it2 != list.end() ) {
+			    t << "\"" << (*it2) << "\"";
+			    it2++;
+			    if ( it2 != list.end() )
+				t << "\\\n";
+			}
+			t << endl << endl;
+
+			t << "!IF  \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - Win32 Release\"" << build
+			  << "!ELSEIF  \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - Win32 Debug\"" << build
+			  << "!ENDIF \n\n" << endl;
+		    }
+
+		    t << "# End Source File" << endl;
+		}
+//		endGroups(t);
+		t << "\n# End Group\n";
+	    } else if(variable == "MSVCDSP_FORMS") {
+		if(project->variables()["FORMS"].isEmpty())
+		    continue;
+
+		t << "# Begin Group \"Forms\"\n"
+		  << "# Prop Default_Filter \"ui\"\n";
+
+		QString uicpath = var("QMAKE_UIC");
+		uicpath = uicpath.replace(QRegExp("\\..*$"), "") + " ";
+		QString mocpath = var( "QMAKE_MOC" );
+		mocpath = mocpath.replace( QRegExp( "\\..*$" ), "" ) + " ";
+
+		QStringList list = project->variables()["FORMS"];
+		if(!project->isActiveConfig("flat"))
+		    list.sort();
+		for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+		    QString base = (*it);
+//		    beginGroupForFile(base, t);
+		    t <<  "# Begin Source File\n\nSOURCE=" << base << endl;
+
+		    QString fname = base;
+		    fname.replace(".ui", "");
+		    int lbs = fname.findRev( "\\" );
+		    QString fpath;
+		    if ( lbs != -1 )
+			fpath = fname.left( lbs + 1 );
+		    fname = fname.right( fname.length() - lbs - 1 );
+
+		    QString mocFile;
+		    if(!project->variables()["MOC_DIR"].isEmpty())
+			mocFile = project->first("MOC_DIR");
+		    else
+			mocFile = fpath;
+
+		    QString uiSourcesDir;
+		    QString uiHeadersDir;
+		    if(!project->variables()["UI_DIR"].isEmpty()) {
+			uiSourcesDir = project->first("UI_DIR");
+			uiHeadersDir = project->first("UI_DIR");
+		    } else {
+			if ( !project->variables()["UI_SOURCES_DIR"].isEmpty() )
+			    uiSourcesDir = project->first("UI_SOURCES_DIR");
+			else
+			    uiSourcesDir = fpath;
+			if ( !project->variables()["UI_HEADERS_DIR"].isEmpty() )
+			    uiHeadersDir = project->first("UI_HEADERS_DIR");
+			else
+			    uiHeadersDir = fpath;
+		    }
+
+		    t << "USERDEP_" << base << "=\"$(QTDIR)\\bin\\moc.exe\" \"$(QTDIR)\\bin\\uic.exe\"" << endl << endl;
+
+		    QString build = "\n\n# Begin Custom Build - Uic'ing " + base + "...\n"
+			"InputPath=.\\" + base + "\n\n" "BuildCmds= \\\n\t" + uicpath + base +
+				    " -o " + uiHeadersDir + fname + ".h \\\n" "\t" + uicpath  + base +
+				    " -i " + fname + ".h -o " + uiSourcesDir + fname + ".cpp \\\n"
+				    "\t" + mocpath + " " + uiHeadersDir +
+				    fname + ".h -o " + mocFile + Option::h_moc_mod + fname + Option::h_moc_ext + " \\\n";
+
+		    build.append("\n\"" + uiHeadersDir + fname + ".h\" : \"$(SOURCE)\" \"$(INTDIR)\" \"$(OUTDIR)\""  "\n"
+				 "\t$(BuildCmds)\n\n"
+				 "\"" + uiSourcesDir + fname + ".cpp\" : \"$(SOURCE)\" \"$(INTDIR)\" \"$(OUTDIR)\"" "\n"
+				 "\t$(BuildCmds)\n\n"
+				 "\"" + mocFile + Option::h_moc_mod + fname + Option::h_moc_ext + "\" : \"$(SOURCE)\" \"$(INTDIR)\" \"$(OUTDIR)\"" "\n"
+				 "\t$(BuildCmds)\n\n");
+
+		    build.append("# End Custom Build\n\n");
+
+		    t << "!IF  \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Release\"" << build
+		      << "!ELSEIF  \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Debug\"" << build
+		      << "!ENDIF \n\n" << "# End Source File" << endl;
+		}
+//		endGroups(t);
+		t << "\n# End Group\n";
+	    } else if(variable == "MSVCDSP_LEXSOURCES") {
+		if(project->variables()["LEXSOURCES"].isEmpty())
+		    continue;
+
+		t << "# Begin Group \"Lexables\"\n"
+		  << "# Prop Default_Filter \"l\"\n";
+
+		QString lexpath = var("QMAKE_LEX") + varGlue("QMAKE_LEXFLAGS", " ", " ", "") + " ";
+
+		QStringList list = project->variables()["LEXSOURCES"];
+		if(!project->isActiveConfig("flat"))
+		    list.sort();
+		for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+		    QString fname = (*it);
+//		    beginGroupForFile(fname, t);
+		    t <<  "# Begin Source File\n\nSOURCE=" << fname << endl;
+		    fname.replace(".l", Option::lex_mod + Option::cpp_ext.first());
+
+		    QString build = "\n\n# Begin Custom Build - Lex'ing " + (*it) + "...\n"
+			"InputPath=.\\" + (*it) + "\n\n"
+				    "\"" + fname + "\" : \"$(SOURCE)\" \"$(INTDIR)\" \"$(OUTDIR)\"" "\n"
+				    "\t" + lexpath + (*it) + "\\\n"
+				    "\tdel " + fname + "\\\n"
+				    "\tcopy lex.yy.c " + fname + "\n\n" +
+				    "# End Custom Build\n\n";
+		    t << "!IF  \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Release\"" << build
+		      << "!ELSEIF  \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Debug\"" << build
+		      << "!ENDIF \n\n" << build
+
+		      << "# End Source File" << endl;
+		}
+//		endGroups(t);
+		t << "\n# End Group\n";
+	    } else if(variable == "MSVCDSP_YACCSOURCES") {
+		if(project->variables()["YACCSOURCES"].isEmpty())
+		    continue;
+
+		t << "# Begin Group \"Yaccables\"\n"
+		  << "# Prop Default_Filter \"y\"\n";
+
+		QString yaccpath = var("QMAKE_YACC") + varGlue("QMAKE_YACCFLAGS", " ", " ", "") + " ";
+
+		QStringList list = project->variables()["YACCSOURCES"];
+		if(!project->isActiveConfig("flat"))
+		    list.sort();
+		for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+		    QString fname = (*it);
+//		    beginGroupForFile(fname, t);
+		    t <<  "# Begin Source File\n\nSOURCE=" << fname << endl;
+		    fname.replace(".y", Option::yacc_mod);
+
+		    QString build = "\n\n# Begin Custom Build - Yacc'ing " + (*it) + "...\n"
+			"InputPath=.\\" + (*it) + "\n\n"
+				    "\"" + fname + Option::cpp_ext.first() + "\" : \"$(SOURCE)\" \"$(INTDIR)\" \"$(OUTDIR)\"" "\n"
+				    "\t" + yaccpath + (*it) + "\\\n"
+				    "\tdel " + fname + Option::h_ext.first() + "\\\n"
+				    "\tmove y.tab.h " + fname + Option::h_ext.first() + "\n\n" +
+				    "\tdel " + fname + Option::cpp_ext.first() + "\\\n"
+				    "\tmove y.tab.c " + fname + Option::cpp_ext.first() + "\n\n" +
+				    "# End Custom Build\n\n";
+
+		    t << "!IF  \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Release\"" << build
+		      << "!ELSEIF  \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Debug\"" << build
+		      << "!ENDIF \n\n"
+		      << "# End Source File" << endl;
+		}
+//		endGroups(t);
+		t << "\n# End Group\n";
+	    } else if( variable == "MSVCDSP_CONFIGMODE" ) {
+		if( project->isActiveConfig( "debug" ) )
+		    t << "Debug";
+		else
+		    t << "Release";
+	    } else if( variable == "MSVCDSP_IDLSOURCES" ) {
+		QStringList list = project->variables()["MSVCDSP_IDLSOURCES"];
+		if(!project->isActiveConfig("flat"))
+		    list.sort();
+		for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+		    t << "# Begin Source File" << endl << endl;
+		    t << "SOURCE=" << (*it) << endl;
+		    t << "# PROP Exclude_From_Build 1" << endl;
+		    t << "# End Source File" << endl << endl;
+		}
+	    }
+	    else
+		t << var(variable);
+	}
+	t << line << endl;
+    }
+    t << endl;
+    file.close();
+    return TRUE;
+}
+
+
+
+void
+DspMakefileGenerator::init()
+{
+    if(init_flag)
+	return;
+    QStringList::Iterator it;
+    init_flag = TRUE;
+
+    const bool thread = project->isActiveConfig("thread");
+
+    if ( project->isActiveConfig("stl") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_ON"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_OFF"];
+    }
+    if ( project->isActiveConfig("exceptions") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_ON"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_OFF"];
+    }
+    if ( project->isActiveConfig("rtti") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_ON"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_OFF"];
+    }
+
+    
+    /* this should probably not be here, but I'm using it to wrap the .t files */
+    if(project->first("TEMPLATE") == "vcapp" )
+	project->variables()["QMAKE_APP_FLAG"].append("1");
+    else if(project->first("TEMPLATE") == "vclib")
+	project->variables()["QMAKE_LIB_FLAG"].append("1");
+    if ( project->variables()["QMAKESPEC"].isEmpty() )
+	project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") );
+
+    bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qt-mt"QTDLL_POSTFIX);
+    project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
+
+    QStringList &configs = project->variables()["CONFIG"];
+    if (project->isActiveConfig("shared"))
+	project->variables()["DEFINES"].append("QT_DLL");
+    if (project->isActiveConfig("qt_dll"))
+	if(configs.findIndex("qt") == -1) configs.append("qt");
+    if ( project->isActiveConfig("qtopia") ) {
+	if(configs.findIndex("qtopialib") == -1)
+	    configs.append("qtopialib");
+	if(configs.findIndex("qtopiainc") == -1)
+	    configs.append("qtopiainc");
+    }
+    if ( project->isActiveConfig("qt") ) {
+	if ( project->isActiveConfig( "plugin" ) ) {
+	    project->variables()["CONFIG"].append("dll");
+	    project->variables()["DEFINES"].append("QT_PLUGIN");
+	}
+	if ( (project->variables()["DEFINES"].findIndex("QT_NODLL") == -1) &&
+	     ((project->variables()["DEFINES"].findIndex("QT_MAKEDLL") != -1 ||
+	       project->variables()["DEFINES"].findIndex("QT_DLL") != -1) ||
+	      (getenv("QT_DLL") && !getenv("QT_NODLL"))) ) {
+	    project->variables()["QMAKE_QT_DLL"].append("1");
+	    if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() )
+		project->variables()["CONFIG"].append("dll");
+	}
+    }
+    if ( project->isActiveConfig("dll") || !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) {
+	project->variables()["CONFIG"].remove("staticlib");
+	project->variables()["QMAKE_APP_OR_DLL"].append("1");
+    } else {
+	project->variables()["CONFIG"].append("staticlib");
+    }
+
+    if ( project->isActiveConfig("qt") || project->isActiveConfig("opengl") ) {
+	project->variables()["CONFIG"].append("windows");
+    }
+    if ( !project->variables()["VERSION"].isEmpty() ) {
+	QString version = project->variables()["VERSION"][0];
+	int firstDot = version.find( "." );
+	QString major = version.left( firstDot );
+	QString minor = version.right( version.length() - firstDot - 1 );
+	minor.replace( ".", "" );
+	project->variables()["MSVCDSP_VERSION"].append( "/VERSION:" + major + "." + minor );
+    }
+
+    if ( project->isActiveConfig("qtopiainc") )
+	project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QTOPIA"];
+    if ( project->isActiveConfig("qtopialib") ) {
+	if(!project->isEmpty("QMAKE_LIBDIR_QTOPIA"))
+	    project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QTOPIA"];
+	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QTOPIA"];
+    }
+
+    if ( project->isActiveConfig("qt") ) {
+	project->variables()["CONFIG"].append("moc");
+	project->variables()["INCLUDEPATH"] +=	project->variables()["QMAKE_INCDIR_QT"];
+	project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"];
+
+	if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) {
+	    if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) {
+		project->variables()["DEFINES"].append("QT_MAKEDLL");
+		project->variables()["QMAKE_LFLAGS"].append("/base:\"0x39D00000\"");
+	    }
+	} else {
+	    if( thread )
+		project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"];
+	    else
+		project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"];
+	    if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) {
+		int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt");
+		if ( hver == -1 )
+		    hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt-mt");
+		if(hver != -1) {
+		    QString ver;
+		    ver.sprintf("qt%s" QTDLL_POSTFIX "%d.lib", (thread ? "-mt" : ""), hver);
+		    QStringList &libs = project->variables()["QMAKE_LIBS"];
+		    for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit)
+			(*libit).replace(QRegExp("qt(-mt)?\\.lib"), ver);
+		}
+	    }
+	    if ( project->isActiveConfig( "activeqt" ) ) {
+		project->variables().remove("QMAKE_LIBS_QT_ENTRY");
+		project->variables()["QMAKE_LIBS_QT_ENTRY"] = "qaxserver.lib";
+		if ( project->isActiveConfig( "dll" ) )
+		    project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"];
+	    }
+	    if ( !project->isActiveConfig("dll") && !project->isActiveConfig("plugin") ) {
+		project->variables()["QMAKE_LIBS"] +=project->variables()["QMAKE_LIBS_QT_ENTRY"];
+	    }
+	}
+    }
+
+    if ( project->isActiveConfig("debug") ) {
+	if ( !project->first("OBJECTS_DIR").isEmpty() )
+	    project->variables()["MSVCDSP_OBJECTSDIRDEB"] = project->first("OBJECTS_DIR");
+	else
+	    project->variables()["MSVCDSP_OBJECTSDIRDEB"] = "Debug";
+	project->variables()["MSVCDSP_OBJECTSDIRREL"] = "Release";
+	if ( !project->first("DESTDIR").isEmpty() )
+	    project->variables()["MSVCDSP_TARGETDIRDEB"] = project->first("DESTDIR");
+	else
+	    project->variables()["MSVCDSP_TARGETDIRDEB"] = "Debug";
+	project->variables()["MSVCDSP_TARGETDIRREL"] = "Release";
+    } else {
+	if ( !project->first("OBJECTS_DIR").isEmpty() )
+	    project->variables()["MSVCDSP_OBJECTSDIRREL"] = project->first("OBJECTS_DIR");
+	else
+	    project->variables()["MSVCDSP_OBJECTSDIRREL"] = "Release";
+	project->variables()["MSVCDSP_OBJECTSDIRDEB"] = "Debug";
+	if ( !project->first("DESTDIR").isEmpty() )
+	    project->variables()["MSVCDSP_TARGETDIRREL"] = project->first("DESTDIR");
+	else
+	    project->variables()["MSVCDSP_TARGETDIRREL"] = "Release";
+	project->variables()["MSVCDSP_TARGETDIRDEB"] = "Debug";
+    }
+
+    if ( project->isActiveConfig("opengl") ) {
+	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"];
+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"];
+    }
+    if ( thread ) {
+	if(project->isActiveConfig("qt"))
+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT" );
+        if ( project->isActiveConfig("dll") || project->first("TARGET") == "qtmain"
+	     || !project->variables()["QMAKE_QT_DLL"].isEmpty() ) {
+	    project->variables()["MSVCDSP_MTDEFD"] += project->variables()["QMAKE_CXXFLAGS_MT_DLLDBG"];
+	    project->variables()["MSVCDSP_MTDEF"] += project->variables()["QMAKE_CXXFLAGS_MT_DLL"];
+	} else {
+	    // YES we want to use the DLL even in a static build
+	    project->variables()["MSVCDSP_MTDEFD"] += project->variables()["QMAKE_CXXFLAGS_MT_DBG"];
+	    project->variables()["MSVCDSP_MTDEF"] += project->variables()["QMAKE_CXXFLAGS_MT"];
+	}
+	if ( !project->variables()["DEFINES"].contains("QT_DLL") && is_qt
+	     && project->first("TARGET") != "qtmain" )
+	    project->variables()["QMAKE_LFLAGS"].append("/NODEFAULTLIB:\"libc\"");
+    }
+
+    if(project->isActiveConfig("qt")) {
+	if ( project->isActiveConfig("accessibility" ) )
+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT");
+	if ( project->isActiveConfig("tablet") )
+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_TABLET_SUPPORT");
+    }
+    if ( project->isActiveConfig("dll") ) {
+	project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE_DLL"];
+	project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE_DLL"];
+	project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE_DLL"];
+	project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS_DLL"];
+	if ( !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) {
+	    QString ver_xyz(project->first("VERSION"));
+	    ver_xyz.replace(".", "");
+	    project->variables()["TARGET_EXT"].append(ver_xyz + ".dll");
+	} else {
+	    project->variables()["TARGET_EXT"].append(".dll");
+	}
+    } else {
+	project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE"];
+	project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE"];
+	project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE"];
+	project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS"];
+	if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty() )
+	    project->variables()["TARGET_EXT"].append(".exe");
+	else
+	    project->variables()["TARGET_EXT"].append(".lib");
+    }
+
+    if ( project->isActiveConfig("windows") ) {
+	if ( project->isActiveConfig("console") ) {
+	    project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"];
+	    project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"];
+	    project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"];
+	    project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"];
+	} else {
+	    project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"];
+	}
+	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_WINDOWS"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"];
+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"];
+	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"];
+    }
+
+    project->variables()["MSVCDSP_VER"] = "6.00";
+    project->variables()["MSVCDSP_DEBUG_OPT"] = "/GZ /ZI";
+
+    if(!project->isActiveConfig("incremental")) {
+	project->variables()["QMAKE_LFLAGS"].append(QString("/incremental:no"));
+        if ( is_qt )
+	    project->variables()["MSVCDSP_DEBUG_OPT"] = "/GZ /Zi";
+    }
+
+    QString msvcdsp_project;
+    if ( project->variables()["TARGET"].count() )
+	msvcdsp_project = project->variables()["TARGET"].first();
+
+    QString targetfilename = project->variables()["TARGET"].first();
+    project->variables()["TARGET"].first() += project->first("TARGET_EXT");
+    if ( project->isActiveConfig("moc") )
+	setMocAware(TRUE);
+
+    project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
+    project->variables()["QMAKE_FILETAGS"] += QStringList::split(' ',
+								 "HEADERS SOURCES DEF_FILE RC_FILE TARGET QMAKE_LIBS DESTDIR DLLDESTDIR INCLUDEPATH");
+    QStringList &l = project->variables()["QMAKE_FILETAGS"];
+    for(it = l.begin(); it != l.end(); ++it) {
+	QStringList &gdmf = project->variables()[(*it)];
+	for(QStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner)
+	    (*inner) = Option::fixPathToTargetOS((*inner), FALSE);
+    }
+
+    MakefileGenerator::init();
+    if ( msvcdsp_project.isEmpty() )
+	msvcdsp_project = Option::output.name();
+
+    msvcdsp_project = msvcdsp_project.right( msvcdsp_project.length() - msvcdsp_project.findRev( "\\" ) - 1 );
+    msvcdsp_project = msvcdsp_project.left( msvcdsp_project.findRev( "." ) );
+    msvcdsp_project.replace("-", "");
+
+    project->variables()["MSVCDSP_PROJECT"].append(msvcdsp_project);
+    QStringList &proj = project->variables()["MSVCDSP_PROJECT"];
+
+    for(it = proj.begin(); it != proj.end(); ++it)
+	(*it).replace(QRegExp("\\.[a-zA-Z0-9_]*$"), "");
+
+    if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) {
+	project->variables()["MSVCDSP_TEMPLATE"].append("win32app" + project->first( "DSP_EXTENSION" ) );
+	if ( project->isActiveConfig("console") ) {
+	    project->variables()["MSVCDSP_CONSOLE"].append("Console");
+	    project->variables()["MSVCDSP_WINCONDEF"].append("_CONSOLE");
+	    project->variables()["MSVCDSP_DSPTYPE"].append("0x0103");
+	} else {
+	    project->variables()["MSVCDSP_CONSOLE"].clear();
+	    project->variables()["MSVCDSP_WINCONDEF"].append("_WINDOWS");
+	    project->variables()["MSVCDSP_DSPTYPE"].append("0x0101");
+	}
+    } else {
+        if ( project->isActiveConfig("dll") ) {
+            project->variables()["MSVCDSP_TEMPLATE"].append("win32dll" + project->first( "DSP_EXTENSION" ) );
+        } else {
+            project->variables()["MSVCDSP_TEMPLATE"].append("win32lib" + project->first( "DSP_EXTENSION" ) );
+        }
+    }
+
+    project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_WINDOWS"];
+ 
+    processPrlFiles();
+
+     // Update -lname to name.lib,
+    QStringList &libList = project->variables()["QMAKE_LIBS"];
+    for( QStringList::Iterator stIt = libList.begin(); stIt != libList.end(); ) {
+	QString s = *stIt;
+	if( s.startsWith( "-l" ) ) {
+	    stIt = libList.remove( stIt );
+	    stIt = libList.insert( stIt, s.mid( 2 ) + ".lib" );
+        } else if( s.startsWith( "-L" ) ) {
+	    stIt = libList.remove( stIt );
+	    project->variables()["QMAKE_LIBDIR"].append(QDir::convertSeparators(s.mid( 2 )));
+	} else {
+	    stIt++;
+	}
+    }
+    
+    project->variables()["MSVCDSP_LFLAGS" ] += project->variables()["QMAKE_LFLAGS"];
+    if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() )
+	project->variables()["MSVCDSP_LFLAGS" ].append(varGlue("QMAKE_LIBDIR","/LIBPATH:\"","\" /LIBPATH:\"","\""));
+    project->variables()["MSVCDSP_CXXFLAGS" ] += project->variables()["QMAKE_CXXFLAGS"];
+    project->variables()["MSVCDSP_DEFINES"].append(varGlue("DEFINES","/D ","" " /D ",""));
+    project->variables()["MSVCDSP_DEFINES"].append(varGlue("PRL_EXPORT_DEFINES","/D ","" " /D ",""));
+
+    if (!project->variables()["RES_FILE"].isEmpty())
+	project->variables()["QMAKE_LIBS"] += project->variables()["RES_FILE"];
+
+    QStringList &libs = project->variables()["QMAKE_LIBS"];
+    for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) {
+	QString lib = (*libit);
+	lib.replace(QRegExp("\""), "");
+	project->variables()["MSVCDSP_LIBS"].append(" \"" + lib + "\"");
+    }
+
+    QStringList &incs = project->variables()["INCLUDEPATH"];
+    for(QStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) {
+	QString inc = (*incit);
+	inc.replace("\"", "");
+	if(inc.endsWith("\\")) // Remove trailing \'s from paths
+	    inc.truncate(inc.length()-1);
+	if (inc.startsWith("\"") && inc.endsWith("\""))
+	    inc = inc.mid(1, inc.length() - 2);
+	project->variables()["MSVCDSP_INCPATH"].append("/I \"" + inc + "\"");
+    }
+
+    project->variables()["MSVCDSP_INCPATH"].append("/I \"" + specdir() + "\"");
+    if ( project->isActiveConfig("qt") ) {
+	project->variables()["MSVCDSP_RELDEFS"].append("/D \"QT_NO_DEBUG\"");
+    } else {
+	project->variables()["MSVCDSP_RELDEFS"].clear();
+    }
+
+    QString dest;
+    QString postLinkStep;
+    QString copyDllStep;
+    QString activeQtStepPreCopyDll;
+    QString activeQtStepPostCopyDll;
+    QString activeQtStepPreCopyDllDebug;
+    QString activeQtStepPostCopyDllDebug;
+    QString activeQtStepPreCopyDllRelease;
+    QString activeQtStepPostCopyDllRelease;
+
+    if ( !project->variables()["QMAKE_POST_LINK"].isEmpty() )
+	postLinkStep += var("QMAKE_POST_LINK");
+
+    if ( !project->variables()["DESTDIR"].isEmpty() ) {
+	project->variables()["TARGET"].first().prepend(project->first("DESTDIR"));
+	Option::fixPathToTargetOS(project->first("TARGET"));
+	dest = project->first("TARGET");
+        if ( project->first("TARGET").startsWith("$(QTDIR)") )
+	    dest.replace( "$(QTDIR)", getenv("QTDIR") );
+	project->variables()["MSVCDSP_TARGET"].append(
+	    QString("/out:\"") + dest + "\"");
+	if ( project->isActiveConfig("dll") ) {
+	    QString imp = dest;
+	    imp.replace(".dll", ".lib");
+	    project->variables()["MSVCDSP_TARGET"].append(QString(" /implib:\"") + imp + "\"");
+	}
+    }
+    if ( project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty() ) {
+	QStringList dlldirs = project->variables()["DLLDESTDIR"];
+	if ( dlldirs.count() )
+	    copyDllStep += "\t";
+	for ( QStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) {
+	    copyDllStep += "copy \"$(TargetPath)\" \"" + *dlldir + "\"\t";
+	}
+    }
+
+    if ( project->isActiveConfig("activeqt") ) {
+	QString idl = project->variables()["QMAKE_IDL"].first();
+	QString idc = project->variables()["QMAKE_IDC"].first();
+	QString version = project->variables()["VERSION"].first();
+	if ( version.isEmpty() )
+	    version = "1.0";
+	project->variables()["MSVCDSP_IDLSOURCES"].append( var("OBJECTS_DIR") + targetfilename + ".idl" );
+	if ( project->isActiveConfig( "dll" ) ) {
+	    activeQtStepPreCopyDll += 
+			     "\t" + idc + " %1 -idl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version +
+			     "\t" + idl + " /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb" +
+			     "\t" + idc + " %2 /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb";
+	    activeQtStepPostCopyDll +=
+			     "\t" + idc + " %1 /regserver\n";
+
+	    QString executable = project->variables()["MSVCDSP_TARGETDIRREL"].first() + "\\" + targetfilename + ".dll";
+	    activeQtStepPreCopyDllRelease = activeQtStepPreCopyDll.arg(executable).arg(executable);
+	    activeQtStepPostCopyDllRelease = activeQtStepPostCopyDll.arg(executable);
+
+	    executable = project->variables()["MSVCDSP_TARGETDIRDEB"].first() + "\\" + targetfilename + ".dll";
+	    activeQtStepPreCopyDllDebug = activeQtStepPreCopyDll.arg(executable).arg(executable);
+	    activeQtStepPostCopyDllDebug = activeQtStepPostCopyDll.arg(executable);
+	} else {
+	    activeQtStepPreCopyDll += 
+			     "\t%1 -dumpidl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version +
+			     "\t" + idl + " /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb" +
+			     "\t" + idc + " %2 /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb";
+	    activeQtStepPostCopyDll +=
+			     "\t%1 -regserver\n";
+	    QString executable = project->variables()["MSVCDSP_TARGETDIRREL"].first() + "\\" + targetfilename + ".exe";
+	    activeQtStepPreCopyDllRelease = activeQtStepPreCopyDll.arg(executable).arg(executable);
+	    activeQtStepPostCopyDllRelease = activeQtStepPostCopyDll.arg(executable);
+
+	    executable = project->variables()["MSVCDSP_TARGETDIRDEB"].first() + "\\" + targetfilename + ".exe";
+	    activeQtStepPreCopyDllDebug = activeQtStepPreCopyDll.arg(executable).arg(executable);
+	    activeQtStepPostCopyDllDebug = activeQtStepPostCopyDll.arg(executable);
+	}
+
+    }
+
+    
+    if ( !postLinkStep.isEmpty() || !copyDllStep.isEmpty() || !activeQtStepPreCopyDllDebug.isEmpty() || !activeQtStepPreCopyDllRelease.isEmpty() ) {
+	project->variables()["MSVCDSP_POST_LINK_DBG"].append(
+	    "# Begin Special Build Tool\n"
+	    "SOURCE=$(InputPath)\n"
+	    "PostBuild_Desc=Post Build Step\n"
+	    "PostBuild_Cmds=" + postLinkStep + activeQtStepPreCopyDllDebug + copyDllStep + activeQtStepPostCopyDllDebug + "\n"
+	    "# End Special Build Tool\n" );
+	project->variables()["MSVCDSP_POST_LINK_REL"].append(
+	    "# Begin Special Build Tool\n"
+	    "SOURCE=$(InputPath)\n"
+	    "PostBuild_Desc=Post Build Step\n"
+	    "PostBuild_Cmds=" + postLinkStep + activeQtStepPreCopyDllRelease + copyDllStep + activeQtStepPostCopyDllRelease + "\n"
+	    "# End Special Build Tool\n" );
+    }
+
+    if ( !project->variables()["SOURCES"].isEmpty() || !project->variables()["RC_FILE"].isEmpty() ) {
+	project->variables()["SOURCES"] += project->variables()["RC_FILE"];
+    }
+    QStringList &list = project->variables()["FORMS"];
+    for( it = list.begin(); it != list.end(); ++it ) {
+	if ( QFile::exists( *it + ".h" ) )
+	    project->variables()["SOURCES"].append( *it + ".h" );
+    }
+    project->variables()["QMAKE_INTERNAL_PRL_LIBS"] << "MSVCDSP_LIBS"; 
+}
+
+
+QString
+DspMakefileGenerator::findTemplate(const QString &file)
+{
+    QString ret;
+    if(!QFile::exists((ret = file)) &&
+       !QFile::exists((ret = QString(Option::mkfile::qmakespec + "/" + file))) &&
+       !QFile::exists((ret = QString(getenv("QTDIR")) + "/mkspecs/win32-msvc/" + file)) &&
+       !QFile::exists((ret = (QString(getenv("HOME")) + "/.tmake/" + file))))
+	return "";
+    return ret;
+}
+
+
+void
+DspMakefileGenerator::processPrlVariable(const QString &var, const QStringList &l)
+{
+    if(var == "QMAKE_PRL_DEFINES") {
+	QStringList &out = project->variables()["MSVCDSP_DEFINES"];
+	for(QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
+	    if(out.findIndex((*it)) == -1)
+		out.append((" /D \"" + *it + "\""));
+	}
+    } else {
+	MakefileGenerator::processPrlVariable(var, l);
+    }
+}
+
+
+void
+DspMakefileGenerator::beginGroupForFile(QString file, QTextStream &t,
+					const QString& filter)
+{
+    if(project->isActiveConfig("flat"))
+	return;
+    fileFixify(file, QDir::currentDirPath(), QDir::currentDirPath(), TRUE);
+    file = file.section(Option::dir_sep, 0, -2);
+    if(file.right(Option::dir_sep.length()) != Option::dir_sep)
+	file += Option::dir_sep;
+    if(file == currentGroup)
+	return;
+
+    if(file.isEmpty() || !QDir::isRelativePath(file)) {
+	endGroups(t);
+	return;
+    }
+    
+    QString tempFile = file;
+    if(tempFile.startsWith(currentGroup))
+	tempFile = tempFile.mid(currentGroup.length());
+    int dirSep = currentGroup.findRev( Option::dir_sep );
+
+    while( !tempFile.startsWith( currentGroup ) && dirSep != -1 ) {
+	currentGroup.truncate( dirSep );
+	dirSep = currentGroup.findRev( Option::dir_sep );
+	if ( !tempFile.startsWith( currentGroup ) && dirSep != -1 )
+	    t << "\n# End Group\n";
+    }
+    if ( !file.startsWith( currentGroup ) ) {
+	t << "\n# End Group\n";
+	currentGroup = "";
+    }
+
+    QStringList dirs = QStringList::split(Option::dir_sep, file.right( file.length() - currentGroup.length() ) );
+    for(QStringList::Iterator dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) {
+	t << "# Begin Group \"" << (*dir_it) << "\"\n"
+	    << "# Prop Default_Filter \"" << filter << "\"\n";
+    }
+    currentGroup = file;
+}
+
+
+void
+DspMakefileGenerator::endGroups(QTextStream &t)
+{
+    if(project->isActiveConfig("flat"))
+	return;
+    else if(currentGroup.isEmpty())
+	return;
+
+    QStringList dirs = QStringList::split(Option::dir_sep, currentGroup);
+    for(QStringList::Iterator dir_it = dirs.end(); dir_it != dirs.begin(); --dir_it) {
+	t << "\n# End Group\n";
+    }
+    currentGroup = "";
+}
+
+bool
+DspMakefileGenerator::openOutput(QFile &file) const
+{
+    QString outdir;
+    if(!file.name().isEmpty()) {
+	if(QDir::isRelativePath(file.name()))
+	    file.setName(Option::output_dir + file.name()); //pwd when qmake was run
+	QFileInfo fi(file);
+	if(fi.isDir())
+	    outdir = file.name() + QDir::separator();
+    }
+    if(!outdir.isEmpty() || file.name().isEmpty())
+	file.setName(outdir + project->first("TARGET") + project->first("DSP_EXTENSION"));
+    if(QDir::isRelativePath(file.name())) {
+	QString ofile;
+	ofile = file.name();
+	int slashfind = ofile.findRev('\\');
+	if (slashfind == -1) {
+	    ofile = ofile.replace(QRegExp("-"), "_");
+	} else {
+	    int hypenfind = ofile.find('-', slashfind);
+	    while (hypenfind != -1 && slashfind < hypenfind) {
+		ofile = ofile.replace(hypenfind, 1, "_");
+		hypenfind = ofile.find('-', hypenfind + 1);
+	    }
+	}
+	file.setName(Option::fixPathToLocalOS(QDir::currentDirPath() + Option::dir_sep + ofile));
+    }
+    return Win32MakefileGenerator::openOutput(file);
+}
diff --git a/qmake/generators/win32/msvc_dsp.h b/qmake/generators/win32/msvc_dsp.h
new file mode 100644
index 0000000..76fc07a
--- /dev/null
+++ b/qmake/generators/win32/msvc_dsp.h
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Definition of DspMakefileGenerator class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#ifndef __MSVC_DSP_H__
+#define __MSVC_DSP_H__
+
+#include "winmakefile.h"
+#include <qvaluestack.h>
+
+class DspMakefileGenerator : public Win32MakefileGenerator
+{
+    QString currentGroup;
+    void beginGroupForFile(QString file, QTextStream &, const QString& filter="");
+    void endGroups(QTextStream &);
+
+    bool init_flag;
+    bool writeDspParts(QTextStream &);
+
+    bool writeMakefile(QTextStream &);
+    QString findTemplate(const QString &file);
+    void init();
+
+public:
+    DspMakefileGenerator(QMakeProject *p);
+    ~DspMakefileGenerator();
+
+    bool openOutput(QFile &file) const;
+
+protected:
+    virtual void processPrlVariable(const QString &, const QStringList &);
+    virtual bool findLibraries();
+
+    QString precompH, 
+	    precompObj, precompPch;
+    bool usePCH;
+};
+
+inline DspMakefileGenerator::~DspMakefileGenerator()
+{ }
+
+inline bool DspMakefileGenerator::findLibraries()
+{ return Win32MakefileGenerator::findLibraries("MSVCDSP_LIBS"); }
+
+#endif /* __MSVC_DSP_H__ */
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
new file mode 100644
index 0000000..c5ffd44
--- /dev/null
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -0,0 +1,792 @@
+/****************************************************************************
+**
+** Implementation of NmakeMakefileGenerator class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#include "msvc_nmake.h"
+#include "option.h"
+#include <qregexp.h>
+#include <qdict.h>
+#include <qdir.h>
+#include <stdlib.h>
+#include <time.h>
+
+NmakeMakefileGenerator::NmakeMakefileGenerator(QMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE)
+{
+
+}
+
+bool
+NmakeMakefileGenerator::writeMakefile(QTextStream &t)
+{
+    writeHeader(t);
+    if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
+	{ //write the extra unix targets..
+	    QStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"];
+	    for(QStringList::ConstIterator it = qut.begin(); it != qut.end(); ++it)
+		t << *it << " ";
+	}
+	t << "all clean:" << "\n\t"
+	  << "@echo \"Some of the required modules ("
+	  << var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t"
+	  << "@echo \"Skipped.\"" << endl << endl;
+	writeMakeQmake(t);
+	return TRUE;
+    }
+
+    if(project->first("TEMPLATE") == "app" ||
+       project->first("TEMPLATE") == "lib") {
+	writeNmakeParts(t);
+	return MakefileGenerator::writeMakefile(t);
+    }
+    else if(project->first("TEMPLATE") == "subdirs") {
+	writeSubDirs(t);
+	return TRUE;
+    }
+    return FALSE;
+}
+
+QStringList
+&NmakeMakefileGenerator::findDependencies(const QString &file)
+{
+    QStringList &aList = MakefileGenerator::findDependencies(file);
+    // Note: The QMAKE_IMAGE_COLLECTION file have all images
+    // as dependency, so don't add precompiled header then
+    if (file == project->first("QMAKE_IMAGE_COLLECTION"))
+	return aList;
+    for(QStringList::Iterator it = Option::cpp_ext.begin(); it != Option::cpp_ext.end(); ++it) {
+	if(file.endsWith(*it)) {
+            if(!precompObj.isEmpty() && !aList.contains(precompObj))
+                aList += precompObj;
+	    break;
+	}
+    }
+    return aList;
+}
+
+void
+NmakeMakefileGenerator::writeNmakeParts(QTextStream &t)
+{
+    t << "####### Compiler, tools and options" << endl << endl;
+    t << "CC		=	" << var("QMAKE_CC") << endl;
+    t << "CXX		=	" << var("QMAKE_CXX") << endl;
+    t << "LEX		= " << var("QMAKE_LEX") << endl;
+    t << "YACC		= " << var("QMAKE_YACC") << endl;
+    t << "CFLAGS	=	" << var("QMAKE_CFLAGS") << " "
+      << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " "
+      <<  varGlue("DEFINES","-D"," -D","") << endl;
+    t << "CXXFLAGS	=	" << var("QMAKE_CXXFLAGS") << " "
+      << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " "
+      << varGlue("DEFINES","-D"," -D","") << endl;
+    t << "LEXFLAGS	=" << var("QMAKE_LEXFLAGS") << endl;
+    t << "YACCFLAGS	=" << var("QMAKE_YACCFLAGS") << endl;
+
+    t << "INCPATH	=	";
+    QStringList &incs = project->variables()["INCLUDEPATH"];
+    for(QStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) {
+	QString inc = (*incit);
+	if (inc.endsWith("\\"))
+	    inc.truncate(inc.length()-1);
+	if (inc.startsWith("\"") && inc.endsWith("\""))
+	    inc = inc.mid(1, inc.length() - 2);
+	t << " -I\"" << inc << "\"";
+    }
+    t << " -I\"" << specdir() << "\""
+      << endl;
+    if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) {
+	t << "LINK	=	" << var("QMAKE_LINK") << endl;
+	t << "LFLAGS	=	" << var("QMAKE_LFLAGS");
+	if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() )
+	  t << " " << varGlue("QMAKE_LIBDIR","/LIBPATH:\"","\" /LIBPATH:\"","\"");
+	t << endl;
+	t << "LIBS	=	";
+	QStringList &libs = project->variables()["QMAKE_LIBS"];
+	for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) {
+	    QString lib = (*libit);
+	    if (lib.endsWith("\\"))
+		lib.truncate(lib.length()-1);
+	    t << " \"" << lib << "\"";
+	}
+	t << endl;
+    }
+    else {
+	t << "LIB	=	" << var("QMAKE_LIB") << endl;
+    }
+    t << "MOC		=	" << (project->isEmpty("QMAKE_MOC") ? QString("moc") :
+			      Option::fixPathToTargetOS(var("QMAKE_MOC"), FALSE)) << endl;
+    t << "UIC		=	" << (project->isEmpty("QMAKE_UIC") ? QString("uic") :
+			      Option::fixPathToTargetOS(var("QMAKE_UIC"), FALSE)) << endl;
+    t << "QMAKE		=	" << (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") :
+			      Option::fixPathToTargetOS(var("QMAKE_QMAKE"), FALSE)) << endl;
+    t << "IDC		=	" << (project->isEmpty("QMAKE_IDC") ? QString("idc") :
+			      Option::fixPathToTargetOS(var("QMAKE_IDC"), FALSE)) << endl;
+    t << "IDL		=	" << (project->isEmpty("QMAKE_IDL") ? QString("midl") :
+			      Option::fixPathToTargetOS(var("QMAKE_IDL"), FALSE)) << endl;
+    t << "ZIP		=	" << var("QMAKE_ZIP") << endl;
+    t << "COPY_FILE	=       " << var("QMAKE_COPY") << endl;
+    t << "COPY_DIR	=       " << var("QMAKE_COPY") << endl;
+    t << "DEL_FILE	=       " << var("QMAKE_DEL_FILE") << endl;
+    t << "DEL_DIR	=       " << var("QMAKE_DEL_DIR") << endl;
+    t << "MOVE		=       " << var("QMAKE_MOVE") << endl;
+    t << "CHK_DIR_EXISTS =	" << var("QMAKE_CHK_DIR_EXISTS") << endl;
+    t << "MKDIR		=	" << var("QMAKE_MKDIR") << endl;
+    t << "INSTALL_FILE= " << var("QMAKE_INSTALL_FILE") << endl;
+    t << "INSTALL_DIR = " << var("QMAKE_INSTALL_DIR") << endl;
+    t << endl;
+
+    t << "####### Files" << endl << endl;
+    t << "HEADERS =	" << varList("HEADERS") << endl;
+    t << "SOURCES =	" << varList("SOURCES") << endl;
+    t << "OBJECTS =	" << varList("OBJECTS") << endl;
+    t << "FORMS =	" << varList("FORMS") << endl;
+    t << "UICDECLS =	" << varList("UICDECLS") << endl;
+    t << "UICIMPLS =	" << varList("UICIMPLS") << endl;
+    t << "SRCMOC	=	" << varList("SRCMOC") << endl;
+    t << "OBJMOC	=	" << varList("OBJMOC") << endl;
+
+    QString extraCompilerDeps;
+    if(!project->isEmpty("QMAKE_EXTRA_WIN_COMPILERS")) {
+	t << "OBJCOMP = " << varList("OBJCOMP") << endl;
+	extraCompilerDeps += " $(OBJCOMP) ";
+
+	QStringList &comps = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"];
+	for(QStringList::Iterator compit = comps.begin(); compit != comps.end(); ++compit) {
+	    QStringList &vars = project->variables()[(*compit) + ".variables"];
+	    for(QStringList::Iterator varit = vars.begin(); varit != vars.end(); ++varit) {
+		QStringList vals = project->variables()[(*varit)];
+		if(!vals.isEmpty())
+		    t << "QMAKE_COMP_" << (*varit) << " = " << valList(vals) << endl;
+	    }
+	}
+    }
+
+    t << "DIST	=	" << varList("DISTFILES") << endl;
+    t << "TARGET	=	";
+    if( !project->variables()[ "DESTDIR" ].isEmpty() )
+	t << varGlue("TARGET",project->first("DESTDIR"),"",project->first("TARGET_EXT"));
+    else
+	t << project->variables()[ "TARGET" ].first() << project->variables()[ "TARGET_EXT" ].first();
+    t << endl;
+    t << endl;
+
+    t << "####### Implicit rules" << endl << endl;
+    t << ".SUFFIXES: .c";
+    QStringList::Iterator cppit;
+    for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
+	t << " " << (*cppit);
+    t << endl << endl;
+
+    if(!project->isActiveConfig("no_batch")) {
+	// Batchmode doesn't use the non implicit rules QMAKE_RUN_CXX & QMAKE_RUN_CC
+	project->variables().remove("QMAKE_RUN_CXX");
+	project->variables().remove("QMAKE_RUN_CC");
+
+	QDict<void> source_directories;
+	source_directories.insert(".", (void*)1);
+	QString directories[] = { QString("MOC_DIR"), QString("UI_SOURCES_DIR"), QString("UI_DIR"), QString::null };
+	for(int y = 0; !directories[y].isNull(); y++) {
+	    QString dirTemp = project->first(directories[y]);
+	    if (dirTemp.endsWith("\\"))
+		dirTemp.truncate(dirTemp.length()-1);
+	    if(!dirTemp.isEmpty())
+		source_directories.insert(dirTemp, (void*)1);
+	}
+	QString srcs[] = { QString("SOURCES"), QString("UICIMPLS"), QString("SRCMOC"), QString::null };
+	for(int x = 0; !srcs[x].isNull(); x++) {
+	    QStringList &l = project->variables()[srcs[x]];
+	    for(QStringList::Iterator sit = l.begin(); sit != l.end(); ++sit) {
+		QString sep = "\\";
+		if((*sit).find(sep) == -1)
+		    sep = "/";
+		QString dir = (*sit).section(sep, 0, -2);
+		if(!dir.isEmpty() && !source_directories[dir])
+		    source_directories.insert(dir, (void*)1);
+	    }
+	}
+
+	for(QDictIterator<void> it(source_directories); it.current(); ++it) {
+	    if(it.currentKey().isEmpty())
+		continue;
+	    for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
+		t << "{" << it.currentKey() << "}" << (*cppit) << "{" << var("OBJECTS_DIR") << "}" << Option::obj_ext << "::\n\t"
+		  << var("QMAKE_RUN_CXX_IMP_BATCH").replace( QRegExp( "\\$@" ), var("OBJECTS_DIR") ) << endl << "\t$<" << endl << "<<" << endl << endl;
+	    t << "{" << it.currentKey() << "}" << ".c{" << var("OBJECTS_DIR") << "}" << Option::obj_ext << "::\n\t"
+	      << var("QMAKE_RUN_CC_IMP_BATCH").replace( QRegExp( "\\$@" ), var("OBJECTS_DIR") ) << endl << "\t$<" << endl << "<<" << endl << endl;
+	}
+    } else {
+	for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
+	    t << (*cppit) << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl;
+	t << ".c" << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CC_IMP") << endl << endl;
+    }
+
+    t << "####### Build rules" << endl << endl;
+    t << "all: " << fileFixify(Option::output.name()) << " " << varGlue("ALL_DEPS"," "," "," ") << "$(TARGET)" << endl << endl;
+    t << "$(TARGET): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC) "
+      << extraCompilerDeps << var("POST_TARGETDEPS");
+    if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) {
+	t << "\n\t" << "$(LINK) $(LFLAGS) /OUT:$(TARGET) @<< " << "\n\t  "
+	  << "$(OBJECTS) $(OBJMOC) $(LIBS)";
+    } else {
+	t << "\n\t" << "$(LIB) /OUT:$(TARGET) @<<" << "\n\t  "
+	  << "$(OBJECTS) $(OBJMOC)";
+    }
+    t << extraCompilerDeps;
+    t << endl << "<<" << endl;
+    if ( !project->variables()["QMAKE_POST_LINK"].isEmpty() )
+	t << "\t" << var( "QMAKE_POST_LINK" ) << endl;
+    if(project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty()) {
+	QStringList dlldirs = project->variables()["DLLDESTDIR"];
+	for ( QStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) {
+	    t << "\n\t" << "-$(COPY_FILE) \"$(TARGET)\" " << *dlldir;
+	}
+    }
+    QString targetfilename = project->variables()["TARGET"].first();
+    if(project->isActiveConfig("activeqt")) {
+	QString version = project->variables()["VERSION"].first();
+	if ( version.isEmpty() )
+	    version = "1.0";
+
+	if ( project->isActiveConfig("dll")) {
+	    t << "\n\t" << ("-$(IDC) $(TARGET) /idl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version);
+	    t << "\n\t" << ("-$(IDL) /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb");
+	    t << "\n\t" << ("-$(IDC) $(TARGET) /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb");
+	    t << "\n\t" << ("-$(IDC) $(TARGET) /regserver" );
+	} else {
+	    t << "\n\t" << ("-$(TARGET) -dumpidl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version);
+	    t << "\n\t" << ("-$(IDL) /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb");
+	    t << "\n\t" << ("-$(IDC) $(TARGET) /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb");
+	    t << "\n\t" << "-$(TARGET) -regserver";
+	}
+    }
+    t << endl << endl;
+
+    if(!project->variables()["RC_FILE"].isEmpty()) {
+	t << var("RES_FILE") << ": " << var("RC_FILE") << "\n\t"
+	  << var("QMAKE_RC") << " " << var("RC_FILE") << endl << endl;
+    }
+
+    t << "mocables: $(SRCMOC)" << endl
+      << "uicables: $(UICIMPLS) $(UICDECLS)" << endl << endl;
+
+    writeMakeQmake(t);
+
+    QStringList dist_files = Option::mkfile::project_files;
+    if(!project->isEmpty("QMAKE_INTERNAL_INCLUDED_FILES"))
+	dist_files += project->variables()["QMAKE_INTERNAL_INCLUDED_FILES"];
+    if(!project->isEmpty("TRANSLATIONS"))
+	dist_files << var("TRANSLATIONS");
+    if(!project->isEmpty("FORMS")) {
+	QStringList &forms = project->variables()["FORMS"];
+	for(QStringList::Iterator formit = forms.begin(); formit != forms.end(); ++formit) {
+	    QString ui_h = fileFixify((*formit) + Option::h_ext.first());
+	    if(QFile::exists(ui_h) )
+		dist_files << ui_h;
+	}
+    }
+    t << "dist:" << "\n\t"
+      << "$(ZIP) " << var("QMAKE_ORIG_TARGET") << ".zip " << "$(SOURCES) $(HEADERS) $(DIST) $(FORMS) "
+      << dist_files.join(" ") << " " << var("TRANSLATIONS") << " " << var("IMAGES") << endl << endl;
+
+    t << "uiclean:"
+      << varGlue("UICDECLS" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","")
+      << varGlue("UICIMPLS" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") << endl;
+
+    t << "mocclean:"
+      << varGlue("SRCMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","")
+      << varGlue("OBJMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") << endl;
+
+    t << "clean: uiclean mocclean"
+      << varGlue("OBJECTS","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","")
+      << varGlue("QMAKE_CLEAN","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","\n")
+      << varGlue("CLEAN_FILES","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","\n");
+    if ( project->isActiveConfig("activeqt")) {
+	t << ("\n\t-$(DEL_FILE) " + var("OBJECTS_DIR") + targetfilename + ".idl");
+	t << ("\n\t-$(DEL_FILE) " + var("OBJECTS_DIR") + targetfilename + ".tlb");
+    }
+    if(!project->isEmpty("IMAGES"))
+	t << varGlue("QMAKE_IMAGE_COLLECTION", "\n\t-$(DEL_FILE) ", "\n\t-$(DEL_FILE) ", "");
+    t << endl;
+
+    // user defined targets
+
+    QStringList::Iterator it;
+    QStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"];
+    for(it = qut.begin(); it != qut.end(); ++it) {
+	QString targ = var((*it) + ".target"),
+		 cmd = var((*it) + ".commands"), deps;
+	if(targ.isEmpty())
+	    targ = (*it);
+	QStringList &deplist = project->variables()[(*it) + ".depends"];
+	for(QStringList::Iterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) {
+	    QString dep = var((*dep_it) + ".target");
+	    if(dep.isEmpty())
+		dep = (*dep_it);
+	    deps += " " + dep;
+	}
+	if(!project->variables()["QMAKE_NOFORCE"].isEmpty() &&
+	   project->variables()[(*it) + ".CONFIG"].findIndex("phony") != -1)
+	    deps += QString(" ") + "FORCE";
+	t << "\n\n" << targ << ":" << deps << "\n\t"
+	  << cmd;
+    }
+    t << endl << endl;
+
+    QStringList &quc = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"];
+    for(it = quc.begin(); it != quc.end(); ++it) {
+	QString tmp_out = project->variables()[(*it) + ".output"].first();
+	QString tmp_cmd = project->variables()[(*it) + ".commands"].join(" ");
+	QString tmp_dep = project->variables()[(*it) + ".depends"].join(" ");
+	QStringList &vars = project->variables()[(*it) + ".variables"];
+	if(tmp_out.isEmpty() || tmp_cmd.isEmpty())
+	    continue;
+	QStringList &tmp = project->variables()[(*it) + ".input"];
+	for(QStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
+	    QStringList &inputs = project->variables()[(*it2)];
+	    for(QStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
+		QFileInfo fi(Option::fixPathToLocalOS((*input)));
+		QString in = Option::fixPathToTargetOS((*input), FALSE),
+		       out = tmp_out, cmd = tmp_cmd, deps;
+		out.replace("${QMAKE_FILE_BASE}", fi.baseName());
+		out.replace("${QMAKE_FILE_NAME}", fi.filePath());
+		cmd.replace("${QMAKE_FILE_BASE}", fi.baseName());
+		cmd.replace("${QMAKE_FILE_OUT}", out);
+		cmd.replace("${QMAKE_FILE_NAME}", fi.filePath());
+		for(QStringList::Iterator it3 = vars.begin(); it3 != vars.end(); ++it3)
+		    cmd.replace("$(" + (*it3) + ")", "$(QMAKE_COMP_" + (*it3)+")");
+		if(!tmp_dep.isEmpty()) {
+		    char buff[256];
+		    QString dep_cmd = tmp_dep;
+		    dep_cmd.replace("${QMAKE_FILE_NAME}", fi.filePath());
+		    if(FILE *proc = QT_POPEN(dep_cmd.latin1(), "r")) {
+			while(!feof(proc)) {
+			    int read_in = int(fread(buff, 1, 255, proc));
+			    if(!read_in)
+				break;
+			    int l = 0;
+			    for(int i = 0; i < read_in; i++) {
+				if(buff[i] == '\n' || buff[i] == ' ') {
+				    deps += " " + QCString(buff+l, (i - l) + 1);
+				    l = i;
+				}
+			    }
+			}
+			fclose(proc);
+		    }
+		}
+		t << out << ": " << in << deps << "\n\t"
+		  << cmd << endl << endl;
+	    }
+	}
+    }
+    t << endl;
+
+    if(project->variables()["QMAKE_NOFORCE"].isEmpty())
+	t << "FORCE:" << endl << endl;
+
+    t << "distclean: clean"
+      << "\n\t-$(DEL_FILE) $(TARGET)"
+      << endl << endl;
+
+    // precompiled header
+    if(usePCH) {
+	QString precompRule = QString("-c -Yc -Fp%1 -Fo%2").arg(precompPch).arg(precompObj);
+	t << precompObj << ": " << precompH << " " << findDependencies(precompH).join(" \\\n\t\t")
+	  << "\n\t" << ("$(CXX) " + precompRule + " $(CXXFLAGS) $(INCPATH) -TP ") << precompH << endl << endl;
+    }
+}
+
+QString
+NmakeMakefileGenerator::var(const QString &value)
+{
+    if (usePCH) {
+    	if ((value == "QMAKE_RUN_CXX_IMP_BATCH"
+	    || value == "QMAKE_RUN_CXX_IMP"
+	    || value == "QMAKE_RUN_CXX")) {
+	    QFileInfo precompHInfo(precompH);
+	    QString precompRule = QString("-c -FI%1 -Yu%2 -Fp%3")
+		.arg(precompHInfo.fileName())
+		.arg(precompHInfo.fileName())
+		.arg(precompPch);
+	    QString p = MakefileGenerator::var(value);
+	    p.replace("-c", precompRule);
+	    // Cannot use -Gm with -FI & -Yu, as this gives an
+	    // internal compiler error, on the newer compilers
+	    p.remove("-Gm");
+	    return p;
+	} else if (value == "QMAKE_CXXFLAGS") {
+	    // Remove internal compiler error option
+	    return MakefileGenerator::var(value).remove("-Gm");
+	}
+    }
+
+    // Normal val
+    return MakefileGenerator::var(value);
+}
+
+void
+NmakeMakefileGenerator::init()
+{
+    if(init_flag)
+	return;
+    init_flag = TRUE;
+
+    /* this should probably not be here, but I'm using it to wrap the .t files */
+    if(project->first("TEMPLATE") == "app")
+	project->variables()["QMAKE_APP_FLAG"].append("1");
+    else if(project->first("TEMPLATE") == "lib")
+	project->variables()["QMAKE_LIB_FLAG"].append("1");
+    else if(project->first("TEMPLATE") == "subdirs") {
+	MakefileGenerator::init();
+	if(project->variables()["MAKEFILE"].isEmpty())
+	    project->variables()["MAKEFILE"].append("Makefile");
+	if(project->variables()["QMAKE"].isEmpty())
+	    project->variables()["QMAKE"].append("qmake");
+	return;
+    }
+
+    if(project->isEmpty("QMAKE_INSTALL_FILE"))
+	project->variables()["QMAKE_INSTALL_FILE"].append("$(COPY_FILE)");
+    if(project->isEmpty("QMAKE_INSTALL_DIR"))
+	project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)");
+
+    bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qt-mt"QTDLL_POSTFIX);
+    project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
+
+    QString targetfilename = project->variables()["TARGET"].first();
+    QStringList &configs = project->variables()["CONFIG"];
+    if (project->isActiveConfig("qt") && project->isActiveConfig("shared"))
+	project->variables()["DEFINES"].append("QT_DLL");
+    if (project->isActiveConfig("qt_dll"))
+	if(configs.findIndex("qt") == -1) configs.append("qt");
+    if ( project->isActiveConfig("qtopia") ) {
+	if(configs.findIndex("qtopialib") == -1)
+	    configs.append("qtopialib");
+	if(configs.findIndex("qtopiainc") == -1)
+	    configs.append("qtopiainc");
+    }
+    if ( project->isActiveConfig("qt") ) {
+	if ( project->isActiveConfig( "plugin" ) ) {
+	    project->variables()["CONFIG"].append("dll");
+	    if(project->isActiveConfig("qt"))
+		project->variables()["DEFINES"].append("QT_PLUGIN");
+	}
+	if ( (project->variables()["DEFINES"].findIndex("QT_NODLL") == -1) &&
+         ((project->variables()["DEFINES"].findIndex("QT_MAKEDLL") != -1 ||
+           project->variables()["DEFINES"].findIndex("QT_DLL") != -1) ||
+          (getenv("QT_DLL") && !getenv("QT_NODLL"))) ) {
+	    project->variables()["QMAKE_QT_DLL"].append("1");
+	    if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() )
+		project->variables()["CONFIG"].append("dll");
+	}
+	if ( project->isActiveConfig("thread") )
+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT");
+	if ( project->isActiveConfig("accessibility" ) )
+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT");
+	if ( project->isActiveConfig("tablet") )
+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_TABLET_SUPPORT");
+    }
+    if ( project->isActiveConfig("dll") || !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) {
+	project->variables()["CONFIG"].remove("staticlib");
+	project->variables()["QMAKE_APP_OR_DLL"].append("1");
+    } else {
+	project->variables()["CONFIG"].append("staticlib");
+    }
+    if ( project->isActiveConfig("warn_off") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_OFF"];
+    } else if ( project->isActiveConfig("warn_on") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_ON"];
+    }
+    if ( project->isActiveConfig("debug") ) {
+        if ( project->isActiveConfig("thread") ) {
+	    // use the DLL RT even here
+	    if ( project->variables()["DEFINES"].contains("QT_DLL") ) {
+		project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DLLDBG"];
+		project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DLLDBG"];
+	    } else {
+		project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DBG"];
+		project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DBG"];
+	    }
+	}
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_DEBUG"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_DEBUG"];
+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_DEBUG"];
+    } else {
+	if ( project->isActiveConfig("thread") ) {
+	    if ( project->variables()["DEFINES"].contains("QT_DLL") ) {
+		project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DLL"];
+		project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DLL"];
+	    } else {
+		project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT"];
+		project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT"];
+	    }
+	}
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RELEASE"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RELEASE"];
+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_RELEASE"];
+    }
+    if ( project->isActiveConfig("thread") && !project->variables()["DEFINES"].contains("QT_DLL")
+	&& !is_qt && project->first("TARGET") != "qtmain") {
+	project->variables()["QMAKE_LFLAGS"].append("/NODEFAULTLIB:\"libc\"");
+    }
+
+    if ( !project->variables()["QMAKE_INCDIR"].isEmpty())
+	project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR"];
+    if ( project->isActiveConfig("qt") || project->isActiveConfig("opengl") )
+	project->variables()["CONFIG"].append("windows");
+    if ( project->isActiveConfig("qtopiainc") )
+	project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QTOPIA"];
+    if ( project->isActiveConfig("qtopialib") ) {
+	if(!project->isEmpty("QMAKE_LIBDIR_QTOPIA"))
+	    project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QTOPIA"];
+	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QTOPIA"];
+    }
+    if ( project->isActiveConfig("qt") ) {
+	project->variables()["CONFIG"].append("moc");
+	project->variables()["INCLUDEPATH"] +=	project->variables()["QMAKE_INCDIR_QT"];
+	project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"];
+	if ( !project->isActiveConfig("debug") )
+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG");
+	if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) {
+	    if ( !project->variables()["QMAKE_QT_DLL"].isEmpty()) {
+		project->variables()["DEFINES"].append("QT_MAKEDLL");
+		project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_QT_DLL"];
+	    }
+	} else {
+	    if(project->isActiveConfig("thread"))
+		project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"];
+	    else
+		project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"];
+	    if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) {
+		int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt");
+		if ( hver == -1 )
+		    hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt-mt");
+		if(hver != -1) {
+		    QString ver;
+		    ver.sprintf("qt%s" QTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "-mt" : ""), hver);
+		    QStringList &libs = project->variables()["QMAKE_LIBS"];
+		    for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit)
+			(*libit).replace(QRegExp("qt(-mt)?\\.lib"), ver);
+		}
+	    }
+	    if ( project->isActiveConfig( "activeqt" ) ) {
+		project->variables().remove("QMAKE_LIBS_QT_ENTRY");
+		project->variables()["QMAKE_LIBS_QT_ENTRY"] = "qaxserver.lib";
+		if ( project->isActiveConfig( "dll" ) )
+		    project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"];
+	    }
+	    if ( !project->isActiveConfig("dll") && !project->isActiveConfig("plugin") ) {
+		project->variables()["QMAKE_LIBS"] +=project->variables()["QMAKE_LIBS_QT_ENTRY"];
+	    }
+	}
+    }
+    if ( project->isActiveConfig("opengl") ) {
+	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"];
+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"];
+    }
+    if ( project->isActiveConfig("dll") ) {
+	project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE_DLL"];
+	project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE_DLL"];
+	project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE_DLL"];
+	project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS_DLL"];
+	if ( !project->variables()["QMAKE_LIB_FLAG"].isEmpty()) {
+	    project->variables()["TARGET_EXT"].append(
+		QStringList::split('.',project->first("VERSION")).join("") + ".dll");
+	} else {
+	    project->variables()["TARGET_EXT"].append(".dll");
+	}
+    } else {
+	project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE"];
+	project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE"];
+	project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE"];
+	project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS"];
+	if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty()) {
+	    project->variables()["TARGET_EXT"].append(".exe");
+	} else {
+	    project->variables()["TARGET_EXT"].append(".lib");
+	}
+    }
+    if ( project->isActiveConfig("windows") ) {
+	if ( project->isActiveConfig("console") ) {
+	    project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"];
+	    project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"];
+	    project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"];
+	    project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"];
+	} else {
+	    project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"];
+	}
+	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_WINDOWS"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"];
+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"];
+	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"];
+    }
+    if ( project->isActiveConfig("stl") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_ON"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_OFF"];
+    }
+    if ( project->isActiveConfig("exceptions") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_ON"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_OFF"];
+    }
+    if ( project->isActiveConfig("rtti") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_ON"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_OFF"];
+    }
+
+
+    if ( project->isActiveConfig("moc") )
+	setMocAware(TRUE);
+    project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
+
+    QStringList &libList = project->variables()["QMAKE_LIBS"];
+    for( QStringList::Iterator stIt = libList.begin(); stIt != libList.end(); ) {
+	QString s = *stIt;
+	if( s.startsWith( "-l" ) ) {
+	    stIt = libList.remove( stIt );
+	    stIt = libList.insert( stIt, s.mid( 2 ) + ".lib" );
+        } else if( s.startsWith( "-L" ) ) {
+	    stIt = libList.remove( stIt );
+	    project->variables()["QMAKE_LIBDIR"].append(QDir::convertSeparators(s.mid( 2 )));
+	} else {
+	    stIt++;
+	}
+    }
+
+    project->variables()["QMAKE_FILETAGS"] += QStringList::split(' ',
+	"HEADERS SOURCES DEF_FILE RC_FILE TARGET QMAKE_LIBS DESTDIR DLLDESTDIR INCLUDEPATH");
+    QStringList &l = project->variables()["QMAKE_FILETAGS"];
+    QStringList::Iterator it;
+    for(it = l.begin(); it != l.end(); ++it) {
+	QStringList &gdmf = project->variables()[(*it)];
+	for(QStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner)
+	    (*inner) = Option::fixPathToTargetOS((*inner), FALSE);
+    }
+
+    if ( !project->variables()["DEF_FILE"].isEmpty() )
+	project->variables()["QMAKE_LFLAGS"].append(QString("/DEF:") + project->first("DEF_FILE"));
+    if(!project->isActiveConfig("incremental"))
+	project->variables()["QMAKE_LFLAGS"].append(QString("/incremental:no"));
+
+    if ( !project->variables()["VERSION"].isEmpty() ) {
+	QString version = project->variables()["VERSION"][0];
+	int firstDot = version.find( "." );
+	QString major = version.left( firstDot );
+	QString minor = version.right( version.length() - firstDot - 1 );
+	minor.replace( ".", "" );
+	project->variables()["QMAKE_LFLAGS"].append( "/VERSION:" + major + "." + minor );
+    }
+    if ( !project->variables()["RC_FILE"].isEmpty()) {
+	if ( !project->variables()["RES_FILE"].isEmpty()) {
+	    fprintf(stderr, "Both .rc and .res file specified.\n");
+	    fprintf(stderr, "Please specify one of them, not both.");
+	    exit(666);
+	}
+	project->variables()["RES_FILE"] = project->variables()["RC_FILE"];
+	project->variables()["RES_FILE"].first().replace(".rc",".res");
+	project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"];
+	project->variables()["CLEAN_FILES"] += project->variables()["RES_FILE"];
+    }
+    if ( !project->variables()["RES_FILE"].isEmpty())
+	project->variables()["QMAKE_LIBS"] += project->variables()["RES_FILE"];
+
+    // Base class init!
+    MakefileGenerator::init();
+
+    // Setup PCH variables
+    precompH = project->first("PRECOMPILED_HEADER");
+    usePCH = !precompH.isEmpty() && project->isActiveConfig("precompile_header");
+    if (usePCH) {
+	// Created files
+	precompObj = var("OBJECTS_DIR") + project->first("TARGET") + "_pch" + Option::obj_ext;
+	precompPch = var("OBJECTS_DIR") + project->first("TARGET") + "_pch.pch";
+	// Add linking of precompObj (required for whole precompiled classes)
+	project->variables()["OBJECTS"]		  += precompObj;
+	// Add pch file to cleanup
+	project->variables()["QMAKE_CLEAN"]	  += precompPch;
+	// Return to variable pool
+	project->variables()["PRECOMPILED_OBJECT"] = precompObj;
+	project->variables()["PRECOMPILED_PCH"]    = precompPch;
+    }
+
+    if ( !project->variables()["VERSION"].isEmpty()) {
+	QStringList l = QStringList::split('.', project->first("VERSION"));
+	project->variables()["VER_MAJ"].append(l[0]);
+	project->variables()["VER_MIN"].append(l[1]);
+    }
+
+    QString version = QStringList::split('.', project->first("VERSION")).join("");
+    if(project->isActiveConfig("dll")) {
+	project->variables()["QMAKE_CLEAN"].append(project->first("DESTDIR") + project->first("TARGET") + version + ".exp");
+    }
+    if(project->isActiveConfig("debug")) {
+	project->variables()["QMAKE_CLEAN"].append(project->first("DESTDIR") + project->first("TARGET") + version + ".pdb");
+	project->variables()["QMAKE_CLEAN"].append(project->first("DESTDIR") + project->first("TARGET") + version + ".ilk");
+	project->variables()["QMAKE_CLEAN"].append("vc*.pdb");
+	project->variables()["QMAKE_CLEAN"].append("vc*.idb");
+    }
+
+    QStringList &quc = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"];
+    for(it = quc.begin(); it != quc.end(); ++it) {
+	QString tmp_out = project->variables()[(*it) + ".output"].first();
+	if(tmp_out.isEmpty())
+	    continue;
+	QStringList &tmp = project->variables()[(*it) + ".input"];
+	for(QStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
+	    QStringList &inputs = project->variables()[(*it2)];
+	    for(QStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
+		QFileInfo fi(Option::fixPathToLocalOS((*input)));
+		QString in = Option::fixPathToTargetOS((*input), FALSE),
+		       out = tmp_out;
+		out.replace("${QMAKE_FILE_BASE}", fi.baseName());
+		out.replace("${QMAKE_FILE_NAME}", fi.filePath());
+		if(project->variables()[(*it) + ".CONFIG"].findIndex("no_link") == -1)
+		    project->variables()["OBJCOMP"] += out;
+	    }
+	}
+    }
+}
diff --git a/qmake/generators/win32/msvc_nmake.h b/qmake/generators/win32/msvc_nmake.h
new file mode 100644
index 0000000..7bbeeaa
--- /dev/null
+++ b/qmake/generators/win32/msvc_nmake.h
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Definition of NmakeMakefileGenerator class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#ifndef __MSVC_NMAKE_H__
+#define __MSVC_NMAKE_H__
+
+#include "winmakefile.h"
+
+class NmakeMakefileGenerator : public Win32MakefileGenerator
+{
+    bool init_flag;
+    void writeNmakeParts(QTextStream &);
+
+    bool writeMakefile(QTextStream &);
+    void init();
+
+protected:
+    QStringList &findDependencies(const QString &file);
+    QString var(const QString &value);
+    QString precompH, precompObj, precompPch;
+    bool usePCH;
+
+public:
+    NmakeMakefileGenerator(QMakeProject *p);
+    ~NmakeMakefileGenerator();
+
+};
+
+inline NmakeMakefileGenerator::~NmakeMakefileGenerator()
+{ }
+
+#endif /* __MSVC_NMAKE_H__ */
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
new file mode 100644
index 0000000..e17c66b
--- /dev/null
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -0,0 +1,2226 @@
+/****************************************************************************
+**
+** Implementation of VCProject class.
+**
+** Copyright (C) 2002-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#include "msvc_objectmodel.h"
+#include "msvc_vcproj.h"
+#include <qtextstream.h>
+#include <qstringlist.h>
+#include <qfileinfo.h>
+
+extern DotNET which_dotnet_version();
+
+// XML Tags ---------------------------------------------------------
+const char* _xmlInit				= "<?xml version=\"1.0\" encoding = \"Windows-1252\"?>";
+const char* _begConfiguration			= "\n\t\t<Configuration";
+const char* _begConfigurations			= "\n\t<Configurations>";
+const char* _begFile				= "\n\t\t\t<File";
+const char* _begFileConfiguration		= "\n\t\t\t\t<FileConfiguration";
+const char* _begFiles				= "\n\t<Files>";
+const char* _begFilter				= "\n\t\t<Filter";
+const char* _begGlobals				= "\n\t<Globals>";
+const char* _begPlatform			= "\n\t\t<Platform";
+const char* _begPlatforms			= "\n\t<Platforms>";
+const char* _begTool3				= "\n\t\t\t<Tool";
+const char* _begTool5				= "\n\t\t\t\t\t<Tool";
+const char* _begVisualStudioProject		= "\n<VisualStudioProject";
+const char* _endConfiguration			= "\n\t\t</Configuration>";
+const char* _endConfigurations			= "\n\t</Configurations>";
+const char* _endFile				= "\n\t\t\t</File>";
+const char* _endFileConfiguration		= "\n\t\t\t\t</FileConfiguration>";
+const char* _endFiles				= "\n\t</Files>";
+const char* _endFilter				= "\n\t\t</Filter>";
+const char* _endGlobals				= "\n\t</Globals>";
+const char* _endPlatforms			= "\n\t</Platforms>";
+const char* _endVisualStudioProject		= "\n</VisualStudioProject>";
+
+// XML Properties ---------------------------------------------------
+const char* _AddModuleNamesToAssembly 		= "\n\t\t\t\tAddModuleNamesToAssembly=\"";
+const char* _AdditionalDependencies4 		= "\n\t\t\t\tAdditionalDependencies=\"";
+const char* _AdditionalDependencies6 		= "\n\t\t\t\t\t\tAdditionalDependencies=\"";
+const char* _AdditionalIncludeDirectories 	= "\n\t\t\t\tAdditionalIncludeDirectories=\"";
+const char* _AdditionalLibraryDirectories 	= "\n\t\t\t\tAdditionalLibraryDirectories=\"";
+const char* _AdditionalOptions 			= "\n\t\t\t\tAdditionalOptions=\"";
+const char* _AdditionalUsingDirectories 	= "\n\t\t\t\tAdditionalUsingDirectories=\"";
+const char* _AssemblerListingLocation 		= "\n\t\t\t\tAssemblerListingLocation=\"";
+const char* _AssemblerOutput 			= "\n\t\t\t\tAssemblerOutput=\"";
+const char* _ATLMinimizesCRunTimeLibraryUsage	= "\n\t\t\tATLMinimizesCRunTimeLibraryUsage=\"";
+const char* _BaseAddress 			= "\n\t\t\t\tBaseAddress=\"";
+const char* _BasicRuntimeChecks 		= "\n\t\t\t\tBasicRuntimeChecks=\"";
+const char* _BrowseInformation 			= "\n\t\t\t\tBrowseInformation=\"";
+const char* _BrowseInformationFile 		= "\n\t\t\t\tBrowseInformationFile=\"";
+const char* _BufferSecurityCheck 		= "\n\t\t\t\tBufferSecurityCheck=\"";
+const char* _BuildBrowserInformation		= "\n\t\t\tBuildBrowserInformation=\"";
+const char* _CPreprocessOptions 		= "\n\t\t\t\tCPreprocessOptions=\"";
+const char* _CallingConvention 			= "\n\t\t\t\tCallingConvention=\"";
+const char* _CharacterSet			= "\n\t\t\tCharacterSet=\"";
+const char* _CommandLine4 			= "\n\t\t\t\tCommandLine=\"";
+const char* _CommandLine6 			= "\n\t\t\t\t\t\tCommandLine=\"";
+const char* _CompileAs 				= "\n\t\t\t\tCompileAs=\"";
+const char* _CompileAsManaged 			= "\n\t\t\t\tCompileAsManaged=\"";
+const char* _CompileOnly 			= "\n\t\t\t\tCompileOnly=\"";
+const char* _ConfigurationType			= "\n\t\t\tConfigurationType=\"";
+const char* _Culture				= "\n\t\t\t\tCulture=\"";
+const char* _DLLDataFileName 			= "\n\t\t\t\tDLLDataFileName=\"";
+const char* _DebugInformationFormat 		= "\n\t\t\t\tDebugInformationFormat=\"";
+const char* _DefaultCharIsUnsigned 		= "\n\t\t\t\tDefaultCharIsUnsigned=\"";
+const char* _DefaultCharType 			= "\n\t\t\t\tDefaultCharType=\"";
+const char* _DelayLoadDLLs	 		= "\n\t\t\t\tDelayLoadDLLs=\"";
+const char* _DeleteExtensionsOnClean		= "\n\t\t\tDeleteExtensionsOnClean=\"";
+const char* _Description4 			= "\n\t\t\t\tDescription=\"";
+const char* _Description6 			= "\n\t\t\t\t\t\tDescription=\"";
+const char* _Detect64BitPortabilityProblems 	= "\n\t\t\t\tDetect64BitPortabilityProblems=\"";
+const char* _DisableLanguageExtensions 		= "\n\t\t\t\tDisableLanguageExtensions=\"";
+const char* _DisableSpecificWarnings 		= "\n\t\t\t\tDisableSpecificWarnings=\"";
+const char* _EnableCOMDATFolding 		= "\n\t\t\t\tEnableCOMDATFolding=\"";
+const char* _EnableErrorChecks 			= "\n\t\t\t\tEnableErrorChecks=\"";
+const char* _EnableFiberSafeOptimizations 	= "\n\t\t\t\tEnableFiberSafeOptimizations=\"";
+const char* _EnableFunctionLevelLinking 	= "\n\t\t\t\tEnableFunctionLevelLinking=\"";
+const char* _EnableIntrinsicFunctions 		= "\n\t\t\t\tEnableIntrinsicFunctions=\"";
+const char* _EntryPointSymbol 			= "\n\t\t\t\tEntryPointSymbol=\"";
+const char* _ErrorCheckAllocations 		= "\n\t\t\t\tErrorCheckAllocations=\"";
+const char* _ErrorCheckBounds 			= "\n\t\t\t\tErrorCheckBounds=\"";
+const char* _ErrorCheckEnumRange 		= "\n\t\t\t\tErrorCheckEnumRange=\"";
+const char* _ErrorCheckRefPointers 		= "\n\t\t\t\tErrorCheckRefPointers=\"";
+const char* _ErrorCheckStubData 		= "\n\t\t\t\tErrorCheckStubData=\"";
+const char* _ExceptionHandling 			= "\n\t\t\t\tExceptionHandling=\"";
+const char* _ExcludedFromBuild 			= "\n\t\t\t\tExcludedFromBuild=\"";
+const char* _ExpandAttributedSource 		= "\n\t\t\t\tExpandAttributedSource=\"";
+const char* _ExportNamedFunctions		= "\n\t\t\t\tExportNamedFunctions=\"";
+const char* _FavorSizeOrSpeed 			= "\n\t\t\t\tFavorSizeOrSpeed=\"";
+const char* _Filter				= "\n\t\t\tFilter=\"";
+const char* _ForceConformanceInForLoopScope 	= "\n\t\t\t\tForceConformanceInForLoopScope=\"";
+const char* _ForceSymbolReferences 		= "\n\t\t\t\tForceSymbolReferences=\"";
+const char* _ForcedIncludeFiles 		= "\n\t\t\t\tForcedIncludeFiles=\"";
+const char* _ForcedUsingFiles 			= "\n\t\t\t\tForcedUsingFiles=\"";
+const char* _FullIncludePath 			= "\n\t\t\t\tFullIncludePath=\"";
+const char* _FunctionOrder 			= "\n\t\t\t\tFunctionOrder=\"";
+const char* _GenerateDebugInformation 		= "\n\t\t\t\tGenerateDebugInformation=\"";
+const char* _GenerateMapFile 			= "\n\t\t\t\tGenerateMapFile=\"";
+const char* _GeneratePreprocessedFile 		= "\n\t\t\t\tGeneratePreprocessedFile=\"";
+const char* _GenerateStublessProxies 		= "\n\t\t\t\tGenerateStublessProxies=\"";
+const char* _GenerateTypeLibrary 		= "\n\t\t\t\tGenerateTypeLibrary=\"";
+const char* _GlobalOptimizations 		= "\n\t\t\t\tGlobalOptimizations=\"";
+const char* _HeaderFileName 			= "\n\t\t\t\tHeaderFileName=\"";
+const char* _HeapCommitSize 			= "\n\t\t\t\tHeapCommitSize=\"";
+const char* _HeapReserveSize 			= "\n\t\t\t\tHeapReserveSize=\"";
+const char* _IgnoreAllDefaultLibraries 		= "\n\t\t\t\tIgnoreAllDefaultLibraries=\"";
+const char* _IgnoreDefaultLibraryNames 		= "\n\t\t\t\tIgnoreDefaultLibraryNames=\"";
+const char* _IgnoreEmbeddedIDL 			= "\n\t\t\t\tIgnoreEmbeddedIDL=\"";
+const char* _IgnoreImportLibrary 		= "\n\t\t\t\tIgnoreImportLibrary=\"";
+const char* _IgnoreStandardIncludePath 		= "\n\t\t\t\tIgnoreStandardIncludePath=\"";
+const char* _ImportLibrary 			= "\n\t\t\t\tImportLibrary=\"";
+const char* _ImproveFloatingPointConsistency 	= "\n\t\t\t\tImproveFloatingPointConsistency=\"";
+const char* _InlineFunctionExpansion 		= "\n\t\t\t\tInlineFunctionExpansion=\"";
+const char* _InterfaceIdentifierFileName 	= "\n\t\t\t\tInterfaceIdentifierFileName=\"";
+const char* _IntermediateDirectory		= "\n\t\t\tIntermediateDirectory=\"";
+const char* _KeepComments 			= "\n\t\t\t\tKeepComments=\"";
+const char* _LargeAddressAware 			= "\n\t\t\t\tLargeAddressAware=\"";
+const char* _LinkDLL 				= "\n\t\t\t\tLinkDLL=\"";
+const char* _LinkIncremental 			= "\n\t\t\t\tLinkIncremental=\"";
+const char* _LinkTimeCodeGeneration 		= "\n\t\t\t\tLinkTimeCodeGeneration=\"";
+const char* _LinkToManagedResourceFile 		= "\n\t\t\t\tLinkToManagedResourceFile=\"";
+const char* _MapExports 			= "\n\t\t\t\tMapExports=\"";
+const char* _MapFileName 			= "\n\t\t\t\tMapFileName=\"";
+const char* _MapLines 				= "\n\t\t\t\tMapLines =\"";
+const char* _MergeSections 			= "\n\t\t\t\tMergeSections=\"";
+const char* _MergedIDLBaseFileName 		= "\n\t\t\t\tMergedIDLBaseFileName=\"";
+const char* _MidlCommandFile 			= "\n\t\t\t\tMidlCommandFile=\"";
+const char* _MinimalRebuild 			= "\n\t\t\t\tMinimalRebuild=\"";
+const char* _MkTypLibCompatible			= "\n\t\t\t\tMkTypLibCompatible=\"";
+const char* _ModuleDefinitionFile 		= "\n\t\t\t\tModuleDefinitionFile=\"";
+const char* _Name1				= "\n\tName=\"";
+const char* _Name2				= "\n\t\tName=\"";
+const char* _Name3				= "\n\t\t\tName=\"";
+const char* _Name4				= "\n\t\t\t\tName=\"";
+const char* _Name5				= "\n\t\t\t\t\tName=\"";
+const char* _ObjectFile 			= "\n\t\t\t\tObjectFile=\"";
+const char* _OmitFramePointers 			= "\n\t\t\t\tOmitFramePointers=\"";
+const char* _OpenMP                             = "\n\t\t\t\tOpenMP=\"";
+const char* _Optimization 			= "\n\t\t\t\tOptimization =\"";
+const char* _OptimizeForProcessor 		= "\n\t\t\t\tOptimizeForProcessor=\"";
+const char* _OptimizeForWindows98 		= "\n\t\t\t\tOptimizeForWindows98=\"";
+const char* _OptimizeForWindowsApplication 	= "\n\t\t\t\tOptimizeForWindowsApplication=\"";
+const char* _OptimizeReferences 		= "\n\t\t\t\tOptimizeReferences=\"";
+const char* _OutputDirectory3			= "\n\t\t\tOutputDirectory=\"";
+const char* _OutputDirectory4			= "\n\t\t\t\tOutputDirectory=\"";
+const char* _OutputFile 			= "\n\t\t\t\tOutputFile=\"";
+const char* _Outputs4 				= "\n\t\t\t\tOutputs=\"";
+const char* _Outputs6 				= "\n\t\t\t\t\t\tOutputs=\"";
+const char* _ParseFiles				= "\n\t\t\tParseFiles=\"";
+const char* _PrecompiledHeaderFile 		= "\n\t\t\t\tPrecompiledHeaderFile=\"";
+const char* _PrecompiledHeaderThrough 		= "\n\t\t\t\tPrecompiledHeaderThrough=\"";
+const char* _PreprocessorDefinitions 		= "\n\t\t\t\tPreprocessorDefinitions=\"";
+const char* _PrimaryOutput			= "\n\t\t\tPrimaryOutput=\"";
+const char* _ProjectGUID			= "\n\tProjectGUID=\"";
+const char* _ProjectType			= "\n\tProjectType=\"Visual C++\"";
+const char* _ProgramDatabase			= "\n\t\t\tProgramDatabase=\"";
+const char* _ProgramDataBaseFileName 		= "\n\t\t\t\tProgramDataBaseFileName=\"";
+const char* _ProgramDatabaseFile 		= "\n\t\t\t\tProgramDatabaseFile=\"";
+const char* _ProxyFileName 			= "\n\t\t\t\tProxyFileName=\"";
+const char* _RedirectOutputAndErrors 		= "\n\t\t\t\tRedirectOutputAndErrors=\"";
+const char* _RegisterOutput 			= "\n\t\t\t\tRegisterOutput=\"";
+const char* _RelativePath			= "\n\t\t\t\tRelativePath=\"";
+const char* _ResourceOnlyDLL 			= "\n\t\t\t\tResourceOnlyDLL=\"";
+const char* _ResourceOutputFileName 		= "\n\t\t\t\tResourceOutputFileName=\"";
+const char* _RuntimeLibrary 			= "\n\t\t\t\tRuntimeLibrary=\"";
+const char* _RuntimeTypeInfo 			= "\n\t\t\t\tRuntimeTypeInfo=\"";
+const char* _SccProjectName			= "\n\tSccProjectName=\"";
+const char* _SccLocalPath			= "\n\tSccLocalPath=\"";
+const char* _SetChecksum 			= "\n\t\t\t\tSetChecksum=\"";
+const char* _ShowIncludes 			= "\n\t\t\t\tShowIncludes=\"";
+const char* _ShowProgress 			= "\n\t\t\t\tShowProgress=\"";
+const char* _SmallerTypeCheck 			= "\n\t\t\t\tSmallerTypeCheck=\"";
+const char* _StackCommitSize 			= "\n\t\t\t\tStackCommitSize=\"";
+const char* _StackReserveSize 			= "\n\t\t\t\tStackReserveSize=\"";
+const char* _StringPooling 			= "\n\t\t\t\tStringPooling=\"";
+const char* _StripPrivateSymbols 		= "\n\t\t\t\tStripPrivateSymbols=\"";
+const char* _StructMemberAlignment 		= "\n\t\t\t\tStructMemberAlignment=\"";
+const char* _SubSystem 				= "\n\t\t\t\tSubSystem=\"";
+const char* _SupportUnloadOfDelayLoadedDLL 	= "\n\t\t\t\tSupportUnloadOfDelayLoadedDLL=\"";
+const char* _SuppressStartupBanner 		= "\n\t\t\t\tSuppressStartupBanner=\"";
+const char* _SwapRunFromCD			= "\n\t\t\t\tSwapRunFromCD=\"";
+const char* _SwapRunFromNet 			= "\n\t\t\t\tSwapRunFromNet=\"";
+const char* _TargetEnvironment			= "\n\t\t\t\tTargetEnvironment=\"";
+const char* _TargetMachine 			= "\n\t\t\t\tTargetMachine=\"";
+const char* _TerminalServerAware 		= "\n\t\t\t\tTerminalServerAware=\"";
+const char* _ToolName				= "\n\t\t\t\tName=\"";
+const char* _ToolPath 				= "\n\t\t\t\tPath=\"";
+const char* _TreatWChar_tAsBuiltInType		= "\n\t\t\t\tTreatWChar_tAsBuiltInType=\"";
+const char* _TurnOffAssemblyGeneration 		= "\n\t\t\t\tTurnOffAssemblyGeneration=\"";
+const char* _TypeLibraryFile 			= "\n\t\t\t\tTypeLibraryFile=\"";
+const char* _TypeLibraryName			= "\n\t\t\t\tTypeLibraryName=\"";
+const char* _TypeLibraryResourceID 		= "\n\t\t\t\tTypeLibraryResourceID=\"";
+const char* _UndefineAllPreprocessorDefinitions = "\n\t\t\t\tUndefineAllPreprocessorDefinitions=\"";
+const char* _UndefinePreprocessorDefinitions 	= "\n\t\t\t\tUndefinePreprocessorDefinitions=\"";
+const char* _UseOfATL				= "\n\t\t\tUseOfATL=\"";
+const char* _UseOfMfc				= "\n\t\t\tUseOfMfc=\"";
+const char* _UsePrecompiledHeader 		= "\n\t\t\t\tUsePrecompiledHeader=\"";
+const char* _ValidateParameters 		= "\n\t\t\t\tValidateParameters=\"";
+const char* _VCCLCompilerToolName		= "\n\t\t\t\tName=\"VCCLCompilerTool\"";
+const char* _VCCustomBuildTool			= "\n\t\t\t\t\t\tName=\"VCCustomBuildTool\"";
+const char* _VCLinkerToolName			= "\n\t\t\t\tName=\"VCLinkerTool\"";
+const char* _VCResourceCompilerToolName		= "\n\t\t\t\tName=\"VCResourceCompilerTool\"";
+const char* _VCMIDLToolName			= "\n\t\t\t\tName=\"VCMIDLTool\"";
+const char* _Version1 				= "\n\tVersion=\"";
+const char* _Version4 				= "\n\t\t\t\tVersion=\"";
+const char* _WarnAsError 			= "\n\t\t\t\tWarnAsError=\"";
+const char* _WarnLevel 				= "\n\t\t\t\tWarnLevel=\"";
+const char* _WarningLevel 			= "\n\t\t\t\tWarningLevel=\"";
+const char* _WholeProgramOptimization		= "\n\t\t\t\tWholeProgramOptimization=\"";
+
+// Property name and value as Pairs ---------------------------------
+struct TPair {
+    TPair( const char* n, const triState v ) : name(n), value(v) {};
+    const char* name;
+    const triState value;
+};
+struct EPair {
+    EPair( const char* n, const int v ) : name(n), value(v) {};
+    const char* name;
+    const int value;
+};
+struct LPair {
+    LPair( const char* n, const long v ) : name(n), value(v) {};
+    const char* name;
+    const long value;
+};
+struct SPair {
+    SPair( const char* n, const QString& v ) : name(n), value(v) {};
+    const char* name;
+    const QString& value;
+};
+struct XPair {
+    XPair( const char* n, const QStringList& v, const char* s = "," ) : name(n), value(v), sep(s) {};
+    const char* name;
+    const QStringList& value;
+    const char* sep;
+};
+
+// void streamSPair( QTextStream &strm, const char *n, const QString &s )
+
+// Streaming operators for property Pairs ---------------------------
+QTextStream &operator<<( QTextStream &strm, const TPair &prop )
+{
+    switch( prop.value ) {
+    case _False:
+	strm << prop.name << "FALSE\"";
+	break;
+    case _True:
+	strm << prop.name << "TRUE\"";
+	break;
+    case unset:
+    default:
+	break;
+    }
+    return strm;
+}
+
+/* Be sure to check that each enum is not set to
+   default before streaming it out. Defaults seem
+   to not be in the XML file.
+*/
+QTextStream &operator<<( QTextStream &strm, const EPair &prop )
+{
+    strm << prop.name << prop.value << "\"";
+    return strm;
+}
+
+QTextStream &operator<<( QTextStream &strm, const LPair &prop )
+{
+    strm << prop.name << prop.value << "\"";
+    return strm;
+}
+
+QTextStream &operator<<( QTextStream &strm, const SPair &prop )
+{
+    if ( !prop.value.isEmpty() )
+	strm << prop.name << QString(prop.value).remove("\"") << "\"";
+    return strm;
+}
+
+QTextStream &operator<<( QTextStream &strm, const XPair &prop )
+{
+    if ( !prop.value.isEmpty() ) {
+        QString outText = prop.value.join(prop.sep);
+        strm << prop.name << outText.replace('\"', "&quot;") << "\"";
+    }
+    return strm;
+}
+
+// VCCLCompilerTool -------------------------------------------------
+VCCLCompilerTool::VCCLCompilerTool()
+    :	AssemblerOutput( asmListingNone ),
+	BasicRuntimeChecks( runtimeBasicCheckNone ),
+	BrowseInformation( brInfoNone ),
+	BufferSecurityCheck( _False ),
+	CallingConvention( callConventionDefault ),
+	CompileAs( compileAsDefault ),
+	CompileAsManaged( managedDefault ),
+	CompileOnly( unset ),
+	DebugInformationFormat( debugDisabled ),
+	DefaultCharIsUnsigned( unset ),
+	Detect64BitPortabilityProblems( unset ),
+	DisableLanguageExtensions( unset ),
+	EnableFiberSafeOptimizations( unset ),
+	EnableFunctionLevelLinking( unset ),
+	EnableIntrinsicFunctions( unset ),
+	ExceptionHandling( _False ),
+	ExpandAttributedSource( unset ),
+	FavorSizeOrSpeed( favorNone ),
+	ForceConformanceInForLoopScope( unset ),
+	GeneratePreprocessedFile( preprocessNo ),
+	GlobalOptimizations( unset ),
+	IgnoreStandardIncludePath( unset ),
+	ImproveFloatingPointConsistency( unset ),
+	InlineFunctionExpansion( expandDefault ),
+	KeepComments( unset ),
+	MinimalRebuild( unset ),
+	OmitFramePointers( unset ),
+	OpenMP( unset ),
+	Optimization( optimizeCustom ),
+	OptimizeForProcessor( procOptimizeBlended ),
+	OptimizeForWindowsApplication( unset ),
+	ProgramDataBaseFileName( "" ),
+	RuntimeLibrary( rtSingleThreaded ),
+	RuntimeTypeInfo( unset ),
+	ShowIncludes( unset ),
+	SmallerTypeCheck( unset ),
+	StringPooling( unset ),
+	StructMemberAlignment( alignNotSet ),
+	SuppressStartupBanner( unset ),
+	TreatWChar_tAsBuiltInType( unset ),
+	TurnOffAssemblyGeneration( unset ),
+	UndefineAllPreprocessorDefinitions( unset ),
+	UsePrecompiledHeader( pchNone ),
+	WarnAsError( unset ),
+	WarningLevel( warningLevel_0 ),
+	WholeProgramOptimization( unset ),
+	config( 0 )
+{
+}
+
+/*
+ * Some values for the attribute UsePrecompiledHeader have changed from VS 2003 to VS 2005,
+ * see the following chart, so we need a function that transforms those values if we are
+ * using NET2005:
+ *
+ * Meaning                      2003    2005
+ * -----------------------------------------
+ * Don't use PCH                0       0
+ * Create PCH (/Yc)             1       1
+ * Automatically generate (/YX) 2       (seems that it was removed)
+ * Use specific PCH (/Yu)       3       2
+ *
+ */
+inline pchOption xformUsePrecompiledHeaderForNET2005(pchOption whatPch)
+{
+    DotNET compilerVersion = which_dotnet_version();
+
+    if (compilerVersion == NET2005) {
+        if (whatPch ==  pchGenerateAuto) whatPch = pchNone;
+        if (whatPch ==  pchUseUsingSpecific) whatPch = pchGenerateAuto;
+    }
+    return whatPch;
+}
+
+QTextStream &operator<<( QTextStream &strm, const VCCLCompilerTool &tool )
+{
+    strm << _begTool3;
+    strm << _VCCLCompilerToolName;
+    strm << XPair( _AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
+    strm << XPair( _AdditionalUsingDirectories, tool.AdditionalUsingDirectories );
+    strm << SPair( _AssemblerListingLocation, tool.AssemblerListingLocation );
+    if ( tool.AssemblerOutput != asmListingNone )	    strm << EPair( _AssemblerOutput, tool.AssemblerOutput );
+    if ( tool.BasicRuntimeChecks != runtimeBasicCheckNone ) strm << EPair( _BasicRuntimeChecks, tool.BasicRuntimeChecks );
+    if ( tool.BrowseInformation != brInfoNone )		    strm << EPair( _BrowseInformation, tool.BrowseInformation );
+    strm << SPair( _BrowseInformationFile, tool.BrowseInformationFile );
+    strm << TPair( _BufferSecurityCheck, tool.BufferSecurityCheck );
+    if ( tool.CallingConvention != callConventionDefault )  strm << EPair( _CallingConvention, tool.CallingConvention );
+    if ( tool.CompileAs != compileAsDefault )		    strm << EPair( _CompileAs, tool.CompileAs );
+    if ( tool.CompileAsManaged != managedDefault )	    strm << EPair( _CompileAsManaged, tool.CompileAsManaged );
+    strm << TPair( _CompileOnly, tool.CompileOnly );
+    if ( tool.DebugInformationFormat != debugUnknown )	    strm << EPair( _DebugInformationFormat, tool.DebugInformationFormat );
+    strm << TPair( _DefaultCharIsUnsigned, tool.DefaultCharIsUnsigned );
+    strm << TPair( _Detect64BitPortabilityProblems, tool.Detect64BitPortabilityProblems );
+    strm << TPair( _DisableLanguageExtensions, tool.DisableLanguageExtensions );
+    strm << XPair( _DisableSpecificWarnings, tool.DisableSpecificWarnings );
+    strm << TPair( _EnableFiberSafeOptimizations, tool.EnableFiberSafeOptimizations );
+    strm << TPair( _EnableFunctionLevelLinking, tool.EnableFunctionLevelLinking );
+    strm << TPair( _EnableIntrinsicFunctions, tool.EnableIntrinsicFunctions );
+    strm << TPair( _ExceptionHandling, tool.ExceptionHandling );
+    strm << TPair( _ExpandAttributedSource, tool.ExpandAttributedSource );
+    if ( tool.FavorSizeOrSpeed != favorNone )		    strm << EPair( _FavorSizeOrSpeed, tool.FavorSizeOrSpeed );
+    strm << TPair( _ForceConformanceInForLoopScope, tool.ForceConformanceInForLoopScope );
+    strm << XPair( _ForcedIncludeFiles, tool.ForcedIncludeFiles );
+    strm << XPair( _ForcedUsingFiles, tool.ForcedUsingFiles );
+    if ( tool.GeneratePreprocessedFile != preprocessUnknown)strm << EPair( _GeneratePreprocessedFile, tool.GeneratePreprocessedFile );
+    strm << TPair( _GlobalOptimizations, tool.GlobalOptimizations );
+    strm << TPair( _IgnoreStandardIncludePath, tool.IgnoreStandardIncludePath );
+    strm << TPair( _ImproveFloatingPointConsistency, tool.ImproveFloatingPointConsistency );
+    if ( tool.InlineFunctionExpansion != expandDefault ) strm << EPair( _InlineFunctionExpansion, tool.InlineFunctionExpansion );
+    strm << TPair( _KeepComments, tool.KeepComments );
+    strm << TPair( _MinimalRebuild, tool.MinimalRebuild );
+    strm << SPair( _ObjectFile, tool.ObjectFile );
+    strm << TPair( _OmitFramePointers, tool.OmitFramePointers );
+    if ( tool.Optimization != optimizeDefault ) strm << EPair( _Optimization, tool.Optimization );
+    if ( tool.OptimizeForProcessor != procOptimizeBlended ) strm << EPair( _OptimizeForProcessor, tool.OptimizeForProcessor );
+    strm << TPair( _OptimizeForWindowsApplication, tool.OptimizeForWindowsApplication );
+    strm << SPair( _OutputFile, tool.OutputFile );
+    strm << SPair( _PrecompiledHeaderFile, tool.PrecompiledHeaderFile );
+    strm << SPair( _PrecompiledHeaderThrough, tool.PrecompiledHeaderThrough );
+    strm << XPair( _PreprocessorDefinitions, tool.PreprocessorDefinitions );
+    if ( !tool.ProgramDataBaseFileName.isNull() ) strm << _ProgramDataBaseFileName << tool.ProgramDataBaseFileName.latin1() << "\"";
+    if ( tool.RuntimeLibrary != rtUnknown ) strm << EPair( _RuntimeLibrary, tool.RuntimeLibrary );
+    strm << TPair( _RuntimeTypeInfo, tool.RuntimeTypeInfo );
+    strm << TPair( _OpenMP, tool.OpenMP );
+    strm << TPair( _ShowIncludes, tool.ShowIncludes );
+    strm << TPair( _SmallerTypeCheck, tool.SmallerTypeCheck );
+    strm << TPair( _StringPooling, tool.StringPooling );
+    if ( tool.StructMemberAlignment != alignNotSet )	    strm << EPair( _StructMemberAlignment, tool.StructMemberAlignment );
+    strm << TPair( _SuppressStartupBanner, tool.SuppressStartupBanner );
+    strm << TPair( _TreatWChar_tAsBuiltInType, tool.TreatWChar_tAsBuiltInType );
+    strm << TPair( _TurnOffAssemblyGeneration, tool.TurnOffAssemblyGeneration );
+    strm << TPair( _UndefineAllPreprocessorDefinitions, tool.UndefineAllPreprocessorDefinitions );
+    strm << XPair( _UndefinePreprocessorDefinitions, tool.UndefinePreprocessorDefinitions );
+
+    if ( !tool.PrecompiledHeaderFile.isEmpty() || !tool.PrecompiledHeaderThrough.isEmpty() )
+        strm << EPair( _UsePrecompiledHeader, xformUsePrecompiledHeaderForNET2005(tool.UsePrecompiledHeader) );
+
+    strm << TPair( _WarnAsError, tool.WarnAsError );
+    if ( tool.WarningLevel != warningLevelUnknown ) strm << EPair( _WarningLevel, tool.WarningLevel );
+    strm << TPair( _WholeProgramOptimization, tool.WholeProgramOptimization );
+    strm << "/>";
+return strm;
+}
+
+bool VCCLCompilerTool::parseOption( const char* option )
+{
+    // skip index 0 ('/' or '-')
+    char first  = option[1];
+    char second = option[2];
+    char third  = option[3];
+    char fourth = option[4];
+    bool found = TRUE;
+
+    switch ( first ) {
+    case '?':
+    case 'h':
+	qWarning( "Generator: Option '/?', '/help': MSVC.NET projects do not support outputting help info" );
+	found = FALSE;
+	break;
+    case '@':
+	qWarning( "Generator: Option '/@': MSVC.NET projects do not support the use of a response file" );
+	found = FALSE;
+	break;
+    case 'l':
+	qWarning( "Generator: Option '/link': qmake generator does not support passing link options through the compiler tool" );
+	found = FALSE;
+	break;
+    case 'A':
+	if ( second != 'I' ) {
+	    found = FALSE; break;
+	}
+	AdditionalUsingDirectories += option+3;
+	break;
+    case 'C':
+	KeepComments = _True;
+	break;
+    case 'D':
+	PreprocessorDefinitions += option+2;
+	break;
+    case 'E':
+	if ( second == 'H' ) {
+	    if ( third == 'a'
+	    	|| (third == 'c' && fourth != 's')
+	    	|| (third == 's' && fourth != 'c') ) {
+		// ExceptionHandling must be false, or it will override
+		// with an /EHsc option
+		ExceptionHandling = _False;
+		AdditionalOptions += option;
+		break;
+	    } else if ( (third == 'c' && fourth == 's')
+		     || (third == 's' && fourth == 'c') ) {
+		ExceptionHandling = _True;
+		AdditionalOptions += option;
+		break;
+	    }
+	    found = FALSE; break;
+	}
+	GeneratePreprocessedFile = preprocessYes;
+	break;
+    case 'F':
+	if ( second <= '9' && second >= '0' ) {
+	    AdditionalOptions += option;
+	    break;
+	} else {
+	    switch ( second ) {
+	    case 'A':
+		if ( third == 'c' ) {
+		    AssemblerOutput = asmListingAsmMachine;
+		    if ( fourth == 's' )
+			AssemblerOutput = asmListingAsmMachineSrc;
+		} else if ( third == 's' ) {
+		    AssemblerOutput = asmListingAsmSrc;
+		} else {
+		    AssemblerOutput = asmListingAssemblyOnly;
+		}
+		break;
+	    case 'a':
+		AssemblerListingLocation = option+3;
+		break;
+	    case 'I':
+		ForcedIncludeFiles += option+3;
+		break;
+	    case 'R':
+		BrowseInformation = brAllInfo;
+		BrowseInformationFile = option+3;
+		break;
+	    case 'r':
+		BrowseInformation = brNoLocalSymbols;
+		BrowseInformationFile = option+3;
+		break;
+	    case 'U':
+		ForcedUsingFiles += option+3;
+		break;
+	    case 'd':
+		ProgramDataBaseFileName = option+3;
+		break;
+	    case 'e':
+		OutputFile = option+3;
+		break;
+	    case 'm':
+		AdditionalOptions += option;
+		break;
+	    case 'o':
+		ObjectFile = option+3;
+		break;
+	    case 'p':
+		PrecompiledHeaderFile = option+3;
+		break;
+	    case 'x':
+		ExpandAttributedSource = _True;
+		break;
+	    default:
+		found = FALSE; break;
+	    }
+	}
+	break;
+    case 'G':
+	switch ( second ) {
+	case '3':
+	case '4':
+	    qWarning( "Option '/G3' and '/G4' were phased out in Visual C++ 5.0" );
+	    found = FALSE; break;
+        case '5':
+	    OptimizeForProcessor = procOptimizePentium;
+	    break;
+	case '6':
+	case 'B':
+	    OptimizeForProcessor = procOptimizePentiumProAndAbove;
+	    break;
+	case 'A':
+	    OptimizeForWindowsApplication = _True;
+	    break;
+	case 'F':
+	    StringPooling = _True;
+	    break;
+	case 'H':
+	    AdditionalOptions += option;
+	    break;
+	case 'L':
+	    WholeProgramOptimization = _True;
+	    if ( third == '-' )
+		WholeProgramOptimization = _False;
+	    break;
+	case 'R':
+	    RuntimeTypeInfo = _True;
+	    if ( third == '-' )
+		RuntimeTypeInfo = _False;
+	    break;
+        case 'S':
+	    BufferSecurityCheck = _True;
+	    break;
+	case 'T':
+	    EnableFiberSafeOptimizations = _True;
+	    break;
+	case 'X':
+	    // ExceptionHandling == true will override with
+	    // an /EHsc option, which is correct with /GX
+	    ExceptionHandling = _True; // Fall-through
+	case 'Z':
+	case 'e':
+	case 'h':
+	    AdditionalOptions += option;
+	    break;
+	case 'd':
+	    CallingConvention = callConventionCDecl;
+	    break;
+	case 'f':
+	    StringPooling = _True;
+	    AdditionalOptions += option;
+	    break;
+	case 'm':
+	    MinimalRebuild = _True;
+	    if ( third == '-' )
+		MinimalRebuild = _False;
+	    break;
+	case 'r':
+	    CallingConvention = callConventionFastCall;
+	    break;
+	case 's':
+	    // Warning: following [num] is not used,
+	    // were should we put it?
+	    BufferSecurityCheck = _True;
+	    break;
+	case 'y':
+	    EnableFunctionLevelLinking = _True;
+	    break;
+	case 'z':
+	    CallingConvention = callConventionStdCall;
+	    break;
+	default:
+	    found = FALSE; break;
+	}
+	break;
+    case 'H':
+	AdditionalOptions += option;
+	break;
+    case 'I':
+	AdditionalIncludeDirectories += option+2;
+	break;
+    case 'L':
+	if ( second == 'D' ) {
+	    AdditionalOptions += option;
+	    break;
+	}
+	found = FALSE; break;
+    case 'M':
+	if ( second == 'D' ) {
+	    RuntimeLibrary = rtMultiThreadedDLL;
+	    if ( third == 'd' )
+		RuntimeLibrary = rtMultiThreadedDebugDLL;
+	    break;
+	} else if ( second == 'L' ) {
+	    RuntimeLibrary = rtSingleThreaded;
+	    if ( third == 'd' )
+		RuntimeLibrary = rtSingleThreadedDebug;
+	    break;
+	} else if ( second == 'T' ) {
+	    RuntimeLibrary = rtMultiThreaded;
+	    if ( third == 'd' )
+		RuntimeLibrary = rtMultiThreadedDebug;
+	    break;
+	}
+	found = FALSE; break;
+    case 'O':
+	switch ( second ) {
+	case '1':
+	    Optimization = optimizeMinSpace;
+	    break;
+	case '2':
+	    Optimization = optimizeMaxSpeed;
+	    break;
+	case 'a':
+	    AdditionalOptions += option;
+	    break;
+	case 'b':
+	    if ( third == '0' )
+		InlineFunctionExpansion = expandDisable;
+	    else if ( third == '1' )
+		InlineFunctionExpansion = expandOnlyInline;
+	    else if ( third == '2' )
+		InlineFunctionExpansion = expandAnySuitable;
+	    else
+		found = FALSE;
+	    break;
+	case 'd':
+	    Optimization = optimizeDisabled;
+	    break;
+	case 'g':
+	    GlobalOptimizations = _True;
+	    break;
+	case 'i':
+	    EnableIntrinsicFunctions = _True;
+	    break;
+	case 'p':
+	    ImproveFloatingPointConsistency = _True;
+	    if ( third == '-' )
+		ImproveFloatingPointConsistency = _False;
+	    break;
+	case 's':
+	    FavorSizeOrSpeed = favorSize;
+	    break;
+	case 't':
+	    FavorSizeOrSpeed = favorSpeed;
+	    break;
+	case 'w':
+	    AdditionalOptions += option;
+	    break;
+	case 'x':
+	    Optimization = optimizeFull;
+	    break;
+	case 'y':
+	    OmitFramePointers = _True;
+	    if ( third == '-' )
+		OmitFramePointers = _False;
+	    break;
+	default:
+	    found = FALSE; break;
+	}
+	break;
+    case 'P':
+	GeneratePreprocessedFile = preprocessYes;
+	break;
+    case 'Q':
+	if ( second == 'I' ) {
+	    AdditionalOptions += option;
+	    break;
+	}
+	found = FALSE; break;
+    case 'R':
+	if ( second == 'T' && third == 'C' ) {
+	    if ( fourth == '1' )
+		BasicRuntimeChecks = runtimeBasicCheckAll;
+	    else if ( fourth == 'c' )
+		SmallerTypeCheck = _True;
+	    else if ( fourth == 's' )
+		BasicRuntimeChecks = runtimeCheckStackFrame;
+	    else if ( fourth == 'u' )
+		BasicRuntimeChecks = runtimeCheckUninitVariables;
+	    else
+		found = FALSE; break;
+	}
+	break;
+    case 'T':
+	if ( second == 'C' ) {
+	    CompileAs = compileAsC;
+	} else if ( second == 'P' ) {
+	    CompileAs = compileAsCPlusPlus;
+	} else {
+	    qWarning( "Generator: Options '/Tp<filename>' and '/Tc<filename>' are not supported by qmake" );
+	    found = FALSE; break;
+	}
+	break;
+    case 'U':
+	UndefinePreprocessorDefinitions += option+2;
+	break;
+    case 'V':
+	AdditionalOptions += option;
+	break;
+    case 'W':
+	switch ( second ) {
+	case 'a':
+	case '4':
+	    WarningLevel = warningLevel_4;
+	    break;
+	case '3':
+	    WarningLevel = warningLevel_3;
+	    break;
+	case '2':
+	    WarningLevel = warningLevel_2;
+	    break;
+	case '1':
+	    WarningLevel = warningLevel_1;
+	    break;
+	case '0':
+	    WarningLevel = warningLevel_0;
+	    break;
+	case 'L':
+	    AdditionalOptions += option;
+	    break;
+	case 'X':
+	    WarnAsError = _True;
+	    break;
+	case 'p':
+	    if ( third == '6' && fourth == '4' ) {
+		Detect64BitPortabilityProblems = _True;
+		break;
+	    }
+	    // Fallthrough
+	default:
+	    found = FALSE; break;
+	}
+	break;
+    case 'X':
+	IgnoreStandardIncludePath = _True;
+	break;
+    case 'Y':
+	switch ( second ) {
+	case '\0':
+	case '-':
+	    AdditionalOptions += option;
+	    break;
+	case 'X':
+	    UsePrecompiledHeader = pchGenerateAuto;
+	    PrecompiledHeaderFile = option+3;
+	    break;
+	case 'c':
+	    UsePrecompiledHeader = pchCreateUsingSpecific;
+	    PrecompiledHeaderFile = option+3;
+	    break;
+	case 'd':
+	case 'l':
+	    AdditionalOptions =+ option;
+	    break;
+	case 'u':
+	    UsePrecompiledHeader = pchUseUsingSpecific;
+	    PrecompiledHeaderFile = option+3;
+	    break;
+	default:
+	    found = FALSE; break;
+	}
+	break;
+    case 'Z':
+	switch ( second ) {
+	case '7':
+	    DebugInformationFormat = debugOldStyleInfo;
+	    break;
+	case 'I':
+	    DebugInformationFormat = debugEditAndContinue;
+	    break;
+	case 'd':
+	    DebugInformationFormat = debugLineInfoOnly;
+	    break;
+	case 'i':
+	    DebugInformationFormat = debugEnabled;
+	    break;
+	case 'l':
+	    DebugInformationFormat = debugEditAndContinue;
+	    break;
+	case 'a':
+	    DisableLanguageExtensions = _True;
+	    break;
+	case 'e':
+	    DisableLanguageExtensions = _False;
+	    break;
+	case 'c':
+	    if ( third == ':' ) {
+		if ( fourth == 'f' )
+		    ForceConformanceInForLoopScope = _True;
+		else if ( fourth == 'w' )
+		    TreatWChar_tAsBuiltInType = _True;
+		else
+		    found = FALSE;
+	    } else {
+		found = FALSE; break;
+	    }
+	    break;
+	case 'g':
+	case 'm':
+	case 's':
+	    AdditionalOptions += option;
+	    break;
+	case 'p':
+	    switch ( third )
+	    {
+	    case '\0':
+	    case '1':
+		StructMemberAlignment = alignSingleByte;
+		if ( fourth == '6' )
+		    StructMemberAlignment = alignSixteenBytes;
+		break;
+	    case '2':
+		StructMemberAlignment = alignTwoBytes;
+		break;
+	    case '4':
+		StructMemberAlignment = alignFourBytes;
+		break;
+	    case '8':
+		StructMemberAlignment = alignEightBytes;
+		break;
+	    default:
+		found = FALSE; break;
+	    }
+	    break;
+	default:
+	    found = FALSE; break;
+	}
+	break;
+    case 'c':
+	if ( second == '\0' ) {
+	    CompileOnly = _True;
+	} else if ( second == 'l' ) {
+	    if ( *(option+5) == 'n' ) {
+		CompileAsManaged = managedAssembly;
+		TurnOffAssemblyGeneration = _True;
+	    } else {
+		CompileAsManaged = managedAssembly;
+	    }
+	} else {
+	    found = FALSE; break;
+	}
+	break;
+    case 'd':
+	if ( second != 'r' ) {
+	    found = FALSE; break;
+	}
+        CompileAsManaged = managedAssembly;
+	break;
+    case 'n':
+	if ( second == 'o' && third == 'B' && fourth == 'o' ) {
+	    AdditionalOptions += "/noBool";
+	    break;
+	}
+	if ( second == 'o' && third == 'l' && fourth == 'o' ) {
+	    SuppressStartupBanner = _True;
+	    break;
+	}
+	found = FALSE; break;
+    case 'o':
+        if ( second == 'p' && third == 'e' && fourth == 'n' ) {
+            OpenMP = _True;
+            break;
+        }
+	found = FALSE; break;
+    case 's':
+	if ( second == 'h' && third == 'o' && fourth == 'w' ) {
+	    ShowIncludes = _True;
+	    break;
+	}
+	found = FALSE; break;
+    case 'u':
+	UndefineAllPreprocessorDefinitions = _True;
+	break;
+    case 'v':
+	if ( second == 'd' || second == 'm' ) {
+	    AdditionalOptions += option;
+	    break;
+	}
+	found = FALSE; break;
+    case 'w':
+	switch ( second ) {
+	case '\0':
+	    WarningLevel = warningLevel_0;
+	    break;
+	case 'd':
+	    DisableSpecificWarnings += option+3;
+	    break;
+	default:
+	    AdditionalOptions += option;
+	}
+	break;
+    default:
+	found = FALSE; break;
+    }
+    if( !found )
+	warn_msg( WarnLogic, "Could not parse Compiler option: %s", option );
+    return TRUE;
+}
+
+// VCLinkerTool -----------------------------------------------------
+VCLinkerTool::VCLinkerTool()
+    :	EnableCOMDATFolding( optFoldingDefault ),
+	GenerateDebugInformation( unset ),
+	GenerateMapFile( unset ),
+	HeapCommitSize( -1 ),
+	HeapReserveSize( -1 ),
+	IgnoreAllDefaultLibraries( unset ),
+	IgnoreEmbeddedIDL( unset ),
+	IgnoreImportLibrary( _True ),
+	LargeAddressAware( addrAwareDefault ),
+	LinkDLL( unset ),
+	LinkIncremental( linkIncrementalDefault ),
+	LinkTimeCodeGeneration( unset ),
+	MapExports( unset ),
+	MapLines( unset ),
+	OptimizeForWindows98( optWin98Default ),
+	OptimizeReferences( optReferencesDefault ),
+	RegisterOutput( unset ),
+	ResourceOnlyDLL( unset ),
+	SetChecksum( unset ),
+	ShowProgress( linkProgressNotSet ),
+	StackCommitSize( -1 ),
+	StackReserveSize( -1 ),
+	SubSystem( subSystemNotSet ),
+	SupportUnloadOfDelayLoadedDLL( unset ),
+	SuppressStartupBanner( unset ),
+	SwapRunFromCD( unset ),
+	SwapRunFromNet( unset ),
+	TargetMachine( machineNotSet ),
+	TerminalServerAware( termSvrAwareDefault ),
+	TurnOffAssemblyGeneration( unset ),
+	TypeLibraryResourceID( 0 )
+{
+}
+
+QTextStream &operator<<( QTextStream &strm, const VCLinkerTool &tool )
+{
+    strm << _begTool3;
+    strm << _VCLinkerToolName;
+    strm << XPair( _AdditionalDependencies4, tool.AdditionalDependencies, " " );
+    strm << XPair( _AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
+    strm << XPair( _AddModuleNamesToAssembly, tool.AddModuleNamesToAssembly );
+    strm << SPair( _BaseAddress, tool.BaseAddress );
+    strm << XPair( _DelayLoadDLLs, tool.DelayLoadDLLs );
+    if ( tool.EnableCOMDATFolding != optFoldingDefault )    strm << EPair( _EnableCOMDATFolding, tool.EnableCOMDATFolding );
+    strm << SPair( _EntryPointSymbol, tool.EntryPointSymbol );
+    strm << XPair( _ForceSymbolReferences, tool.ForceSymbolReferences );
+    strm << SPair( _FunctionOrder, tool.FunctionOrder );
+    strm << TPair( _GenerateDebugInformation, tool.GenerateDebugInformation );
+    strm << TPair( _GenerateMapFile, tool.GenerateMapFile );
+    if ( tool.HeapCommitSize != -1 )			    strm << LPair( _HeapCommitSize, tool.HeapCommitSize );
+    if ( tool.HeapReserveSize != -1 )			    strm << LPair( _HeapReserveSize, tool.HeapReserveSize );
+    strm << TPair( _IgnoreAllDefaultLibraries, tool.IgnoreAllDefaultLibraries );
+    strm << XPair( _IgnoreDefaultLibraryNames, tool.IgnoreDefaultLibraryNames );
+    strm << TPair( _IgnoreEmbeddedIDL, tool.IgnoreEmbeddedIDL );
+    strm << TPair( _IgnoreImportLibrary, tool.IgnoreImportLibrary );
+    strm << SPair( _ImportLibrary, tool.ImportLibrary );
+    if ( tool.LargeAddressAware != addrAwareDefault )	    strm << EPair( _LargeAddressAware, tool.LargeAddressAware );
+    strm << TPair( _LinkDLL, tool.LinkDLL );
+    if ( tool.LinkIncremental != linkIncrementalDefault )   strm << EPair( _LinkIncremental, tool.LinkIncremental );
+    strm << TPair( _LinkTimeCodeGeneration, tool.LinkTimeCodeGeneration );
+    strm << SPair( _LinkToManagedResourceFile, tool.LinkToManagedResourceFile );
+    strm << TPair( _MapExports, tool.MapExports );
+    strm << SPair( _MapFileName, tool.MapFileName );
+    strm << TPair( _MapLines, tool.MapLines );
+    strm << SPair( _MergedIDLBaseFileName, tool.MergedIDLBaseFileName );
+    strm << SPair( _MergeSections, tool.MergeSections );
+    strm << SPair( _MidlCommandFile, tool.MidlCommandFile );
+    strm << SPair( _ModuleDefinitionFile, tool.ModuleDefinitionFile );
+    if ( tool.OptimizeForWindows98 != optWin98Default )	    strm << EPair( _OptimizeForWindows98, tool.OptimizeForWindows98 );
+    if ( tool.OptimizeReferences != optReferencesDefault )  strm << EPair( _OptimizeReferences, tool.OptimizeReferences );
+    strm << SPair( _OutputFile, tool.OutputFile );
+    strm << _ProgramDatabaseFile << tool.ProgramDatabaseFile << "\"";
+    strm << TPair( _RegisterOutput, tool.RegisterOutput );
+    strm << TPair( _ResourceOnlyDLL, tool.ResourceOnlyDLL );
+    strm << TPair( _SetChecksum, tool.SetChecksum );
+    if ( tool.ShowProgress != linkProgressNotSet )	    strm << EPair( _ShowProgress, tool.ShowProgress );
+    if ( tool.StackCommitSize != -1 )			    strm << LPair( _StackCommitSize, tool.StackCommitSize );
+    if ( tool.StackReserveSize != -1 )			    strm << LPair( _StackReserveSize, tool.StackReserveSize );
+    strm << SPair( _StripPrivateSymbols, tool.StripPrivateSymbols );
+    strm << EPair( _SubSystem, tool.SubSystem );
+    strm << TPair( _SupportUnloadOfDelayLoadedDLL, tool.SupportUnloadOfDelayLoadedDLL );
+    strm << TPair( _SuppressStartupBanner, tool.SuppressStartupBanner );
+    strm << TPair( _SwapRunFromCD, tool.SwapRunFromCD );
+    strm << TPair( _SwapRunFromNet, tool.SwapRunFromNet );
+    if ( tool.TargetMachine != machineNotSet )		    strm << EPair( _TargetMachine, tool.TargetMachine );
+    if ( tool.TerminalServerAware != termSvrAwareDefault )  strm << EPair( _TerminalServerAware, tool.TerminalServerAware );
+    strm << TPair( _TurnOffAssemblyGeneration, tool.TurnOffAssemblyGeneration );
+    strm << SPair( _TypeLibraryFile, tool.TypeLibraryFile );
+    if ( tool.TypeLibraryResourceID != rcUseDefault ) strm << LPair( _TypeLibraryResourceID, tool.TypeLibraryResourceID );
+    strm << SPair( _Version4, tool.Version );
+    strm << "/>";
+    return strm;
+}
+
+// Hashing routine to do fast option lookups ----
+// Slightly rewritten to stop on ':' ',' and '\0'
+// Original routine in qtranslator.cpp ----------
+static uint elfHash( const char* name )
+{
+    const uchar *k;
+    uint h = 0;
+    uint g;
+
+    if ( name ) {
+	k = (const uchar *) name;
+	while ( (*k) &&
+		(*k)!= ':' &&
+		(*k)!=',' &&
+		(*k)!=' ' ) {
+	    h = ( h << 4 ) + *k++;
+	    if ( (g = (h & 0xf0000000)) != 0 )
+		h ^= g >> 24;
+	    h &= ~g;
+	}
+    }
+    if ( !h )
+	h = 1;
+    return h;
+}
+
+//#define USE_DISPLAY_HASH
+#ifdef USE_DISPLAY_HASH
+static void displayHash( const char* str )
+{
+    printf( "case 0x%07x: // %s\n    break;\n", elfHash(str), str );
+}
+#endif
+
+bool VCLinkerTool::parseOption( const char* option )
+{
+#ifdef USE_DISPLAY_HASH
+    // Main options
+    displayHash( "/ALIGN" ); displayHash( "/ALLOWBIND" ); displayHash( "/ASSEMBLYMODULE" );
+    displayHash( "/ASSEMBLYRESOURCE" ); displayHash( "/BASE" ); displayHash( "/DEBUG" );
+    displayHash( "/DEF" ); displayHash( "/DEFAULTLIB" ); displayHash( "/DELAY" );
+    displayHash( "/DELAYLOAD" ); displayHash( "/DLL" ); displayHash( "/DRIVER" );
+    displayHash( "/ENTRY" ); displayHash( "/EXETYPE" ); displayHash( "/EXPORT" );
+    displayHash( "/FIXED" ); displayHash( "/FORCE" ); displayHash( "/HEAP" );
+    displayHash( "/IDLOUT" ); displayHash( "/IGNOREIDL" ); displayHash( "/IMPLIB" );
+    displayHash( "/INCLUDE" ); displayHash( "/INCREMENTAL" ); displayHash( "/LARGEADDRESSAWARE" );
+    displayHash( "/LIBPATH" ); displayHash( "/LTCG" ); displayHash( "/MACHINE" );
+    displayHash( "/MAP" ); displayHash( "/MAPINFO" ); displayHash( "/MERGE" );
+    displayHash( "/MIDL" ); displayHash( "/NOASSEMBLY" ); displayHash( "/NODEFAULTLIB" );
+    displayHash( "/NOENTRY" ); displayHash( "/NOLOGO" ); displayHash( "/OPT" );
+    displayHash( "/ORDER" ); displayHash( "/OUT" ); displayHash( "/PDB" );
+    displayHash( "/PDBSTRIPPED" ); displayHash( "/RELEASE" ); displayHash( "/SECTION" );
+    displayHash( "/STACK" ); displayHash( "/STUB" ); displayHash( "/SUBSYSTEM" );
+    displayHash( "/SWAPRUN" ); displayHash( "/TLBID" ); displayHash( "/TLBOUT" );
+    displayHash( "/TSAWARE" ); displayHash( "/VERBOSE" ); displayHash( "/VERSION" );
+    displayHash( "/VXD" ); displayHash( "/WS " );
+#endif
+#ifdef USE_DISPLAY_HASH
+    // Sub options
+    displayHash( "UNLOAD" ); displayHash( "NOBIND" ); displayHash( "no" ); displayHash( "NOSTATUS" ); displayHash( "STATUS" );
+    displayHash( "AM33" ); displayHash( "ARM" ); displayHash( "CEE" ); displayHash( "IA64" ); displayHash( "X86" ); displayHash( "M32R" );
+    displayHash( "MIPS" ); displayHash( "MIPS16" ); displayHash( "MIPSFPU" ); displayHash( "MIPSFPU16" ); displayHash( "MIPSR41XX" ); displayHash( "PPC" );
+    displayHash( "SH3" ); displayHash( "SH4" ); displayHash( "SH5" ); displayHash( "THUMB" ); displayHash( "TRICORE" ); displayHash( "EXPORTS" );
+    displayHash( "LINES" ); displayHash( "REF" ); displayHash( "NOREF" ); displayHash( "ICF" ); displayHash( "WIN98" ); displayHash( "NOWIN98" );
+    displayHash( "CONSOLE" ); displayHash( "EFI_APPLICATION" ); displayHash( "EFI_BOOT_SERVICE_DRIVER" ); displayHash( "EFI_ROM" ); displayHash( "EFI_RUNTIME_DRIVER" ); displayHash( "NATIVE" );
+    displayHash( "POSIX" ); displayHash( "WINDOWS" ); displayHash( "WINDOWSCE" ); displayHash( "NET" ); displayHash( "CD" ); displayHash( "NO" );
+#endif
+    bool found = TRUE;
+    switch ( elfHash(option) ) {
+    case 0x3360dbe: // /ALIGN[:number]
+    case 0x1485c34: // /ALLOWBIND[:NO]
+    case 0x6b21972: // /DEFAULTLIB:library
+    case 0x396ea92: // /DRIVER[:UPONLY | :WDM]
+    case 0xaca9d75: // /EXETYPE[:DYNAMIC | :DEV386]
+    case 0x3ad5444: // /EXPORT:entryname[,@ordinal[,NONAME]][,DATA]
+    case 0x33aec94: // /FIXED[:NO]
+    case 0x33b4675: // /FORCE:[MULTIPLE|UNRESOLVED]
+    case 0x7988f7e: // /SECTION:name,[E][R][W][S][D][K][L][P][X][,ALIGN=#]
+    case 0x0348992: // /STUB:filename
+    case 0x0034bc4: // /VXD
+    case 0x0034c50: // /WS
+	AdditionalOptions += option;
+	break;
+    case 0x679c075: // /ASSEMBLYMODULE:filename
+	AddModuleNamesToAssembly += option+15;
+	break;
+    case 0x062d065: // /ASSEMBLYRESOURCE:filename
+	LinkToManagedResourceFile = option+18;
+	break;
+    case 0x0336675: // /BASE:{address | @filename,key}
+	// Do we need to do a manual lookup when '@filename,key'?
+	// Seems BaseAddress only can contain the location...
+	// We don't use it in Qt, so keep it simple for now
+	BaseAddress = option+6;
+	break;
+    case 0x3389797: // /DEBUG
+	GenerateDebugInformation = _True;
+	break;
+    case 0x0033896: // /DEF:filename
+	ModuleDefinitionFile = option+5;
+	break;
+    case 0x338a069: // /DELAY:{UNLOAD | NOBIND}
+	// MS documentation does not specify what to do with
+	// this option, so we'll put it in AdditionalOptions
+	AdditionalOptions += option;
+	break;
+    case 0x06f4bf4: // /DELAYLOAD:dllname
+	DelayLoadDLLs += option+11;
+	break;
+    // case 0x003390c: // /DLL
+    // This option is not used for vcproj files
+    //	break;
+    case 0x33a3979: // /ENTRY:function
+	EntryPointSymbol = option+7;
+	break;
+    case 0x033c960: // /HEAP:reserve[,commit]
+	{
+	    QStringList both = QStringList::split( ",", option+6 );
+	    HeapReserveSize = both[0].toLong();
+	    if ( both.count() == 2 )
+		HeapCommitSize = both[1].toLong();
+	}
+	break;
+    case 0x3d91494: // /IDLOUT:[path\]filename
+	MergedIDLBaseFileName = option+8;
+	break;
+    case 0x345a04c: // /IGNOREIDL
+	IgnoreEmbeddedIDL = _True;
+	break;
+    case 0x3e250e2: // /IMPLIB:filename
+	ImportLibrary = option+8;
+	break;
+    case 0xe281ab5: // /INCLUDE:symbol
+	ForceSymbolReferences += option+9;
+	break;
+    case 0xb28103c: // /INCREMENTAL[:no]
+	if ( *(option+12) == ':' &&
+	     *(option+13) == 'n' )
+	    LinkIncremental = linkIncrementalNo;
+	else
+	    LinkIncremental = linkIncrementalYes;
+	break;
+    case 0x26e4675: // /LARGEADDRESSAWARE[:no]
+	if ( *(option+18) == ':' &&
+	     *(option+19) == 'n' )
+	    LargeAddressAware = addrAwareNoLarge;
+	else
+	    LargeAddressAware = addrAwareLarge;
+	break;
+    case 0x0d745c8: // /LIBPATH:dir
+	AdditionalLibraryDirectories += option+9;
+	break;
+    case 0x0341877: // /LTCG[:NOSTATUS|:STATUS]
+	config->WholeProgramOptimization = _True;
+	LinkTimeCodeGeneration = _True;
+	if ( *(option+5) == ':' &&
+	     *(option+6) == 'S' )
+	     ShowProgress = linkProgressAll;
+	break;
+    case 0x157cf65: // /MACHINE:{AM33|ARM|CEE|IA64|X86|M32R|MIPS|MIPS16|MIPSFPU|MIPSFPU16|MIPSR41XX|PPC|SH3|SH4|SH5|THUMB|TRICORE}
+	switch ( elfHash(option+9) ) {
+	    // Very limited documentation on all options but X86,
+	    // so we put the others in AdditionalOptions...
+	case 0x0046063: // AM33
+	case 0x000466d: // ARM
+	case 0x0004795: // CEE
+	case 0x004d494: // IA64
+	case 0x0050672: // M32R
+	case 0x0051e53: // MIPS
+	case 0x51e5646: // MIPS16
+	case 0x1e57b05: // MIPSFPU
+	case 0x57b09a6: // MIPSFPU16
+	case 0x5852738: // MIPSR41XX
+	case 0x0005543: // PPC
+	case 0x00057b3: // SH3
+	case 0x00057b4: // SH4
+	case 0x00057b5: // SH5
+	case 0x058da12: // THUMB
+	case 0x96d8435: // TRICORE
+	    AdditionalOptions += option;
+	    break;
+	case 0x0005bb6: // X86
+	    TargetMachine = machineX86;
+	    break;
+	default:
+	    found = FALSE;
+	}
+	break;
+    case 0x0034160: // /MAP[:filename]
+	GenerateMapFile = _True;
+	MapFileName = option+5;
+	break;
+    case 0x164e1ef: // /MAPINFO:{EXPORTS|LINES}
+	if ( *(option+9) == 'E' )
+	    MapExports = _True;
+	else if ( *(option+9) == 'L' )
+	    MapLines = _True;
+	break;
+    case 0x341a6b5: // /MERGE:from=to
+	MergeSections = option+7;
+	break;
+    case 0x0341d8c: // /MIDL:@file
+	MidlCommandFile = option+7;
+	break;
+    case 0x84e2679: // /NOASSEMBLY
+	TurnOffAssemblyGeneration = _True;
+	break;
+    case 0x2b21942: // /NODEFAULTLIB[:library]
+	if ( *(option+13) == '\0' )
+	    IgnoreAllDefaultLibraries = _True;
+	else
+	    IgnoreDefaultLibraryNames += option+14;
+	break;
+    case 0x33a3a39: // /NOENTRY
+	ResourceOnlyDLL = _True;
+	break;
+    case 0x434138f: // /NOLOGO
+	SuppressStartupBanner = _True;
+	break;
+    case 0x0034454: // /OPT:{REF | NOREF | ICF[=iterations] | NOICF | WIN98 | NOWIN98}
+	{
+	    char third = *(option+7);
+	    switch ( third ) {
+	    case 'F': // REF
+		if ( *(option+5) == 'R' ) {
+		    OptimizeReferences = optReferences;
+		} else { // ICF[=iterations]
+		    EnableCOMDATFolding = optFolding;
+		    // [=iterations] case is not documented
+		}
+		break;
+	    case 'R': // NOREF
+		OptimizeReferences = optNoReferences;
+		break;
+	    case 'I': // NOICF
+		EnableCOMDATFolding = optNoFolding;
+		break;
+	    case 'N': // WIN98
+		OptimizeForWindows98 = optWin98Yes;
+		break;
+	    case 'W': // NOWIN98
+		OptimizeForWindows98 = optWin98No;
+		break;
+	    default:
+		found = FALSE;
+	    }
+	}
+	break;
+    case 0x34468a2: // /ORDER:@filename
+	FunctionOrder = option+8;
+	break;
+    case 0x00344a4: // /OUT:filename
+	OutputFile = option+5;
+	break;
+    case 0x0034482: // /PDB:filename
+	ProgramDatabaseFile = option+5;
+	break;
+    case 0xa2ad314: // /PDBSTRIPPED:pdb_file_name
+	StripPrivateSymbols = option+13;
+	break;
+    case 0x6a09535: // /RELEASE
+	SetChecksum = _True;
+	break;
+    case 0x348857b: // /STACK:reserve[,commit]
+	{
+	    QStringList both = QStringList::split( ",", option+7 );
+	    StackReserveSize = both[0].toLong();
+	    if ( both.count() == 2 )
+		StackCommitSize = both[1].toLong();
+	}
+	break;
+    case 0x78dc00d: // /SUBSYSTEM:{CONSOLE|EFI_APPLICATION|EFI_BOOT_SERVICE_DRIVER|EFI_ROM|EFI_RUNTIME_DRIVER|NATIVE|POSIX|WINDOWS|WINDOWSCE}[,major[.minor]]
+	{
+	    // Split up in subsystem, and version number
+	    QStringList both = QStringList::split( ",", option+11 );
+	    switch ( elfHash(both[0].latin1()) ) {
+	    case 0x8438445: // CONSOLE
+		SubSystem = subSystemConsole;
+		break;
+	    case 0xbe29493: // WINDOWS
+		SubSystem = subSystemWindows;
+		break;
+	    // The following are undocumented, so add them to AdditionalOptions
+	    case 0x240949e: // EFI_APPLICATION
+	    case 0xe617652: // EFI_BOOT_SERVICE_DRIVER
+	    case 0x9af477d: // EFI_ROM
+	    case 0xd34df42: // EFI_RUNTIME_DRIVER
+	    case 0x5268ea5: // NATIVE
+	    case 0x05547e8: // POSIX
+	    case 0x2949c95: // WINDOWSCE
+		AdditionalOptions += option;
+		break;
+	    default:
+		found = FALSE;
+	    }
+	}
+	break;
+    case 0x8b654de: // /SWAPRUN:{NET | CD}
+	if ( *(option+9) == 'N' )
+	    SwapRunFromNet = _True;
+	else if ( *(option+9) == 'C' )
+	    SwapRunFromCD = _True;
+	else
+	    found = FALSE;
+	break;
+    case 0x34906d4: // /TLBID:id
+	TypeLibraryResourceID = QString( option+7 ).toLong();
+	break;
+    case 0x4907494: // /TLBOUT:[path\]filename
+	TypeLibraryFile = option+8;
+	break;
+    case 0x976b525: // /TSAWARE[:NO]
+	if ( *(option+8) == ':' )
+	    TerminalServerAware = termSvrAwareNo;
+	else
+	    TerminalServerAware = termSvrAwareYes;
+	break;
+    case 0xaa67735: // /VERBOSE[:lib]
+	if ( *(option+9) == ':' ) {
+	    ShowProgress = linkProgressLibs;
+	    AdditionalOptions += option;
+	} else {
+	    ShowProgress = linkProgressAll;
+	}
+	break;
+    case 0xaa77f7e: // /VERSION:major[.minor]
+	Version = option+9;
+	break;
+    default:
+	found = FALSE;
+    }
+    if( !found )
+	warn_msg( WarnLogic, "Could not parse Linker options: %s", option );
+    return found;
+}
+
+// VCMIDLTool -------------------------------------------------------
+VCMIDLTool::VCMIDLTool()
+    :	DefaultCharType( midlCharUnsigned ),
+	EnableErrorChecks( midlDisableAll ),
+	ErrorCheckAllocations( unset ),
+	ErrorCheckBounds( unset ),
+	ErrorCheckEnumRange( unset ),
+	ErrorCheckRefPointers( unset ),
+	ErrorCheckStubData( unset ),
+	GenerateStublessProxies( unset ),
+	GenerateTypeLibrary( unset ),
+	IgnoreStandardIncludePath( unset ),
+	MkTypLibCompatible( unset ),
+	StructMemberAlignment( midlAlignNotSet ),
+	SuppressStartupBanner( unset ),
+	TargetEnvironment( midlTargetNotSet ),
+	ValidateParameters( unset ),
+	WarnAsError( unset ),
+	WarningLevel( midlWarningLevel_0 )
+{
+}
+
+QTextStream &operator<<( QTextStream &strm, const VCMIDLTool &tool )
+{
+    strm << _begTool3;
+    strm << _VCMIDLToolName;
+    strm << XPair( _AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
+    strm << XPair( _CPreprocessOptions, tool.CPreprocessOptions );
+    strm << EPair( _DefaultCharType, tool.DefaultCharType );
+    strm << SPair( _DLLDataFileName, tool.DLLDataFileName );
+    strm << EPair( _EnableErrorChecks, tool.EnableErrorChecks );
+    strm << TPair( _ErrorCheckAllocations, tool.ErrorCheckAllocations );
+    strm << TPair( _ErrorCheckBounds, tool.ErrorCheckBounds );
+    strm << TPair( _ErrorCheckEnumRange, tool.ErrorCheckEnumRange );
+    strm << TPair( _ErrorCheckRefPointers, tool.ErrorCheckRefPointers );
+    strm << TPair( _ErrorCheckStubData, tool.ErrorCheckStubData );
+    strm << XPair( _FullIncludePath, tool.FullIncludePath );
+    strm << TPair( _GenerateStublessProxies, tool.GenerateStublessProxies );
+    strm << TPair( _GenerateTypeLibrary, tool.GenerateTypeLibrary );
+    strm << SPair( _HeaderFileName, tool.HeaderFileName );
+    strm << TPair( _IgnoreStandardIncludePath, tool.IgnoreStandardIncludePath );
+    strm << SPair( _InterfaceIdentifierFileName, tool.InterfaceIdentifierFileName );
+    strm << TPair( _MkTypLibCompatible, tool.MkTypLibCompatible );
+    strm << SPair( _OutputDirectory4, tool.OutputDirectory );
+    strm << XPair( _PreprocessorDefinitions, tool.PreprocessorDefinitions );
+    strm << SPair( _ProxyFileName, tool.ProxyFileName );
+    strm << SPair( _RedirectOutputAndErrors, tool.RedirectOutputAndErrors );
+    if ( tool.StructMemberAlignment != midlAlignNotSet)	    strm << EPair( _StructMemberAlignment, tool.StructMemberAlignment );
+    strm << TPair( _SuppressStartupBanner, tool.SuppressStartupBanner );
+    if ( tool.TargetEnvironment != midlTargetNotSet )	    strm << EPair( _TargetEnvironment, tool.TargetEnvironment );
+    strm << SPair( _TypeLibraryName, tool.TypeLibraryName );
+    strm << XPair( _UndefinePreprocessorDefinitions, tool.UndefinePreprocessorDefinitions );
+    strm << TPair( _ValidateParameters, tool.ValidateParameters );
+    strm << TPair( _WarnAsError, tool.WarnAsError );
+    strm << EPair( _WarningLevel, tool.WarningLevel );
+    strm << "/>";
+    return strm;
+}
+
+bool VCMIDLTool::parseOption( const char* option )
+{
+#ifdef USE_DISPLAY_HASH
+    displayHash( "/D name[=def]" ); displayHash( "/I directory-list" ); displayHash( "/Oi" );
+    displayHash( "/Oic" ); displayHash( "/Oicf" ); displayHash( "/Oif" ); displayHash( "/Os" );
+    displayHash( "/U name" ); displayHash( "/WX" ); displayHash( "/W{0|1|2|3|4}" );
+    displayHash( "/Zp {N}" ); displayHash( "/Zs" ); displayHash( "/acf filename" );
+    displayHash( "/align {N}" ); displayHash( "/app_config" ); displayHash( "/c_ext" );
+    displayHash( "/char ascii7" ); displayHash( "/char signed" ); displayHash( "/char unsigned" );
+    displayHash( "/client none" ); displayHash( "/client stub" ); displayHash( "/confirm" );
+    displayHash( "/cpp_cmd cmd_line" ); displayHash( "/cpp_opt options" );
+    displayHash( "/cstub filename" ); displayHash( "/dlldata filename" ); displayHash( "/env win32" );
+    displayHash( "/env win64" ); displayHash( "/error all" ); displayHash( "/error allocation" );
+    displayHash( "/error bounds_check" ); displayHash( "/error enum" ); displayHash( "/error none" );
+    displayHash( "/error ref" ); displayHash( "/error stub_data" ); displayHash( "/h filename" );
+    displayHash( "/header filename" ); displayHash( "/iid filename" ); displayHash( "/lcid" );
+    displayHash( "/mktyplib203" ); displayHash( "/ms_ext" ); displayHash( "/ms_union" );
+    displayHash( "/msc_ver <nnnn>" ); displayHash( "/newtlb" ); displayHash( "/no_cpp" );
+    displayHash( "/no_def_idir" ); displayHash( "/no_default_epv" ); displayHash( "/no_format_opt" );
+    displayHash( "/no_warn" ); displayHash( "/nocpp" ); displayHash( "/nologo" ); displayHash( "/notlb" );
+    displayHash( "/o filename" ); displayHash( "/oldnames" ); displayHash( "/oldtlb" );
+    displayHash( "/osf" ); displayHash( "/out directory" ); displayHash( "/pack {N}" );
+    displayHash( "/prefix all" ); displayHash( "/prefix client" ); displayHash( "/prefix server" );
+    displayHash( "/prefix switch" ); displayHash( "/protocol all" ); displayHash( "/protocol dce" );
+    displayHash( "/protocol ndr64" ); displayHash( "/proxy filename" ); displayHash( "/robust" );
+    displayHash( "/rpcss" ); displayHash( "/savePP" ); displayHash( "/server none" );
+    displayHash( "/server stub" ); displayHash( "/sstub filename" ); displayHash( "/syntax_check" );
+    displayHash( "/target {system}" ); displayHash( "/tlb filename" ); displayHash( "/use_epv" );
+    displayHash( "/win32" ); displayHash( "/win64" );
+#endif
+    bool found = TRUE;
+    int offset = 0;
+    switch( elfHash(option) ) {
+    case 0x0000334: // /D name[=def]
+	PreprocessorDefinitions += option+3;
+	break;
+    case 0x0000339: // /I directory-list
+	AdditionalIncludeDirectories += option+3;
+	break;
+    case 0x0345f96: // /Oicf
+    case 0x00345f6: // /Oif
+	GenerateStublessProxies = _True;
+	break;
+    case 0x0000345: // /U name
+	UndefinePreprocessorDefinitions += option+3;
+	break;
+    case 0x00034c8: // /WX
+	WarnAsError = _True;
+	break;
+    case 0x3582fde: // /align {N}
+	offset = 3;  // Fallthrough
+    case 0x0003510: // /Zp {N}
+	switch ( *(option+offset+4) ) {
+	case '1':
+	    StructMemberAlignment = ( *(option+offset+5) == '\0' ) ? midlAlignSingleByte : midlAlignSixteenBytes;
+	    break;
+	case '2':
+	    StructMemberAlignment = midlAlignTwoBytes;
+	    break;
+	case '4':
+	    StructMemberAlignment = midlAlignFourBytes;
+	    break;
+	case '8':
+	    StructMemberAlignment = midlAlignEightBytes;
+	    break;
+	default:
+	    found = FALSE;
+	}
+	break;
+    case 0x0359e82: // /char {ascii7|signed|unsigned}
+	switch( *(option+6) ) {
+	case 'a':
+	    DefaultCharType = midlCharAscii7;
+	    break;
+	case 's':
+	    DefaultCharType = midlCharSigned;
+	    break;
+	case 'u':
+	    DefaultCharType = midlCharUnsigned;
+	    break;
+	default:
+	    found = FALSE;
+	}
+	break;
+    case 0xa766524: // /cpp_opt options
+	CPreprocessOptions += option+9;
+	break;
+    case 0xb32abf1: // /dlldata filename
+	DLLDataFileName = option + 9;
+	break;
+    case 0x0035c56: // /env {win32|win64}
+	TargetEnvironment = ( *(option+8) == '6' ) ? midlTargetWin64 : midlTargetWin32;
+	break;
+    case 0x35c9962: // /error {all|allocation|bounds_check|enum|none|ref|stub_data}
+	EnableErrorChecks = midlEnableCustom;
+	switch ( *(option+7) ) {
+	case 'a':
+	    if ( *(option+10) == '\0' )
+		EnableErrorChecks = midlEnableAll;
+	    else
+		ErrorCheckAllocations = _True;
+	    break;
+	case 'b':
+	    ErrorCheckBounds = _True;
+	    break;
+	case 'e':
+	    ErrorCheckEnumRange = _True;
+	    break;
+	case 'n':
+	    EnableErrorChecks = midlDisableAll;
+	    break;
+	case 'r':
+	    ErrorCheckRefPointers = _True;
+	    break;
+	case 's':
+	    ErrorCheckStubData = _True;
+	    break;
+	default:
+	    found = FALSE;
+	}
+	break;
+    case 0x5eb7af2: // /header filename
+	offset = 5;
+    case 0x0000358: // /h filename
+	HeaderFileName = option + offset + 3;
+	break;
+    case 0x0035ff4: // /iid filename
+	InterfaceIdentifierFileName = option+5;
+	break;
+    case 0x64b7933: // /mktyplib203
+	MkTypLibCompatible = _True;
+	break;
+    case 0x8e0b0a2: // /no_def_idir
+	IgnoreStandardIncludePath = _True;
+	break;
+    case 0x65635ef: // /nologo
+	SuppressStartupBanner = _True;
+	break;
+    case 0x3656b22: // /notlb
+	GenerateTypeLibrary = _True;
+	break;
+    case 0x000035f: // /o filename
+	RedirectOutputAndErrors = option+3;
+	break;
+    case 0x00366c4: // /out directory
+	OutputDirectory = option+5;
+	break;
+    case 0x36796f9: // /proxy filename
+	ProxyFileName = option+7;
+	break;
+    case 0x6959c94: // /robust
+	ValidateParameters = _True;
+	break;
+    case 0x6a88df4: // /target {system}
+	if ( *(option+11) == '6' )
+	    TargetEnvironment = midlTargetWin64;
+	else
+	    TargetEnvironment = midlTargetWin32;
+	break;
+    case 0x0036b22: // /tlb filename
+	TypeLibraryName = option+5;
+	break;
+    case 0x36e0162: // /win32
+	TargetEnvironment = midlTargetWin32;
+	break;
+    case 0x36e0194: // /win64
+	TargetEnvironment = midlTargetWin64;
+	break;
+    case 0x0003459: // /Oi
+    case 0x00345f3: // /Oic
+    case 0x0003463: // /Os
+    case 0x0003513: // /Zs
+    case 0x0035796: // /acf filename
+    case 0x5b1cb97: // /app_config
+    case 0x3595cf4: // /c_ext
+    case 0x5a2fc64: // /client {none|stub}
+    case 0xa64d3dd: // /confirm
+    case 0xa765b64: // /cpp_cmd cmd_line
+    case 0x35aabb2: // /cstub filename
+    case 0x03629f4: // /lcid
+    case 0x6495cc4: // /ms_ext
+    case 0x96c7a1e: // /ms_union
+    case 0x4996fa2: // /msc_ver <nnnn>
+    case 0x64ceb12: // /newtlb
+    case 0x6555a40: // /no_cpp
+    case 0xf64d6a6: // /no_default_epv
+    case 0x6dd9384: // /no_format_opt
+    case 0x556dbee: // /no_warn
+    case 0x3655a70: // /nocpp
+    case 0x2b455a3: // /oldnames
+    case 0x662bb12: // /oldtlb
+    case 0x0036696: // /osf
+    case 0x036679b: // /pack {N}
+    case 0x678bd38: // /prefix {all|client|server|switch}
+    case 0x96b702c: // /protocol {all|dce|ndr64}
+    case 0x3696aa3: // /rpcss
+    case 0x698ca60: // /savePP
+    case 0x69c9cf2: // /server {none|stub}
+    case 0x36aabb2: // /sstub filename
+    case 0xce9b12b: // /syntax_check
+    case 0xc9b5f16: // /use_epv
+	AdditionalOptions += option;
+	break;
+    default:
+	// /W{0|1|2|3|4} case
+	if ( *(option+1) == 'W' ) {
+	    switch ( *(option+2) ) {
+	    case '0':
+		WarningLevel = midlWarningLevel_0;
+		break;
+	    case '1':
+		WarningLevel = midlWarningLevel_1;
+		break;
+	    case '2':
+		WarningLevel = midlWarningLevel_2;
+		break;
+	    case '3':
+		WarningLevel = midlWarningLevel_3;
+		break;
+	    case '4':
+		WarningLevel = midlWarningLevel_4;
+		break;
+	    default:
+		found = FALSE;
+	    }
+	}
+	break;
+    }
+    if( !found )
+	warn_msg( WarnLogic, "Could not parse MIDL option: %s", option );
+    return TRUE;
+}
+
+// VCLibrarianTool --------------------------------------------------
+VCLibrarianTool::VCLibrarianTool()
+    :	IgnoreAllDefaultLibraries( unset ),
+	SuppressStartupBanner( _True )
+{
+}
+
+QTextStream &operator<<( QTextStream &strm, const VCLibrarianTool &tool )
+{
+    strm << _begTool3;
+    strm << SPair( _ToolName, QString( "VCLibrarianTool" ) );
+    strm << XPair( _AdditionalDependencies4, tool.AdditionalDependencies );
+    strm << XPair( _AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
+    strm << XPair( _ExportNamedFunctions, tool.ExportNamedFunctions );
+    strm << XPair( _ForceSymbolReferences, tool.ForceSymbolReferences );
+    strm << TPair( _IgnoreAllDefaultLibraries, tool.IgnoreAllDefaultLibraries );
+    strm << XPair( _IgnoreDefaultLibraryNames, tool.IgnoreDefaultLibraryNames );
+    strm << SPair( _ModuleDefinitionFile, tool.ModuleDefinitionFile );
+    strm << SPair( _OutputFile, tool.OutputFile );
+    strm << TPair( _SuppressStartupBanner, tool.SuppressStartupBanner );
+    strm << "/>";
+    return strm;
+}
+
+// VCCustomBuildTool ------------------------------------------------
+VCCustomBuildTool::VCCustomBuildTool()
+{
+    ToolName = "VCCustomBuildTool";
+}
+
+QTextStream &operator<<( QTextStream &strm, const VCCustomBuildTool &tool )
+{
+    strm << _begTool3;
+    strm << SPair( _ToolName, tool.ToolName );
+    strm << XPair( _AdditionalDependencies4, tool.AdditionalDependencies, ";" );
+
+    if (which_dotnet_version() == NET2005)
+        strm << XPair( _CommandLine4, tool.CommandLine, "&#x0D;&#x0A;" );
+    else
+        strm << XPair( _CommandLine4, tool.CommandLine, "\n" );
+
+    strm << SPair( _Description4, tool.Description );
+    strm << XPair( _Outputs4, tool.Outputs, ";" );
+    strm << SPair( _ToolPath, tool.ToolPath );
+    strm << "/>";
+   return strm;
+}
+
+// VCResourceCompilerTool -------------------------------------------
+VCResourceCompilerTool::VCResourceCompilerTool()
+    :   Culture( rcUseDefault ),
+	IgnoreStandardIncludePath( unset ),
+	ShowProgress( linkProgressNotSet )
+{
+    PreprocessorDefinitions = "NDEBUG";
+}
+
+QTextStream &operator<<( QTextStream &strm, const VCResourceCompilerTool &tool )
+{
+    strm << _begTool3;
+    strm << _VCResourceCompilerToolName;
+    strm << SPair( _ToolPath, tool.ToolPath );
+    strm << XPair( _AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
+    if ( tool.Culture != rcUseDefault )			    strm << EPair( _Culture, tool.Culture );
+    strm << XPair( _FullIncludePath, tool.FullIncludePath );
+    strm << TPair( _IgnoreStandardIncludePath, tool.IgnoreStandardIncludePath );
+    strm << XPair( _PreprocessorDefinitions, tool.PreprocessorDefinitions );
+    strm << SPair( _ResourceOutputFileName, tool.ResourceOutputFileName );
+    if ( tool.ShowProgress != linkProgressNotSet )	    strm << EPair( _ShowProgress, tool.ShowProgress );
+    strm << "/>";
+    return strm;
+}
+
+// VCEventTool -------------------------------------------------
+QTextStream &operator<<( QTextStream &strm, const VCEventTool &tool )
+{
+    strm << _begTool3;
+    strm << SPair( _ToolName, tool.ToolName );
+    strm << SPair( _ToolPath, tool.ToolPath );
+    strm << SPair( _CommandLine4, tool.CommandLine );
+    strm << SPair( _Description4, tool.Description );
+    strm << TPair( _ExcludedFromBuild, tool.ExcludedFromBuild );
+    strm << "/>";
+    return strm;
+}
+
+// VCPostBuildEventTool ---------------------------------------------
+VCPostBuildEventTool::VCPostBuildEventTool()
+{
+    ToolName = "VCPostBuildEventTool";
+}
+
+// VCPreBuildEventTool ----------------------------------------------
+VCPreBuildEventTool::VCPreBuildEventTool()
+{
+    ToolName = "VCPreBuildEventTool";
+}
+
+// VCPreLinkEventTool -----------------------------------------------
+VCPreLinkEventTool::VCPreLinkEventTool()
+{
+    ToolName = "VCPreLinkEventTool";
+}
+
+// VCConfiguration --------------------------------------------------
+
+VCConfiguration::VCConfiguration()
+    :	ATLMinimizesCRunTimeLibraryUsage( unset ),
+	BuildBrowserInformation( unset ),
+	CharacterSet( charSetNotSet ),
+	ConfigurationType( typeApplication ),
+	RegisterOutput( unset ),
+	UseOfATL( useATLNotSet ),
+	UseOfMfc( useMfcStdWin ),
+	WholeProgramOptimization( unset )
+{
+    compiler.config = this;
+    linker.config = this;
+    idl.config = this;
+}
+
+VCConfiguration::VCConfiguration(const VCConfiguration &other)
+{
+    *this = other;
+    compiler.config = this;
+    linker.config = this;
+    idl.config = this;
+}
+
+QTextStream &operator<<( QTextStream &strm, const VCConfiguration &tool )
+{
+    strm << _begConfiguration;
+    strm << SPair( _Name3, tool.Name );
+    strm << SPair( _OutputDirectory3, tool.OutputDirectory );
+    strm << TPair( _ATLMinimizesCRunTimeLibraryUsage, tool.ATLMinimizesCRunTimeLibraryUsage );
+    strm << TPair( _BuildBrowserInformation, tool.BuildBrowserInformation );
+    if ( tool.CharacterSet != charSetNotSet)	strm << EPair( _CharacterSet, tool.CharacterSet );
+    strm << EPair( _ConfigurationType, tool.ConfigurationType );
+    strm << SPair( _DeleteExtensionsOnClean, tool.DeleteExtensionsOnClean );
+    strm << SPair( _ImportLibrary, tool.ImportLibrary );
+    strm << SPair( _IntermediateDirectory, tool.IntermediateDirectory );
+    strm << SPair( _PrimaryOutput, tool.PrimaryOutput );
+    strm << SPair( _ProgramDatabase, tool.ProgramDatabase );
+    strm << TPair( _RegisterOutput, tool.RegisterOutput );
+    if ( tool.UseOfATL != useATLNotSet)		strm << EPair( _UseOfATL, tool.UseOfATL );
+    strm << EPair( _UseOfMfc, tool.UseOfMfc );
+    strm << TPair( _WholeProgramOptimization, tool.WholeProgramOptimization );
+    strm << ">";
+    strm << tool.compiler;
+    strm << tool.custom;
+    if ( tool.ConfigurationType == typeStaticLibrary )
+	strm << tool.librarian;
+    else
+	strm << tool.linker;
+    strm << tool.idl;
+    strm << tool.postBuild;
+    strm << tool.preBuild;
+    strm << tool.preLink;
+    strm << tool.resource;
+    strm << _endConfiguration;
+    return strm;
+}
+// VCFilter ---------------------------------------------------------
+VCFilter::VCFilter()
+    :   ParseFiles( unset )
+{
+    useCustomBuildTool = FALSE;
+    useCompilerTool = FALSE;
+}
+
+void VCFilter::addMOCstage( QTextStream & /*strm*/, QString filename )
+{
+    QString mocOutput = Project->findMocDestination( filename );
+    QString mocApp = Project->var( "QMAKE_MOC" );
+
+    bool inputMoc = false;
+    if( mocOutput.isEmpty() && filename.endsWith(".moc") ) {
+        // In specialcases we DO moc .cpp files
+	// when the result is an .moc file
+	mocOutput = filename;
+	filename = Project->findMocSource( mocOutput );
+        inputMoc = true;
+    }
+
+    if (mocOutput.isEmpty())
+	return;
+
+    CustomBuildTool = VCCustomBuildTool();
+    useCustomBuildTool = TRUE;
+    CustomBuildTool.Description = "Moc&apos;ing " + filename + "...";
+    CustomBuildTool.CommandLine += (mocApp + " "
+				+ filename + " -o " + mocOutput);
+    CustomBuildTool.AdditionalDependencies = mocApp;
+    if (inputMoc)
+        CustomBuildTool.AdditionalDependencies += filename;
+    CustomBuildTool.Outputs += mocOutput;
+}
+
+void VCFilter::addUICstage( QTextStream & /*strm*/, QString str )
+{
+    CustomBuildTool = VCCustomBuildTool();
+    useCustomBuildTool = TRUE;
+
+    QString uicApp = Project->var("QMAKE_UIC");
+    QString mocApp = Project->var( "QMAKE_MOC" );
+    QString fname = str.section( '\\', -1 );
+    QString mocDir = Project->var( "MOC_DIR" );
+    QString uiDir = Project->var( "UI_DIR" );
+    QString uiHeaders;
+    QString uiSources;
+
+    // Determining the paths for the output files.
+    int slash = str.findRev( '\\' );
+    QString pname = ( slash != -1 ) ? str.left( slash+1 ) : QString( ".\\" );
+    if( !uiDir.isEmpty() ) {
+	uiHeaders = uiDir;
+	uiSources = uiDir;
+    } else {
+	uiHeaders = Project->var( "UI_HEADERS_DIR" );
+	uiSources = Project->var( "UI_SOURCES_DIR" );
+	if( uiHeaders.isEmpty() )
+	    uiHeaders = pname;
+	if( uiSources.isEmpty() )
+	    uiSources = pname;
+    }
+    if( !uiHeaders.endsWith( "\\" ) )
+	uiHeaders += "\\";
+    if( !uiSources.endsWith( "\\" ) )
+	uiSources += "\\";
+
+    // Determine the file name.
+    int dot = fname.findRev( '.' );
+    if( dot != -1 )
+	fname.truncate( dot );
+
+    if ( mocDir.isEmpty() )
+	mocDir = pname;
+
+    CustomBuildTool.Description = ("Uic'ing " + str + "...\"");
+    CustomBuildTool.CommandLine += // Create .h from .ui file
+	uicApp + " " + str + " -o " + uiHeaders + fname + ".h";
+    CustomBuildTool.CommandLine += // Create .cpp from .ui file
+	uicApp + " " + str + " -i " + fname + ".h -o " + uiSources + fname + ".cpp";
+    CustomBuildTool.CommandLine += // Moc the headerfile
+	mocApp + " " + uiHeaders + fname + ".h -o " + mocDir + Option::h_moc_mod + fname + Option::h_moc_ext;
+
+    CustomBuildTool.AdditionalDependencies += mocApp;
+    CustomBuildTool.AdditionalDependencies += uicApp;
+    CustomBuildTool.Outputs +=
+	uiHeaders + fname + ".h;" + uiSources + fname + ".cpp;" + mocDir + Option::h_moc_mod + fname + Option::h_moc_ext;
+}
+
+void VCFilter::modifyPCHstage( QTextStream &/*strm*/, QString str )
+{
+    bool isCFile = str.endsWith(".c");
+    bool isHFile = (str.endsWith(".h") && str == Project->precompH);
+
+    if (!isCFile && !isHFile)
+	return;
+
+    CompilerTool = VCCLCompilerTool();
+    useCompilerTool = TRUE;
+
+    // Unset some default options
+    CompilerTool.BufferSecurityCheck = unset;
+    CompilerTool.DebugInformationFormat = debugUnknown;
+    CompilerTool.ExceptionHandling = unset;
+    CompilerTool.GeneratePreprocessedFile = preprocessUnknown;
+    CompilerTool.Optimization = optimizeDefault;
+    CompilerTool.ProgramDataBaseFileName = QString::null;
+    CompilerTool.RuntimeLibrary = rtUnknown;
+    CompilerTool.WarningLevel = warningLevelUnknown;
+
+    // Setup PCH options
+    CompilerTool.UsePrecompiledHeader     = (isCFile ? pchNone : pchCreateUsingSpecific);
+    CompilerTool.PrecompiledHeaderThrough = "$(NOINHERIT)";
+    CompilerTool.ForcedIncludeFiles       = "$(NOINHERIT)";
+}
+
+bool VCFilter::addIMGstage( QTextStream &/*strm*/, QString str )
+{
+    bool isCorH = FALSE;
+    if (str.endsWith(".c") || str.endsWith(".rc"))
+	isCorH = TRUE;
+    QStringList::Iterator it;
+    for(it = Option::cpp_ext.begin(); it != Option::cpp_ext.end(); ++it)
+	if(str.endsWith(*it))
+	    isCorH = TRUE;
+    for(it = Option::h_ext.begin(); it != Option::h_ext.end(); ++it)
+	if(str.endsWith(*it))
+	    isCorH = TRUE;
+
+    QString collectionName = Project->project->first("QMAKE_IMAGE_COLLECTION");
+    if (str.isEmpty() || isCorH || collectionName.isEmpty())
+	return FALSE;
+
+    CustomBuildTool = VCCustomBuildTool();
+    useCustomBuildTool = TRUE;
+
+    // Some projects (like designer core) may have too many images to
+    // call uic directly. Therefor we have to create a temporary
+    // file, with the image list, and call uic with the -f option.
+    QString tmpFileCmd = "echo ";
+    QString tmpImageFilename = ".imgcol";
+    QStringList& list = Project->project->variables()["IMAGES"];
+    bool firstOutput = TRUE;
+    it = list.begin();
+    while( it!=list.end() ) {
+	tmpFileCmd += (*it) + " ";
+	++it;
+	if (tmpFileCmd.length()>250 || it==list.end()) {
+	    CustomBuildTool.CommandLine += tmpFileCmd
+					  + (firstOutput?"> ":">> ")
+					  + tmpImageFilename;
+	    tmpFileCmd = "echo ";
+	    firstOutput = FALSE;
+	}
+    }
+
+    QString uicApp = Project->var("QMAKE_UIC");
+    QString commandLine = uicApp + " -embed " + Project->project->first("QMAKE_ORIG_TARGET")
+	+ " -f .imgcol -o " + collectionName;
+
+    // The loop below is to avoid the resulting CommandLine buffer
+    // from being a size of between 2071-#char_replaced and 2102,
+    // as this triggers a buffer overflow bug in VS2003. As we only
+    // the only replacement we use in this buffer is one $(QTDIR),
+    // we assume this can be upto 256 characters long, making the
+    // lower-bound to be 1814 characters. So, if the buffer is
+    // between 1814 and 2103 bytes, the buffer is "padded" til it's
+    // over 2103 bytes in size.
+    int totalSize = CustomBuildTool.CommandLine.join("  ").length();
+    while (totalSize > 1814 && totalSize < 2103) {
+        CustomBuildTool.CommandLine += 
+            "echo \"Padding\" the Custom Build Step buffer to avoid a potentional "
+            "buffer overflow issue with VS2003 for buffer of 1814-2103 bytes > nul";
+        totalSize = CustomBuildTool.CommandLine.join("  ").length();
+    }
+
+    CustomBuildTool.Description = ("Generate imagecollection");
+    CustomBuildTool.CommandLine += commandLine;
+    CustomBuildTool.AdditionalDependencies += uicApp;
+    CustomBuildTool.AdditionalDependencies += list;
+    CustomBuildTool.Outputs = collectionName;
+    CustomBuildTool.Outputs += tmpImageFilename;
+    return TRUE;
+}
+
+bool VCFilter::addLexYaccStage( QTextStream &/*strm*/, QString str )
+{
+    bool doLex = str.endsWith(".l");
+    if (!doLex && !str.endsWith(".y"))
+        return FALSE;
+
+    QString fname = "$(InputName)";
+    if (doLex) {
+        fname += Option::lex_mod + Option::cpp_ext.first();
+	QString lexpath = Project->var("QMAKE_LEX")
+                        + Project->varGlue("QMAKE_LEXFLAGS", " ", " ", "") + " ";
+
+        CustomBuildTool.Description = "Lex'ing $(InputFileName)";
+        CustomBuildTool.CommandLine = lexpath + " $(InputFileName)";
+        CustomBuildTool.CommandLine += "del " + fname;
+        CustomBuildTool.CommandLine += "move lex.yy.c " + fname;
+        CustomBuildTool.Outputs = fname;
+    } else {
+        fname +=Option::yacc_mod;
+	QString yaccpath = Project->var("QMAKE_YACC")
+                         + Project->varGlue("QMAKE_YACCFLAGS", " ", " ", "") + " ";
+
+        CustomBuildTool.Description = "Yacc'ing $(InputFileName)";
+        CustomBuildTool.CommandLine = yaccpath + " $(InputFileName)";
+        CustomBuildTool.CommandLine += "del " + fname + Option::h_ext.first();
+        CustomBuildTool.CommandLine += "move y.tab.h " + fname + Option::h_ext.first();
+        CustomBuildTool.Outputs = fname + Option::h_ext.first();
+        CustomBuildTool.CommandLine += "del " + fname + Option::cpp_ext.first();
+        CustomBuildTool.CommandLine += "move y.tab.c " + fname + Option::cpp_ext.first();
+        CustomBuildTool.Outputs += fname + Option::cpp_ext.first();
+    }
+    useCustomBuildTool = TRUE;
+    return TRUE;
+}
+
+QTextStream &operator<<( QTextStream &strm, VCFilter &tool )
+{
+    if ( tool.Files.count() == 0 )
+	return strm;
+
+    strm << _begFilter;
+    strm << SPair( _Name3, tool.Name );
+    strm << TPair( _ParseFiles, tool.ParseFiles );
+    strm << SPair( _Filter, tool.Filter );
+    strm << ">";
+
+    bool resourceBuild = FALSE;
+    int currentLevels = 0;
+    QStringList currentDirs;
+    for ( QStringList::ConstIterator it = tool.Files.begin(); it != tool.Files.end(); ++it ) {
+	if ( !tool.flat_files ) {
+	    QStringList newDirs = QStringList::split('\\',(*it));
+	    newDirs.pop_back(); // Skip the filename
+
+	    int newLevels = int(newDirs.count());
+	    int equalLevels = 0;
+	    for (int i = 0; i<currentLevels; i++, equalLevels++ )
+		if (currentDirs[i] != newDirs[i])
+		    break;
+	    int closeFilters = currentLevels - equalLevels;
+	    int openFilters  = newLevels - equalLevels;
+
+	    // close previous non-equal filter
+	    while ( closeFilters-- )
+		strm << _endFilter;
+
+	    // open new non-equal filters
+	    newLevels = 0;
+	    while ( openFilters-- ) {
+		strm << _begFilter;
+		strm << SPair( _Name3, newDirs[equalLevels + newLevels] );
+		strm << _Filter << "\">"; // Blank filter
+		++newLevels;
+	    }
+	    currentDirs = newDirs;
+	    currentLevels = int(newDirs.count());
+	}
+
+	tool.useCustomBuildTool = FALSE;
+	tool.useCompilerTool = FALSE;
+	// Add UIC, MOC and PCH stages to file
+	if ( tool.CustomBuild == moc )
+	    tool.addMOCstage( strm, *it );
+	else if ( tool.CustomBuild == uic )
+	    tool.addUICstage( strm, *it );
+	else if ( tool.CustomBuild == lexyacc )
+	    tool.addLexYaccStage( strm, *it );
+	else if ( tool.CustomBuild == resource ) {
+	    if (!resourceBuild)
+		resourceBuild = tool.addIMGstage(strm, *it);
+	}
+	if (tool.Project->usePCH)
+	    tool.modifyPCHstage( strm, *it );
+
+	strm << _begFile;
+	strm << SPair( _RelativePath, *it );
+	strm << ">";
+	// Output custom build and compiler options
+	// for all configurations
+	if (tool.useCustomBuildTool || tool.useCompilerTool) {
+	    for ( uint i = 0; i < tool.Config->count(); i++ ) {
+		strm << _begFileConfiguration;
+		strm << _Name5;
+		strm << (*tool.Config)[i].Name;
+		strm << "\">";
+		if (tool.useCustomBuildTool)
+		    strm <<  tool.CustomBuildTool;
+		if (tool.useCompilerTool)
+		    strm <<  tool.CompilerTool;
+		strm << _endFileConfiguration;
+	    }
+	}
+	strm << _endFile;
+    }
+    // close remaining open filters, in non-flat mode
+    while ( !tool.flat_files && currentLevels-- ) {
+	strm << _endFilter;
+    }
+    strm << _endFilter;
+    return strm;
+}
+
+// VCProject --------------------------------------------------------
+VCProject::VCProject()
+{
+    VCConfiguration conf;
+    Configuration += conf ; // Release
+    //Configuration += conf ; // Debug added later, after Release init
+}
+
+QTextStream &operator<<( QTextStream &strm, const VCProject &tool )
+{
+    strm << _xmlInit;
+    strm << _begVisualStudioProject;
+    strm << _ProjectType;
+    strm << SPair( _Version1, tool.Version );
+    strm << SPair( _Name1, tool.Name );
+    strm << SPair( _ProjectGUID, tool.ProjectGUID );
+    strm << SPair( _SccProjectName, tool.SccProjectName );
+    strm << SPair( _SccLocalPath, tool.SccLocalPath );
+    strm << ">";
+    strm << _begPlatforms;
+    strm << _begPlatform;
+    strm << SPair( _Name3, tool.PlatformName );
+    strm << "/>";
+    strm << _endPlatforms;
+    strm << _begConfigurations;
+    for ( uint i = 0; i < tool.Configuration.count(); i++ )
+	strm << tool.Configuration[i];
+    strm << _endConfigurations;
+    strm << _begFiles;
+    strm << (VCFilter&)tool.SourceFiles;
+    strm << (VCFilter&)tool.HeaderFiles;
+    strm << (VCFilter&)tool.MOCFiles;
+    strm << (VCFilter&)tool.UICFiles;
+    strm << (VCFilter&)tool.FormFiles;
+    strm << (VCFilter&)tool.TranslationFiles;
+    strm << (VCFilter&)tool.LexYaccFiles;
+    strm << (VCFilter&)tool.ResourceFiles;
+    strm << _endFiles;
+    strm << _begGlobals;
+    strm << _endGlobals;
+    strm << _endVisualStudioProject;
+    return strm;
+}
diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
new file mode 100644
index 0000000..a49c016
--- /dev/null
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -0,0 +1,801 @@
+/****************************************************************************
+**
+** Definition of VCProject class.
+**
+** Copyright (C) 2002-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#ifndef __MSVC_OBJECTMODEL_H__
+#define __MSVC_OBJECTMODEL_H__
+
+#include "project.h"
+#include <qstring.h>
+#include <qstringlist.h>
+
+enum DotNET {
+    NETUnknown = 0,
+    NET2002 = 0x70,
+    NET2003 = 0x71,
+    NET2005 = 0x80
+};
+
+/*
+    This Object model is of course VERY simplyfied,
+    and does not actually follow the original MSVC
+    object model. However, it fulfilles the basic
+    needs for qmake
+*/
+
+/*
+    If a triState value is 'unset' then the
+    corresponding property is not in the output,
+    forcing the tool to utilize default values.
+    False/True values will be in the output...
+*/
+enum customBuildCheck {
+    none,
+    moc,
+    uic,
+    lexyacc,
+    resource
+};
+enum triState {
+    unset = -1,
+    _False = 0,
+    _True = 1
+};
+enum addressAwarenessType {
+    addrAwareDefault,
+    addrAwareNoLarge,
+    addrAwareLarge
+};
+enum asmListingOption {
+    asmListingNone,
+    asmListingAssemblyOnly,
+    asmListingAsmMachineSrc,
+    asmListingAsmMachine,
+    asmListingAsmSrc
+};
+enum basicRuntimeCheckOption {
+    runtimeBasicCheckNone,
+    runtimeCheckStackFrame,
+    runtimeCheckUninitVariables,
+    runtimeBasicCheckAll
+};
+enum browseInfoOption {
+    brInfoNone,
+    brAllInfo,
+    brNoLocalSymbols
+};
+enum callingConventionOption {
+    callConventionDefault = -1,
+    callConventionCDecl,
+    callConventionFastCall,
+    callConventionStdCall
+};
+enum charSet {
+    charSetNotSet,
+    charSetUnicode,
+    charSetMBCS
+};
+enum compileAsManagedOptions {
+    managedDefault = -1,
+    managedAssembly = 2
+};
+enum CompileAsOptions{
+    compileAsDefault,
+    compileAsC,
+    compileAsCPlusPlus
+};
+enum ConfigurationTypes {
+    typeUnknown        = 0,
+    typeApplication    = 1,
+    typeDynamicLibrary = 2,
+    typeStaticLibrary  = 4,
+    typeGeneric        = 10
+};
+enum debugOption {
+    debugUnknown = -1,
+    debugDisabled,
+    debugOldStyleInfo,
+    debugLineInfoOnly,
+    debugEnabled,
+    debugEditAndContinue
+};
+enum eAppProtectionOption {
+    eAppProtectUnchanged,
+    eAppProtectLow,
+    eAppProtectMedium,
+    eAppProtectHigh
+};
+enum enumResourceLangID {
+    rcUseDefault		= 0,
+    rcAfrikaans			= 1078,
+    rcAlbanian			= 1052,
+    rcArabicAlgeria		= 5121,
+    rcArabicBahrain		= 15361,
+    rcArabicEgypt		= 3073,
+    rcArabicIraq		= 2049,
+    rcArabicJordan		= 11265,
+    rcArabicKuwait		= 13313,
+    rcArabicLebanon		= 12289,
+    rcArabicLibya		= 4097,
+    rcArabicMorocco		= 6145,
+    rcArabicOman		= 8193,
+    rcArabicQatar		= 16385,
+    rcArabicSaudi		= 1025,
+    rcArabicSyria		= 10241,
+    rcArabicTunisia		= 7169,
+    rcArabicUnitedArabEmirates	= 14337,
+    rcArabicYemen		= 9217,
+    rcBasque			= 1069,
+    rcBulgarian			= 1026,
+    rcByelorussian		= 1059,
+    rcCatalan			= 1027,
+    rcChineseHongKong		= 3076,
+    rcChinesePRC		= 2052,
+    rcChineseSingapore		= 4100,
+    rcChineseTaiwan		= 1028,
+    rcCroatian			= 1050,
+    rcCzech			= 1029,
+    rcDanish			= 1030,
+    rcDutchBelgium		= 2067,
+    rcDutchStandard		= 1043,
+    rcEnglishAustralia		= 3081,
+    rcEnglishBritain		= 2057,
+    rcEnglishCanada		= 4105,
+    RcEnglishCaribbean		= 9225,
+    rcEnglishIreland		= 6153,
+    rcEnglishJamaica		= 8201,
+    rcEnglishNewZealand		= 5129,
+    rcEnglishSouthAfrica	= 7177,
+    rcEnglishUS			= 1033,
+    rcEstonian			= 1061,
+    rcFarsi			= 1065,
+    rcFinnish			= 1035,
+    rcFrenchBelgium		= 2060,
+    rcFrenchCanada		= 3084,
+    rcFrenchLuxembourg		= 5132,
+    rcFrenchStandard		= 1036,
+    rcFrenchSwitzerland		= 4108,
+    rcGermanAustria		= 3079,
+    rcGermanLichtenstein	= 5127,
+    rcGermanLuxembourg		= 4103,
+    rcGermanStandard		= 1031,
+    rcGermanSwitzerland		= 2055,
+    rcGreek			= 1032,
+    rcHebrew			= 1037,
+    rcHungarian			= 1038,
+    rcIcelandic			= 1039,
+    rcIndonesian		= 1057,
+    rcItalianStandard		= 1040,
+    rcItalianSwitzerland	= 2064,
+    rcJapanese			= 1041,
+    rcKorean			= 1042,
+    rcKoreanJohab		= 2066,
+    rcLatvian			= 1062,
+    rcLithuanian		= 1063,
+    rcNorwegianBokmal		= 1044,
+    rcNorwegianNynorsk		= 2068,
+    rcPolish			= 1045,
+    rcPortugueseBrazilian	= 1046,
+    rcPortugueseStandard	= 2070,
+    rcRomanian			= 1048,
+    rcRussian			= 1049,
+    rcSerbian			= 2074,
+    rcSlovak			= 1051,
+    rcSpanishArgentina		= 11274,
+    rcSpanishBolivia		= 16394,
+    rcSpanishChile		= 13322,
+    rcSpanishColombia		= 9226,
+    rcSpanishCostaRica		= 5130,
+    rcSpanishDominicanRepublic	= 7178,
+    rcSpanishEcuador		= 12298,
+    rcSpanishGuatemala		= 4106,
+    rcSpanishMexico		= 2058,
+    rcSpanishModern		= 3082,
+    rcSpanishPanama		= 6154,
+    rcSpanishParaguay		= 15370,
+    rcSpanishPeru		= 10250,
+    rcSpanishTraditional	= 1034,
+    rcSpanishUruguay		= 14346,
+    rcSpanishVenezuela		= 8202,
+    rcSwedish			= 1053,
+    rcThai			= 1054,
+    rcTurkish			= 1055,
+    rcUkrainian			= 1058,
+    rcUrdu			= 1056
+};
+enum enumSccEvent {
+    eProjectInScc,
+    ePreDirtyNotification
+};
+enum favorSizeOrSpeedOption {
+    favorNone,
+    favorSpeed,
+    favorSize
+};
+enum genProxyLanguage {
+    genProxyNative,
+    genProxyManaged
+};
+enum inlineExpansionOption {
+    expandDisable,
+    expandOnlyInline,
+    expandAnySuitable,
+    expandDefault // Not useful number, but stops the output
+};
+enum linkIncrementalType {
+    linkIncrementalDefault,
+    linkIncrementalNo,
+    linkIncrementalYes
+};
+enum linkProgressOption {
+    linkProgressNotSet,
+    linkProgressAll,
+    linkProgressLibs
+};
+enum machineTypeOption {
+    machineNotSet,
+    machineX86
+};
+enum midlCharOption {
+    midlCharUnsigned,
+    midlCharSigned,
+    midlCharAscii7
+};
+enum midlErrorCheckOption {
+    midlEnableCustom,
+    midlDisableAll,
+    midlEnableAll
+};
+enum midlStructMemberAlignOption {
+    midlAlignNotSet,
+    midlAlignSingleByte,
+    midlAlignTwoBytes,
+    midlAlignFourBytes,
+    midlAlignEightBytes,
+    midlAlignSixteenBytes
+};
+enum midlTargetEnvironment {
+    midlTargetNotSet,
+    midlTargetWin32,
+    midlTargetWin64
+};
+enum midlWarningLevelOption {
+    midlWarningLevel_0,
+    midlWarningLevel_1,
+    midlWarningLevel_2,
+    midlWarningLevel_3,
+    midlWarningLevel_4
+};
+enum optFoldingType {
+    optFoldingDefault,
+    optNoFolding,
+    optFolding
+};
+enum optimizeOption {
+    optimizeDisabled,
+    optimizeMinSpace,
+    optimizeMaxSpeed,
+    optimizeFull,
+    optimizeCustom,
+    optimizeDefault // Not useful number, but stops the output
+};
+enum optRefType {
+    optReferencesDefault,
+    optNoReferences,
+    optReferences
+};
+enum optWin98Type {
+    optWin98Default,
+    optWin98No,
+    optWin98Yes
+};
+enum pchOption {
+    pchNone,
+    pchCreateUsingSpecific,
+    pchGenerateAuto,
+    pchUseUsingSpecific
+};
+enum preprocessOption {
+    preprocessUnknown = -1,
+    preprocessNo,
+    preprocessYes,
+    preprocessNoLineNumbers
+};
+enum ProcessorOptimizeOption {
+    procOptimizeBlended,
+    procOptimizePentium,
+    procOptimizePentiumProAndAbove
+};
+enum RemoteDebuggerType {
+    DbgLocal,
+    DbgRemote,
+    DbgRemoteTCPIP
+};
+enum runtimeLibraryOption {
+    rtUnknown = -1,
+    rtMultiThreaded,
+    rtMultiThreadedDebug,
+    rtMultiThreadedDLL,
+    rtMultiThreadedDebugDLL,
+    rtSingleThreaded,
+    rtSingleThreadedDebug
+};
+enum structMemberAlignOption {
+    alignNotSet,
+    alignSingleByte,
+    alignTwoBytes,
+    alignFourBytes,
+    alignEightBytes,
+    alignSixteenBytes
+};
+enum subSystemOption {
+    subSystemNotSet,
+    subSystemConsole,
+    subSystemWindows
+};
+enum termSvrAwarenessType {
+    termSvrAwareDefault,
+    termSvrAwareNo,
+    termSvrAwareYes
+};
+enum toolSetType {
+    toolSetUtility,
+    toolSetMakefile,
+    toolSetLinker,
+    toolSetLibrarian,
+    toolSetAll
+};
+enum TypeOfDebugger {
+    DbgNativeOnly,
+    DbgManagedOnly,
+    DbgMixed,
+    DbgAuto
+};
+enum useOfATL {
+    useATLNotSet,
+    useATLStatic,
+    useATLDynamic
+};
+enum useOfMfc {
+    useMfcStdWin,
+    useMfcStatic,
+    useMfcDynamic
+};
+enum warningLevelOption {
+    warningLevelUnknown = -1,
+    warningLevel_0,
+    warningLevel_1,
+    warningLevel_2,
+    warningLevel_3,
+    warningLevel_4
+};
+
+class VCToolBase {
+protected:
+    // Functions
+    VCToolBase(){};
+    virtual ~VCToolBase(){}
+    virtual bool parseOption( const char* option ) = 0;
+public:
+    void parseOptions( QStringList& options ) {
+	for ( QStringList::ConstIterator it=options.begin(); (it!=options.end()); it++ )
+	    parseOption( (*it).latin1() );
+    }
+};
+
+class VCConfiguration;
+class VCProject;
+
+class VCCLCompilerTool : public VCToolBase
+{
+public:
+    // Functions
+    VCCLCompilerTool();
+    virtual ~VCCLCompilerTool(){}
+    bool parseOption( const char* option );
+
+    // Variables
+    QStringList		    AdditionalIncludeDirectories;
+    QStringList		    AdditionalOptions;
+    QStringList		    AdditionalUsingDirectories;
+    QString		    AssemblerListingLocation;
+    asmListingOption	    AssemblerOutput;
+    basicRuntimeCheckOption BasicRuntimeChecks;
+    browseInfoOption	    BrowseInformation;
+    QString		    BrowseInformationFile;
+    triState		    BufferSecurityCheck;
+    callingConventionOption CallingConvention;
+    CompileAsOptions	    CompileAs;
+    compileAsManagedOptions CompileAsManaged;
+    triState		    CompileOnly;
+    debugOption		    DebugInformationFormat;
+    triState		    DefaultCharIsUnsigned;
+    triState		    Detect64BitPortabilityProblems;
+    triState		    DisableLanguageExtensions;
+    QStringList		    DisableSpecificWarnings;
+    triState		    EnableFiberSafeOptimizations;
+    triState		    EnableFunctionLevelLinking;
+    triState		    EnableIntrinsicFunctions;
+    triState		    ExceptionHandling;
+    triState		    ExpandAttributedSource;
+    favorSizeOrSpeedOption  FavorSizeOrSpeed;
+    triState		    ForceConformanceInForLoopScope;
+    QStringList		    ForcedIncludeFiles;
+    QStringList		    ForcedUsingFiles;
+    preprocessOption	    GeneratePreprocessedFile;
+    triState		    GlobalOptimizations;
+    triState		    IgnoreStandardIncludePath;
+    triState		    ImproveFloatingPointConsistency;
+    inlineExpansionOption   InlineFunctionExpansion;
+    triState		    KeepComments;
+    triState		    MinimalRebuild;
+    QString		    ObjectFile;
+    triState		    OmitFramePointers;
+    triState                OpenMP;
+    optimizeOption	    Optimization;
+    ProcessorOptimizeOption OptimizeForProcessor;
+    triState		    OptimizeForWindowsApplication;
+    QString		    OutputFile;
+    QString		    PrecompiledHeaderFile;
+    QString		    PrecompiledHeaderThrough;
+    QStringList		    PreprocessorDefinitions;
+    QString		    ProgramDataBaseFileName;
+    runtimeLibraryOption    RuntimeLibrary;
+    triState		    RuntimeTypeInfo;
+    triState		    ShowIncludes;
+    triState		    SmallerTypeCheck;
+    triState		    StringPooling;
+    structMemberAlignOption StructMemberAlignment;
+    triState		    SuppressStartupBanner;
+    triState		    TreatWChar_tAsBuiltInType;
+    triState		    TurnOffAssemblyGeneration;
+    triState		    UndefineAllPreprocessorDefinitions;
+    QStringList		    UndefinePreprocessorDefinitions;
+    pchOption		    UsePrecompiledHeader;
+    triState		    WarnAsError;
+    warningLevelOption	    WarningLevel;
+    triState		    WholeProgramOptimization;
+    VCConfiguration*	    config;
+};
+
+class VCLinkerTool : public VCToolBase
+{
+public:
+    // Functions
+    VCLinkerTool();
+    virtual ~VCLinkerTool(){}
+    bool parseOption( const char* option );
+
+    // Variables
+    QStringList		    AdditionalDependencies;
+    QStringList		    AdditionalLibraryDirectories;
+    QStringList		    AdditionalOptions;
+    QStringList		    AddModuleNamesToAssembly;
+    QString		    BaseAddress;
+    QStringList		    DelayLoadDLLs;
+    optFoldingType	    EnableCOMDATFolding;
+    QString		    EntryPointSymbol;
+    QStringList		    ForceSymbolReferences;
+    QString		    FunctionOrder;
+    triState		    GenerateDebugInformation;
+    triState		    GenerateMapFile;
+    long		    HeapCommitSize;
+    long		    HeapReserveSize;
+    triState		    IgnoreAllDefaultLibraries;
+    QStringList		    IgnoreDefaultLibraryNames;
+    triState		    IgnoreEmbeddedIDL;
+    triState		    IgnoreImportLibrary;
+    QString		    ImportLibrary;
+    addressAwarenessType    LargeAddressAware;
+    triState		    LinkDLL;
+    linkIncrementalType     LinkIncremental;
+    triState		    LinkTimeCodeGeneration;
+    QString		    LinkToManagedResourceFile;
+    triState		    MapExports;
+    QString		    MapFileName;
+    triState		    MapLines;
+    QString		    MergedIDLBaseFileName;
+    QString		    MergeSections;	    // Should be list?
+    QString		    MidlCommandFile;
+    QString		    ModuleDefinitionFile;   // Should be list?
+    optWin98Type	    OptimizeForWindows98;
+    optRefType		    OptimizeReferences;
+    QString		    OutputFile;
+    QString		    ProgramDatabaseFile;
+    triState		    RegisterOutput;
+    triState		    ResourceOnlyDLL;
+    triState		    SetChecksum;
+    linkProgressOption	    ShowProgress;
+    long		    StackCommitSize;
+    long		    StackReserveSize;
+    QString		    StripPrivateSymbols;    // Should be list?
+    subSystemOption	    SubSystem;
+    triState		    SupportUnloadOfDelayLoadedDLL;
+    triState		    SuppressStartupBanner;
+    triState		    SwapRunFromCD;
+    triState		    SwapRunFromNet;
+    machineTypeOption       TargetMachine;
+    termSvrAwarenessType    TerminalServerAware;
+    triState		    TurnOffAssemblyGeneration;
+    QString		    TypeLibraryFile;
+    long		    TypeLibraryResourceID;
+    QString		    Version;
+    VCConfiguration*	    config;
+};
+
+class VCMIDLTool : public VCToolBase
+{
+public:
+    // Functions
+    VCMIDLTool();
+    virtual ~VCMIDLTool(){}
+    bool parseOption( const char* option );
+
+    // Variables
+    QStringList		    AdditionalIncludeDirectories;
+    QStringList		    AdditionalOptions;
+    QStringList		    CPreprocessOptions;
+    midlCharOption	    DefaultCharType;
+    QString		    DLLDataFileName;    // Should be list?
+    midlErrorCheckOption    EnableErrorChecks;
+    triState		    ErrorCheckAllocations;
+    triState		    ErrorCheckBounds;
+    triState		    ErrorCheckEnumRange;
+    triState		    ErrorCheckRefPointers;
+    triState		    ErrorCheckStubData;
+    QStringList		    FullIncludePath;
+    triState		    GenerateStublessProxies;
+    triState		    GenerateTypeLibrary;
+    QString		    HeaderFileName;
+    triState		    IgnoreStandardIncludePath;
+    QString		    InterfaceIdentifierFileName;
+    triState		    MkTypLibCompatible;
+    QString		    OutputDirectory;
+    QStringList		    PreprocessorDefinitions;
+    QString		    ProxyFileName;
+    QString		    RedirectOutputAndErrors;
+    midlStructMemberAlignOption StructMemberAlignment;
+    triState		    SuppressStartupBanner;
+    midlTargetEnvironment   TargetEnvironment;
+    QString		    TypeLibraryName;
+    QStringList		    UndefinePreprocessorDefinitions;
+    triState		    ValidateParameters;
+    triState		    WarnAsError;
+    midlWarningLevelOption  WarningLevel;
+    VCConfiguration*	    config;
+};
+
+class VCLibrarianTool : public VCToolBase
+{
+public:
+    // Functions
+    VCLibrarianTool();
+    virtual ~VCLibrarianTool(){}
+    bool parseOption( const char* ){ return FALSE; };
+
+    // Variables
+    QStringList		    AdditionalDependencies;
+    QStringList		    AdditionalLibraryDirectories;
+    QStringList		    AdditionalOptions;
+    QStringList		    ExportNamedFunctions;
+    QStringList		    ForceSymbolReferences;
+    triState		    IgnoreAllDefaultLibraries;
+    QStringList		    IgnoreDefaultLibraryNames;
+    QString		    ModuleDefinitionFile;
+    QString		    OutputFile;
+    triState		    SuppressStartupBanner;
+};
+
+class VCCustomBuildTool : public VCToolBase
+{
+public:
+    // Functions
+    VCCustomBuildTool();
+    virtual ~VCCustomBuildTool(){}
+    bool parseOption( const char* ){ return FALSE; };
+
+    // Variables
+    QStringList		    AdditionalDependencies;
+    QStringList		    CommandLine;
+    QString		    Description;
+    QStringList		    Outputs;
+    QString		    ToolName;
+    QString		    ToolPath;
+};
+
+class VCResourceCompilerTool : public VCToolBase
+{
+public:
+    // Functions
+    VCResourceCompilerTool();
+    virtual ~VCResourceCompilerTool(){}
+    bool parseOption( const char* ){ return FALSE; };
+
+    // Variables
+    QStringList		    AdditionalIncludeDirectories;
+    QStringList		    AdditionalOptions;
+    enumResourceLangID	    Culture;
+    QStringList		    FullIncludePath;
+    triState		    IgnoreStandardIncludePath;
+    QStringList		    PreprocessorDefinitions;
+    QString		    ResourceOutputFileName;
+    linkProgressOption	    ShowProgress;
+    QString		    ToolPath;
+};
+
+class VCEventTool : public VCToolBase
+{
+protected:
+    // Functions
+    VCEventTool() : ExcludedFromBuild( unset ){};
+    virtual ~VCEventTool(){}
+    bool parseOption( const char* ){ return FALSE; };
+
+public:
+    // Variables
+    QString		    CommandLine;
+    QString		    Description;
+    triState		    ExcludedFromBuild;
+    QString		    ToolName;
+    QString		    ToolPath;
+};
+
+class VCPostBuildEventTool : public VCEventTool
+{
+public:
+    VCPostBuildEventTool();
+    ~VCPostBuildEventTool(){}
+};
+
+class VCPreBuildEventTool : public VCEventTool
+{
+public:
+    VCPreBuildEventTool();
+    ~VCPreBuildEventTool(){}
+};
+
+class VCPreLinkEventTool : public VCEventTool
+{
+public:
+    VCPreLinkEventTool();
+    ~VCPreLinkEventTool(){}
+};
+
+class VCConfiguration
+{
+public:
+    // Functions
+    VCConfiguration();
+    VCConfiguration(const VCConfiguration &other);
+    ~VCConfiguration() {}
+
+    // Variables
+    triState		ATLMinimizesCRunTimeLibraryUsage;
+    triState		BuildBrowserInformation;
+    charSet		CharacterSet;
+    ConfigurationTypes	ConfigurationType;
+    QString		DeleteExtensionsOnClean;
+    QString		ImportLibrary;
+    QString		IntermediateDirectory;
+    QString		Name;
+    QString		OutputDirectory;
+    QString		PrimaryOutput;
+    QString		ProgramDatabase;
+    triState		RegisterOutput;
+    useOfATL		UseOfATL;
+    useOfMfc		UseOfMfc;
+    triState		WholeProgramOptimization;
+
+    // XML sub-parts
+    VCCLCompilerTool	    compiler;
+    VCLinkerTool	    linker;
+    VCLibrarianTool	    librarian;
+    VCCustomBuildTool	    custom;
+    VCMIDLTool		    idl;
+    VCPostBuildEventTool    postBuild;
+    VCPreBuildEventTool	    preBuild;
+    VCPreLinkEventTool	    preLink;
+    VCResourceCompilerTool  resource;
+};
+
+class VcprojGenerator;
+class VCFilter
+{
+public:
+    // Functions
+    VCFilter();
+    ~VCFilter(){}
+    void addMOCstage( QTextStream &strm, QString str );
+    void addUICstage( QTextStream &strm, QString str );
+    bool addIMGstage( QTextStream &strm, QString str );
+    void modifyPCHstage( QTextStream &strm, QString str );
+    bool addLexYaccStage( QTextStream &strm, QString str );
+
+    // Variables
+    QString		Name;
+    QString		Filter;
+    triState		ParseFiles;
+    QStringList		Files;
+    VcprojGenerator*	Project;
+    QValueList<VCConfiguration> *Config;
+    customBuildCheck	CustomBuild;
+    bool		useCustomBuildTool;
+    VCCustomBuildTool   CustomBuildTool;
+    bool		useCompilerTool;
+    VCCLCompilerTool    CompilerTool;
+    bool		flat_files;
+};
+
+class VCProject
+{
+public:
+    // Functions
+    VCProject();
+    ~VCProject(){}
+
+    // Variables
+    QString		Name;
+    QString		Version;
+    QString		ProjectGUID;
+    QString		SccProjectName;
+    QString		SccLocalPath;
+    QString		PlatformName;
+
+    // XML sub-parts
+    QValueList<VCConfiguration> Configuration;
+    VCFilter		SourceFiles;
+    VCFilter		HeaderFiles;
+    VCFilter		MOCFiles;
+    VCFilter		UICFiles;
+    VCFilter		FormFiles;
+    VCFilter		TranslationFiles;
+    VCFilter		LexYaccFiles;
+    VCFilter		ResourceFiles;
+};
+
+QTextStream &operator<<( QTextStream &, const VCCLCompilerTool & );
+QTextStream &operator<<( QTextStream &, const VCLinkerTool & );
+QTextStream &operator<<( QTextStream &, const VCMIDLTool & );
+QTextStream &operator<<( QTextStream &, const VCCustomBuildTool & );
+QTextStream &operator<<( QTextStream &, const VCLibrarianTool & );
+QTextStream &operator<<( QTextStream &, const VCResourceCompilerTool & );
+QTextStream &operator<<( QTextStream &, const VCEventTool & );
+QTextStream &operator<<( QTextStream &, const VCConfiguration & );
+QTextStream &operator<<( QTextStream &, VCFilter & );
+QTextStream &operator<<( QTextStream &, const VCProject & );
+
+#endif //__MSVC_OBJECTMODEL_H__
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
new file mode 100644
index 0000000..f7fa84f
--- /dev/null
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -0,0 +1,1541 @@
+/****************************************************************************
+**
+** Implementation of VcprojGenerator class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#include "msvc_vcproj.h"
+#include "option.h"
+#include "qtmd5.h" // SG's MD5 addon
+#include <qdir.h>
+#include <qregexp.h>
+#include <qdict.h>
+#include <quuid.h>
+#include <stdlib.h>
+#include <qsettings.h>
+
+//#define DEBUG_SOLUTION_GEN
+//#define DEBUG_PROJECT_GEN
+
+// .NET version detection -------------------------
+struct DotNetStrings {
+    DotNET version;
+    const char *versionStr;
+    const char *regKey;
+} dotNetCombo[] = {
+#ifdef Q_OS_WIN64
+    {NET2005, "MSVC.NET 2005 (8.0)", "Wow6432Node\\Microsoft\\VisualStudio\\8.0\\Setup\\VC\\ProductDir"},
+    {NET2005, "MSVC 2005 Express Edition(8.0)", "Wow6432Node\\Microsoft\\VCExpress\\8.0\\Setup\\VC\\ProductDir"},
+    {NET2003, "MSVC.NET 2003 (7.1)", "Wow6432Node\\Microsoft\\VisualStudio\\7.1\\Setup\\VC\\ProductDir"},
+    {NET2002, "MSVC.NET 2002 (7.0)", "Wow6432Node\\Microsoft\\VisualStudio\\7.0\\Setup\\VC\\ProductDir"},
+#else
+    {NET2005, "MSVC.NET 2005 (8.0)", "Microsoft\\VisualStudio\\8.0\\Setup\\VC\\ProductDir"},
+    {NET2005, "MSVC 2005 Express Edition(8.0)", "Microsoft\\VCExpress\\8.0\\Setup\\VC\\ProductDir"},
+    {NET2003, "MSVC.NET 2003 (7.1)", "Microsoft\\VisualStudio\\7.1\\Setup\\VC\\ProductDir"},
+    {NET2002, "MSVC.NET 2002 (7.0)", "Microsoft\\VisualStudio\\7.0\\Setup\\VC\\ProductDir"},
+#endif
+    {NETUnknown, "", ""}
+};
+
+DotNET which_dotnet_version()
+{
+#ifndef Q_OS_WIN32
+    return NET2002; // Always generate 7.0 versions on other platforms
+#else
+    // Only search for the version once
+    static DotNET current_version = NETUnknown;
+    if(current_version != NETUnknown)
+        return current_version;
+
+    // Fallback to .NET 2002
+    current_version = NET2002;
+
+    QSettings setting;
+    QStringList warnPath;
+    int installed = 0;
+    int i = 0;
+    for(; dotNetCombo[i].version; ++i) {
+        QString path = setting.readEntry(dotNetCombo[i].regKey);
+        if(!path.isNull()) {
+            ++installed;
+            current_version = dotNetCombo[i].version;
+	    warnPath += QString("%1").arg(dotNetCombo[i].versionStr);
+        }
+    }
+
+    if (installed < 2)
+        return current_version;
+
+    // More than one version installed, search directory path
+    QString paths = getenv("PATH");
+    QStringList pathlist = QStringList::split(";", paths.lower());
+
+    i = installed = 0;
+    for(; dotNetCombo[i].version; ++i) {
+        QString productPath = setting.readEntry(dotNetCombo[i].regKey).lower();
+        if (productPath.isNull())
+	        continue;
+        QStringList::iterator it;
+        for(it = pathlist.begin(); it != pathlist.end(); ++it) {
+            if((*it).contains(productPath)) {
+                ++installed;
+                current_version = dotNetCombo[i].version;
+                warnPath += QString("%1 in path").arg(dotNetCombo[i].versionStr);
+                    break;
+            }
+        }
+    }
+
+    switch(installed) {
+    case 1:
+	    break;
+    case 0:
+	    warn_msg(WarnLogic, "Generator: MSVC.NET: Found more than one version of Visual Studio, but"
+			     " none in your path! Fallback to lowest version (%s)", warnPath.join(", ").latin1());
+	    break;
+    default:
+	    warn_msg(WarnLogic, "Generator: MSVC.NET: Found more than one version of Visual Studio in"
+			     " your path! Fallback to lowest version (%s)", warnPath.join(", ").latin1());
+	    break;
+    }
+
+    return current_version;
+#endif
+};
+
+// Flatfile Tags ----------------------------------------------------
+const char* _slnHeader70	= "Microsoft Visual Studio Solution File, Format Version 7.00";
+const char* _slnHeader71	= "Microsoft Visual Studio Solution File, Format Version 8.00";
+const char* _slnHeader80        = "Microsoft Visual Studio Solution File, Format Version 9.00";
+				  // The following UUID _may_ change for later servicepacks...
+				  // If so we need to search through the registry at
+				  // HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\7.0\Projects
+				  // to find the subkey that contains a "PossibleProjectExtension"
+				  // containing "vcproj"...
+				  // Use the hardcoded value for now so projects generated on other
+				  // platforms are actually usable.
+const char* _slnMSVCvcprojGUID  = "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}";
+const char* _slnProjectBeg	= "\nProject(\"";
+const char* _slnProjectMid	= "\") = ";
+const char* _slnProjectEnd	= "\nEndProject";
+const char* _slnGlobalBeg	= "\nGlobal";
+const char* _slnGlobalEnd	= "\nEndGlobal";
+const char* _slnSolutionConf	= "\n\tGlobalSection(SolutionConfiguration) = preSolution"
+				  "\n\t\tConfigName.0 = Debug"
+				  "\n\t\tConfigName.1 = Release"
+				  "\n\tEndGlobalSection";
+const char* _slnProjDepBeg	= "\n\tGlobalSection(ProjectDependencies) = postSolution";
+const char* _slnProjDepEnd	= "\n\tEndGlobalSection";
+const char* _slnProjConfBeg	= "\n\tGlobalSection(ProjectConfiguration) = postSolution";
+const char* _slnProjRelConfTag1	= ".Release.ActiveCfg = Release|Win32";
+const char* _slnProjRelConfTag2	= ".Release.Build.0 = Release|Win32";
+const char* _slnProjDbgConfTag1	= ".Debug.ActiveCfg = Debug|Win32";
+const char* _slnProjDbgConfTag2	= ".Debug.Build.0 = Debug|Win32";
+const char* _slnProjConfEnd	= "\n\tEndGlobalSection";
+const char* _slnExtSections	= "\n\tGlobalSection(ExtensibilityGlobals) = postSolution"
+				  "\n\tEndGlobalSection"
+				  "\n\tGlobalSection(ExtensibilityAddIns) = postSolution"
+				  "\n\tEndGlobalSection";
+// ------------------------------------------------------------------
+
+VcprojGenerator::VcprojGenerator(QMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE)
+{
+}
+
+/* \internal
+    Generates a project file for the given profile.
+    Options are either a Visual Studio projectfiles, or
+    solutionfiles by parsing recursive projectdirectories.
+*/
+bool VcprojGenerator::writeMakefile(QTextStream &t)
+{
+    // Check if all requirements are fullfilled
+    if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
+	fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n",
+		var("QMAKE_FAILED_REQUIREMENTS").latin1());
+	return TRUE;
+    }
+
+    // Generate project file
+    if(project->first("TEMPLATE") == "vcapp" ||
+       project->first("TEMPLATE") == "vclib") {
+        debug_msg(1, "Generator: MSVC.NET: Writing project file" );
+	t << vcProject;
+	return TRUE;
+    }
+    // Generate solution file
+    else if(project->first("TEMPLATE") == "vcsubdirs") {
+        debug_msg(1, "Generator: MSVC.NET: Writing solution file" );
+	writeSubDirs(t);
+	return TRUE;
+    }
+    return FALSE;
+
+}
+
+struct VcsolutionDepend {
+    QString uuid;
+    QString vcprojFile, orig_target, target;
+    ::target targetType;
+    bool debugBuild;
+    QStringList dependencies;
+};
+
+QUuid VcprojGenerator::getProjectUUID(const QString &filename)
+{
+    bool validUUID = TRUE;
+
+    // Read GUID from variable-space
+    QUuid uuid = project->first("GUID");
+
+    // If none, create one based on the MD5 of absolute project path
+    if (uuid.isNull() || !filename.isNull()) {
+	QString abspath = filename.isNull()?project->first("QMAKE_MAKEFILE"):filename;
+	qtMD5(abspath.utf8(), (unsigned char*)(&uuid));
+	validUUID = !uuid.isNull();
+	uuid.data4[0] = (uuid.data4[0] & 0x3F) | 0x80; // UV_DCE variant
+	uuid.data3 = (uuid.data3 & 0x0FFF) | (QUuid::Name<<12);
+    }
+
+    // If still not valid, generate new one, and suggest adding to .pro
+    if (uuid.isNull() || !validUUID) {
+	uuid = QUuid::createUuid();
+	fprintf(stderr,
+	        "qmake couldn't create a GUID based on filepath, and we couldn't\nfind a valid GUID in the .pro file (Consider adding\n'GUID = %s'  to the .pro file)\n",
+		uuid.toString().upper().latin1());
+    }
+
+    // Store GUID in variable-space
+    project->values("GUID") = uuid.toString().upper();
+    return uuid;
+}
+
+QUuid VcprojGenerator::increaseUUID( const QUuid &id )
+{
+    QUuid result( id );
+    Q_LONG dataFirst = (result.data4[0] << 24) +
+		       (result.data4[1] << 16) +
+		       (result.data4[2] << 8) +
+                        result.data4[3];
+    Q_LONG dataLast =  (result.data4[4] << 24) +
+		       (result.data4[5] << 16) +
+		       (result.data4[6] <<  8) +
+		        result.data4[7];
+
+    if ( !(dataLast++) )
+	dataFirst++;
+
+    result.data4[0] = uchar((dataFirst >> 24) & 0xff);
+    result.data4[1] = uchar((dataFirst >> 16) & 0xff);
+    result.data4[2] = uchar((dataFirst >>  8) & 0xff);
+    result.data4[3] = uchar( dataFirst        & 0xff);
+    result.data4[4] = uchar((dataLast  >> 24) & 0xff);
+    result.data4[5] = uchar((dataLast  >> 16) & 0xff);
+    result.data4[6] = uchar((dataLast  >>  8) & 0xff);
+    result.data4[7] = uchar( dataLast         & 0xff);
+    return result;
+}
+
+void VcprojGenerator::writeSubDirs(QTextStream &t)
+{
+    if(project->first("TEMPLATE") == "subdirs") {
+	writeHeader(t);
+	Win32MakefileGenerator::writeSubDirs(t);
+	return;
+    }
+
+    switch(which_dotnet_version()) {
+    case NET2005:
+        t << _slnHeader80;
+        break;
+    case NET2003:
+        t << _slnHeader71;
+        break;
+    case NET2002:
+        t << _slnHeader70;
+        break;
+    default:
+        t << _slnHeader70;
+        warn_msg(WarnLogic, "Generator: MSVC.NET: Unknown version (%d) of MSVC detected for .sln", which_dotnet_version());
+        break;
+    }
+
+    QDict<VcsolutionDepend> solution_depends;
+
+    QPtrList<VcsolutionDepend> solution_cleanup;
+    solution_cleanup.setAutoDelete(TRUE);
+
+
+    QStringList subdirs = project->variables()["SUBDIRS"];
+    QString oldpwd = QDir::currentDirPath();
+
+    for(QStringList::Iterator it = subdirs.begin(); it != subdirs.end(); ++it) {
+	QFileInfo fi(Option::fixPathToLocalOS((*it), TRUE));
+	if(fi.exists()) {
+	    if(fi.isDir()) {
+		QString profile = (*it);
+		if(!profile.endsWith(Option::dir_sep))
+		    profile += Option::dir_sep;
+		profile += fi.baseName() + ".pro";
+		subdirs.append(profile);
+	    } else {
+		QMakeProject tmp_proj;
+		QString dir = fi.dirPath(), fn = fi.fileName();
+		if(!dir.isEmpty()) {
+		    if(!QDir::setCurrent(dir))
+			fprintf(stderr, "Cannot find directory: %s\n", dir.latin1());
+		}
+		if(tmp_proj.read(fn, oldpwd)) {
+		    if(tmp_proj.first("TEMPLATE") == "vcsubdirs") {
+			subdirs += fileFixify(tmp_proj.variables()["SUBDIRS"]);
+		    } else if(tmp_proj.first("TEMPLATE") == "vcapp" || tmp_proj.first("TEMPLATE") == "vclib") {
+			// Initialize a 'fake' project to get the correct variables
+			// and to be able to extract all the dependencies
+			VcprojGenerator tmp_vcproj(&tmp_proj);
+			tmp_vcproj.setNoIO(TRUE);
+			tmp_vcproj.init();
+			if(Option::debug_level) {
+			    QMap<QString, QStringList> &vars = tmp_proj.variables();
+			    for(QMap<QString, QStringList>::Iterator it = vars.begin();
+				it != vars.end(); ++it) {
+				if(it.key().left(1) != "." && !it.data().isEmpty())
+				    debug_msg(1, "%s: %s === %s", fn.latin1(), it.key().latin1(),
+						it.data().join(" :: ").latin1());
+			    }
+			}
+
+			// We assume project filename is [QMAKE_ORIG_TARGET].vcproj
+			QString vcproj = fixFilename(tmp_vcproj.project->first("QMAKE_ORIG_TARGET")) + project->first("VCPROJ_EXTENSION");
+
+			// If file doesn't exsist, then maybe the users configuration
+			// doesn't allow it to be created. Skip to next...
+			if(!QFile::exists(QDir::currentDirPath() + Option::dir_sep + vcproj)) {
+			    warn_msg(WarnLogic, "Ignored (not found) '%s'", QString(QDir::currentDirPath() + Option::dir_sep + vcproj).latin1() );
+			    goto nextfile; // # Dirty!
+			}
+
+			VcsolutionDepend *newDep = new VcsolutionDepend;
+			newDep->vcprojFile = fileFixify(vcproj);
+			newDep->orig_target = tmp_proj.first("QMAKE_ORIG_TARGET");
+			newDep->target = tmp_proj.first("MSVCPROJ_TARGET").section(Option::dir_sep, -1);
+			newDep->targetType = tmp_vcproj.projectTarget;
+			newDep->debugBuild = tmp_proj.isActiveConfig("debug");
+			newDep->uuid = getProjectUUID(Option::fixPathToLocalOS(QDir::currentDirPath() + QDir::separator() + vcproj)).toString().upper();
+
+			// We want to store it as the .lib name.
+			if(newDep->target.endsWith(".dll"))
+			    newDep->target = newDep->target.left(newDep->target.length()-3) + "lib";
+
+			// All projects using Forms are dependent on uic.exe
+			if(!tmp_proj.isEmpty("FORMS"))
+			    newDep->dependencies << "uic.exe";
+
+			// Add all unknown libs to the deps
+			QStringList where("QMAKE_LIBS");
+			if(!tmp_proj.isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
+			    where = tmp_proj.variables()["QMAKE_INTERNAL_PRL_LIBS"];
+			for(QStringList::iterator wit = where.begin();
+			    wit != where.end(); ++wit) {
+			    QStringList &l = tmp_proj.variables()[(*wit)];
+			    for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+				QString opt = (*it);
+				if(!opt.startsWith("/") &&   // Not a switch
+				    opt != newDep->target && // Not self
+				    opt != "opengl32.lib" && // We don't care about these libs
+				    opt != "glu32.lib" &&    // to make depgen alittle faster
+				    opt != "kernel32.lib" &&
+				    opt != "user32.lib" &&
+				    opt != "gdi32.lib" &&
+				    opt != "comdlg32.lib" &&
+				    opt != "advapi32.lib" &&
+				    opt != "shell32.lib" &&
+				    opt != "ole32.lib" &&
+				    opt != "oleaut32.lib" &&
+				    opt != "uuid.lib" &&
+				    opt != "imm32.lib" &&
+				    opt != "winmm.lib" &&
+				    opt != "wsock32.lib" &&
+				    opt != "winspool.lib" &&
+				    opt != "delayimp.lib" )
+				{
+				    newDep->dependencies << opt.section(Option::dir_sep, -1);
+				}
+			    }
+			}
+#ifdef DEBUG_SOLUTION_GEN
+			qDebug( "Deps for %20s: [%s]", newDep->target.latin1(), newDep->dependencies.join(" :: " ).latin1() );
+#endif
+			solution_cleanup.append(newDep);
+  			solution_depends.insert(newDep->target, newDep);
+			t << _slnProjectBeg << _slnMSVCvcprojGUID << _slnProjectMid
+			    << "\"" << newDep->orig_target << "\", \"" << newDep->vcprojFile
+			    << "\", \"" << newDep->uuid << "\"";
+			t << _slnProjectEnd;
+		    }
+		}
+nextfile:
+		QDir::setCurrent(oldpwd);
+	    }
+	}
+    }
+    t << _slnGlobalBeg;
+    t << _slnSolutionConf;
+    t << _slnProjDepBeg;
+
+    // Figure out dependencies
+    for(solution_cleanup.first(); solution_cleanup.current(); solution_cleanup.next()) {
+	int cnt = 0;
+	for(QStringList::iterator dit = solution_cleanup.current()->dependencies.begin();
+	    dit != solution_cleanup.current()->dependencies.end();
+	    ++dit)
+	{
+	    VcsolutionDepend *vc = solution_depends[*dit];
+	    if(vc)
+		t << "\n\t\t" << solution_cleanup.current()->uuid << "." << cnt++ << " = " << vc->uuid;
+	}
+    }
+    t << _slnProjDepEnd;
+    t << _slnProjConfBeg;
+    for(solution_cleanup.first(); solution_cleanup.current(); solution_cleanup.next()) {
+	t << "\n\t\t" << solution_cleanup.current()->uuid << _slnProjDbgConfTag1;
+	t << "\n\t\t" << solution_cleanup.current()->uuid << _slnProjDbgConfTag2;
+	t << "\n\t\t" << solution_cleanup.current()->uuid << _slnProjRelConfTag1;
+	t << "\n\t\t" << solution_cleanup.current()->uuid << _slnProjRelConfTag2;
+    }
+    t << _slnProjConfEnd;
+    t << _slnExtSections;
+    t << _slnGlobalEnd;
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+
+void VcprojGenerator::init()
+{
+    if( init_flag )
+	return;
+    if(project->first("TEMPLATE") == "vcsubdirs") { //too much work for subdirs
+	init_flag = TRUE;
+	return;
+    }
+
+    debug_msg(1, "Generator: MSVC.NET: Initializing variables" );
+
+/*
+    // Once to be nice and clean code...
+    // Wouldn't life be great?
+
+    // Are we building Qt?
+    bool is_qt =
+	( project->first("TARGET") == "qt"QTDLL_POSTFIX ||
+	  project->first("TARGET") == "qt-mt"QTDLL_POSTFIX );
+
+    // Are we using Qt?
+    bool isQtActive = project->isActiveConfig("qt");
+
+    if ( isQtActive ) {
+	project->variables()["CONFIG"] += "moc";
+	project->variables()["CONFIG"] += "windows";
+	project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QT"];
+	project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"];
+
+	if( projectTarget == SharedLib )
+	    project->variables()["DEFINES"] += "QT_DLL";
+
+	if( project->isActiveConfig("accessibility" ) )
+	    project->variables()["DEFINES"] += "QT_ACCESSIBILITY_SUPPORT";
+
+	if ( project->isActiveConfig("plugin")) {
+	    project->variables()["DEFINES"] += "QT_PLUGIN";
+	    project->variables()["CONFIG"] += "dll";
+	}
+
+	if( project->isActiveConfig("thread") ) {
+	    project->variables()["DEFINES"] += "QT_THREAD_SUPPORT";
+	    project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"];
+	} else {
+	    project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"];
+	}
+    }
+
+    if ( project->isActiveConfig("opengl") ) {
+	project->variables()["CONFIG"] += "windows"; // <-- Also in 'qt' above
+	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"];
+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"];
+
+    }
+*/
+    initOld();	   // Currently calling old DSP code to set variables. CLEAN UP!
+
+    // Figure out what we're trying to build
+    if ( project->first("TEMPLATE") == "vcapp" ) {
+	projectTarget = Application;
+    } else if ( project->first("TEMPLATE") == "vclib") {
+	if ( project->isActiveConfig( "staticlib" ) )
+	    projectTarget = StaticLib;
+	else
+	    projectTarget = SharedLib;
+    }
+
+    // Setup PCH variables
+    precompH = project->first("PRECOMPILED_HEADER");
+    usePCH = !precompH.isEmpty() && project->isActiveConfig("precompile_header");
+    if (usePCH) {
+	precompHFilename = QFileInfo(precompH).fileName();
+	// Created files
+	QString origTarget = project->first("QMAKE_ORIG_TARGET");
+	precompObj = origTarget + Option::obj_ext;
+	precompPch = origTarget + ".pch";
+	// Add PRECOMPILED_HEADER to HEADERS
+	if (!project->variables()["HEADERS"].contains(precompH))
+	    project->variables()["HEADERS"] += precompH;
+	// Return to variable pool
+	project->variables()["PRECOMPILED_OBJECT"] = precompObj;
+	project->variables()["PRECOMPILED_PCH"]    = precompPch;
+    }
+
+    initProject(); // Fills the whole project with proper data
+}
+
+void VcprojGenerator::initProject()
+{
+    // Initialize XML sub elements
+    // - Do this first since project elements may need
+    // - to know of certain configuration options
+    initConfiguration();
+    initSourceFiles();
+    initHeaderFiles();
+    initMOCFiles();
+    initUICFiles();
+    initFormsFiles();
+    initTranslationFiles();
+    initLexYaccFiles();
+    initResourceFiles();
+
+    // Own elements -----------------------------
+    vcProject.Name = project->first("QMAKE_ORIG_TARGET");
+
+    switch(which_dotnet_version()) {
+    case NET2005:
+        vcProject.Version = "8.00";
+        break;
+    case NET2003:
+        vcProject.Version = "7.10";
+        break;
+    case NET2002:
+        vcProject.Version = "7.00";
+        break;
+    default:
+        vcProject.Version = "7.00";
+        break;
+    }
+
+    vcProject.ProjectGUID = getProjectUUID().toString().upper();
+    vcProject.PlatformName = ( vcProject.Configuration[0].idl.TargetEnvironment == midlTargetWin64 ? "Win64" : "Win32" );
+    // These are not used by Qt, but may be used by customers
+    vcProject.SccProjectName = project->first("SCCPROJECTNAME");
+    vcProject.SccLocalPath = project->first("SCCLOCALPATH");
+}
+
+void VcprojGenerator::initConfiguration()
+{
+    // Initialize XML sub elements
+    // - Do this first since main configuration elements may need
+    // - to know of certain compiler/linker options
+    initCompilerTool();
+    if ( projectTarget == StaticLib )
+	initLibrarianTool();
+    else
+	initLinkerTool();
+    initIDLTool();
+
+    // Own elements -----------------------------
+    QString temp = project->first("BuildBrowserInformation");
+    switch ( projectTarget ) {
+    case SharedLib:
+        vcProject.Configuration[0].ConfigurationType = typeDynamicLibrary;
+	break;
+    case StaticLib:
+        vcProject.Configuration[0].ConfigurationType = typeStaticLibrary;
+	break;
+    case Application:
+    default:
+        vcProject.Configuration[0].ConfigurationType = typeApplication;
+	break;
+    }
+
+    // Release version of the Configuration ---------------
+    VCConfiguration &RConf = vcProject.Configuration[0];
+    RConf.Name = "Release";
+    RConf.Name += ( RConf.idl.TargetEnvironment == midlTargetWin64 ? "|Win64" : "|Win32" );
+    RConf.ATLMinimizesCRunTimeLibraryUsage = ( project->first("ATLMinimizesCRunTimeLibraryUsage").isEmpty() ? _False : _True );
+    RConf.BuildBrowserInformation = triState( temp.isEmpty() ? (short)unset : temp.toShort() );
+    temp = project->first("CharacterSet");
+    RConf.CharacterSet = charSet( temp.isEmpty() ? (short)charSetNotSet : temp.toShort() );
+    RConf.DeleteExtensionsOnClean = project->first("DeleteExtensionsOnClean");
+    RConf.ImportLibrary = RConf.linker.ImportLibrary;
+    RConf.IntermediateDirectory = project->first("OBJECTS_DIR");
+    RConf.OutputDirectory = ".";
+    RConf.PrimaryOutput = project->first("PrimaryOutput");
+    RConf.WholeProgramOptimization = RConf.compiler.WholeProgramOptimization;
+    temp = project->first("UseOfATL");
+    if ( !temp.isEmpty() )
+	RConf.UseOfATL = useOfATL( temp.toShort() );
+    temp = project->first("UseOfMfc");
+    if ( !temp.isEmpty() )
+        RConf.UseOfMfc = useOfMfc( temp.toShort() );
+
+    // Configuration does not need parameters from
+    // these sub XML items;
+    initCustomBuildTool();
+    initPreBuildEventTools();
+    initPostBuildEventTools();
+    initPreLinkEventTools();
+
+    // Debug version of the Configuration -----------------
+    VCConfiguration DConf = vcProject.Configuration[0]; // Create copy configuration for debug
+    DConf.Name = "Debug";
+    DConf.Name += ( DConf.idl.TargetEnvironment == midlTargetWin64 ? "|Win64" : "|Win32" );
+
+    // Set definite values in both configurations
+    DConf.compiler.PreprocessorDefinitions.remove("NDEBUG");
+    RConf.compiler.PreprocessorDefinitions += "NDEBUG";
+    RConf.linker.GenerateDebugInformation = _False;
+    DConf.linker.GenerateDebugInformation = _True;
+
+    // Modify configurations, based on Qt build
+    if ( !project->isActiveConfig("debug") ) {
+	RConf.IntermediateDirectory =
+	RConf.compiler.AssemblerListingLocation =
+	RConf.compiler.ObjectFile = "Release\\";
+	RConf.librarian.OutputFile =
+	RConf.linker.OutputFile = RConf.IntermediateDirectory + "\\" + project->first("MSVCPROJ_TARGET");
+	RConf.linker.parseOptions(project->variables()["QMAKE_LFLAGS_RELEASE"]);
+	RConf.compiler.parseOptions(project->variables()["QMAKE_CFLAGS_RELEASE"]);
+	RConf.compiler.parseOptions(project->variables()["QMAKE_CXXFLAGS_RELEASE"]);
+        if (!project->variables()["QMAKE_CXXFLAGS_RELEASE"].contains("Gm")
+            && project->variables()["QMAKE_CXXFLAGS_DEBUG"].contains("Gm"))
+            RConf.compiler.parseOption("-Gm-");
+        if (RConf.compiler.PreprocessorDefinitions.findIndex("QT_NO_DEBUG") == -1)
+            RConf.compiler.PreprocessorDefinitions += "QT_NO_DEBUG";
+    } else {
+	DConf.IntermediateDirectory =
+	DConf.compiler.AssemblerListingLocation =
+	DConf.compiler.ObjectFile = "Debug\\";
+	DConf.librarian.OutputFile =
+	DConf.linker.OutputFile = DConf.IntermediateDirectory + "\\" + project->first("MSVCPROJ_TARGET");
+	DConf.linker.DelayLoadDLLs.clear();
+	DConf.compiler.parseOptions(project->variables()["QMAKE_CFLAGS_DEBUG"]);
+        DConf.compiler.parseOptions(project->variables()["QMAKE_CXXFLAGS_DEBUG"]);
+        DConf.compiler.PreprocessorDefinitions.remove("QT_NO_DEBUG");
+    }
+
+    // Add Debug configuration to project
+    vcProject.Configuration += DConf;
+}
+
+void VcprojGenerator::initCompilerTool()
+{
+    QString placement = project->first("OBJECTS_DIR");
+    if ( placement.isEmpty() )
+	placement = ".\\";
+
+    VCConfiguration &RConf = vcProject.Configuration[0];
+    RConf.compiler.AssemblerListingLocation = placement ;
+    RConf.compiler.ProgramDataBaseFileName = ".\\" ;
+    RConf.compiler.ObjectFile = placement ;
+    // PCH
+    if ( usePCH ) {
+	RConf.compiler.UsePrecompiledHeader     = pchUseUsingSpecific;
+	RConf.compiler.PrecompiledHeaderFile    = "$(IntDir)\\" + precompPch;
+	RConf.compiler.PrecompiledHeaderThrough = precompHFilename;
+	RConf.compiler.ForcedIncludeFiles       = precompHFilename;
+	// Minimal build option triggers an Internal Compiler Error
+	// when used in conjunction with /FI and /Yu, so remove it
+	project->variables()["QMAKE_CFLAGS_DEBUG"].remove("-Gm");
+	project->variables()["QMAKE_CFLAGS_DEBUG"].remove("/Gm");
+	project->variables()["QMAKE_CXXFLAGS_DEBUG"].remove("-Gm");
+	project->variables()["QMAKE_CXXFLAGS_DEBUG"].remove("/Gm");
+    }
+
+    if ( project->isActiveConfig("debug") ){
+	// Debug version
+	RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS"] );
+	RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_DEBUG"] );
+	if ( project->isActiveConfig("thread") ) {
+	    if ( (projectTarget == Application) || (projectTarget == StaticLib) )
+		RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_MT_DBG"] );
+	    else
+		RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_MT_DLLDBG"] );
+	}
+    } else {
+	// Release version
+	RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS"] );
+	RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_RELEASE"] );
+	RConf.compiler.PreprocessorDefinitions += "QT_NO_DEBUG";
+	RConf.compiler.PreprocessorDefinitions += "NDEBUG";
+	if ( project->isActiveConfig("thread") ) {
+	    if ( (projectTarget == Application) || (projectTarget == StaticLib) )
+		RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_MT"] );
+	    else
+		RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_MT_DLL"] );
+	}
+    }
+
+    // Common for both release and debug
+    if ( project->isActiveConfig("warn_off") )
+	RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_WARN_OFF"] );
+    else if ( project->isActiveConfig("warn_on") )
+	RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_WARN_ON"] );
+    if ( project->isActiveConfig("windows") )
+	RConf.compiler.PreprocessorDefinitions += project->variables()["MSVCPROJ_WINCONDEF"];
+
+    // Can this be set for ALL configs?
+    // If so, use qmake.conf!
+    if ( projectTarget == SharedLib )
+	RConf.compiler.PreprocessorDefinitions += "_WINDOWS";
+
+    RConf.compiler.PreprocessorDefinitions += project->variables()["DEFINES"];
+    RConf.compiler.PreprocessorDefinitions += project->variables()["PRL_EXPORT_DEFINES"];
+    QStringList::iterator it;
+    for(it=RConf.compiler.PreprocessorDefinitions.begin();
+	it!=RConf.compiler.PreprocessorDefinitions.end();
+	++it)
+	(*it).replace('\"', "&quot;");
+
+    RConf.compiler.parseOptions( project->variables()["MSVCPROJ_INCPATH"] );
+}
+
+void VcprojGenerator::initLibrarianTool()
+{
+    VCConfiguration &RConf = vcProject.Configuration[0];
+    RConf.librarian.OutputFile = project->first( "DESTDIR" ).replace("&", "&amp;");
+    if( RConf.librarian.OutputFile.isEmpty() )
+	RConf.librarian.OutputFile = ".\\";
+
+    if( !RConf.librarian.OutputFile.endsWith("\\") )
+    	RConf.librarian.OutputFile += '\\';
+
+    RConf.librarian.OutputFile += project->first("MSVCPROJ_TARGET");
+}
+
+void VcprojGenerator::initLinkerTool()
+{
+    VCConfiguration &RConf = vcProject.Configuration[0];
+    RConf.linker.parseOptions( project->variables()["MSVCPROJ_LFLAGS"] );
+    RConf.linker.AdditionalDependencies += project->variables()["MSVCPROJ_LIBS"];
+
+    switch ( projectTarget ) {
+    case Application:
+	RConf.linker.OutputFile = project->first( "DESTDIR" );
+	break;
+    case SharedLib:
+	RConf.linker.parseOptions( project->variables()["MSVCPROJ_LIBOPTIONS"] );
+	RConf.linker.OutputFile = project->first( "DESTDIR" );
+	break;
+    case StaticLib: //unhandled - added to remove warnings..
+	break;
+    }
+
+    if( RConf.linker.OutputFile.isEmpty() )
+	RConf.linker.OutputFile = ".\\";
+
+    if( !RConf.linker.OutputFile.endsWith("\\") )
+    	RConf.linker.OutputFile += '\\';
+
+    RConf.linker.OutputFile += project->first("MSVCPROJ_TARGET");
+
+    if ( project->isActiveConfig("debug") ){
+	RConf.linker.parseOptions( project->variables()["QMAKE_LFLAGS_DEBUG"] );
+    } else {
+        RConf.linker.parseOptions( project->variables()["QMAKE_LFLAGS_RELEASE"] );
+    }
+
+    if ( project->isActiveConfig("dll") ){
+	RConf.linker.parseOptions( project->variables()["QMAKE_LFLAGS_QT_DLL"] );
+    }
+
+    if ( project->isActiveConfig("console") ){
+	RConf.linker.parseOptions( project->variables()["QMAKE_LFLAGS_CONSOLE"] );
+    } else {
+	RConf.linker.parseOptions( project->variables()["QMAKE_LFLAGS_WINDOWS"] );
+    }
+
+}
+
+void VcprojGenerator::initIDLTool()
+{
+}
+
+void VcprojGenerator::initCustomBuildTool()
+{
+}
+
+void VcprojGenerator::initPreBuildEventTools()
+{
+}
+
+void VcprojGenerator::initPostBuildEventTools()
+{
+    VCConfiguration &RConf = vcProject.Configuration[0];
+    if ( !project->variables()["QMAKE_POST_LINK"].isEmpty() ) {
+	RConf.postBuild.Description = var("QMAKE_POST_LINK");
+	RConf.postBuild.CommandLine = var("QMAKE_POST_LINK");
+	RConf.postBuild.Description.replace(" && ", " &amp;&amp; ");
+	RConf.postBuild.CommandLine.replace(" && ", " &amp;&amp; ");
+    }
+    if ( !project->variables()["MSVCPROJ_COPY_DLL"].isEmpty() ) {
+	if ( !RConf.postBuild.CommandLine.isEmpty() )
+	    RConf.postBuild.CommandLine += " &amp;&amp; ";
+	RConf.postBuild.Description += var("MSVCPROJ_COPY_DLL_DESC");
+	RConf.postBuild.CommandLine += var("MSVCPROJ_COPY_DLL");
+    }
+    if( project->isActiveConfig( "activeqt" ) ) {
+	QString name = project->first( "QMAKE_ORIG_TARGET" );
+	QString nameext = project->first( "TARGET" );
+	QString objdir = project->first( "OBJECTS_DIR" );
+	QString idc = project->first( "QMAKE_IDC" );
+
+	RConf.postBuild.Description = "Finalizing ActiveQt server...";
+	if ( !RConf.postBuild.CommandLine.isEmpty() )
+	    RConf.postBuild.CommandLine += " &amp;&amp; ";
+
+	if( project->isActiveConfig( "dll" ) ) { // In process
+	    RConf.postBuild.CommandLine +=
+		// call idc to generate .idl file from .dll
+		idc + " &quot;$(TargetPath)&quot; -idl " + objdir + name + ".idl -version 1.0 &amp;&amp; " +
+		// call midl to create implementations of the .idl file
+		project->first( "QMAKE_IDL" ) + " /nologo " + objdir + name + ".idl /tlb " + objdir + name + ".tlb &amp;&amp; " +
+		// call idc to replace tlb...
+		idc + " &quot;$(TargetPath)&quot; /tlb " + objdir + name + ".tlb &amp;&amp; " +
+		// register server
+		idc + " &quot;$(TargetPath)&quot; /regserver";
+	} else { // out of process
+	    RConf.postBuild.CommandLine =
+		// call application to dump idl
+		"&quot;$(TargetPath)&quot; -dumpidl " + objdir + name + ".idl -version 1.0 &amp;&amp; " +
+		// call midl to create implementations of the .idl file
+		project->first( "QMAKE_IDL" ) + " /nologo " + objdir + name + ".idl /tlb " + objdir + name + ".tlb &amp;&amp; " +
+		// call idc to replace tlb...
+		idc + " &quot;$(TargetPath)&quot; /tlb " + objdir + name + ".tlb &amp;&amp; " +
+		// call app to register
+		"&quot;$(TargetPath)&quot; -regserver";
+	}
+    }
+}
+
+void VcprojGenerator::initPreLinkEventTools()
+{
+}
+
+
+// ------------------------------------------------------------------
+// Helper functions to do proper sorting of the
+// qstringlists, for both flat and non-flat modes.
+inline bool XLessThanY( QString &x, QString &y, bool flat_mode )
+{
+    if ( flat_mode ) {
+	QString subX = x.mid( x.findRev('\\')+1 );
+	QString subY = y.mid( y.findRev('\\')+1 );
+	return QString::compare(subX, subY) < 0;
+    }
+
+    int xPos = 0;
+    int yPos = 0;
+    int xSlashPos;
+    int ySlashPos;
+    for (;;) {
+	xSlashPos = x.find('\\', xPos);
+	ySlashPos = y.find('\\', yPos);
+
+	if (xSlashPos == -1 && ySlashPos != -1) {
+	    return FALSE;
+	} else if (xSlashPos != -1 && ySlashPos == -1) {
+	    return TRUE;
+	} else if (xSlashPos == -1 /* && yySlashPos == -1 */) {
+	    QString subX = x.mid(xPos);
+	    QString subY = y.mid(yPos);
+	    return QString::compare(subX, subY) < 0;
+	} else {
+	    QString subX = x.mid(xPos, xSlashPos - xPos);
+	    QString subY = y.mid(yPos, ySlashPos - yPos);
+	    int cmp = QString::compare(subX, subY);
+	    if (cmp != 0)
+		return cmp < 0;
+	}
+	xPos = xSlashPos + 1;
+	yPos = ySlashPos + 1;
+    }
+    return FALSE;
+}
+void nonflatDir_BubbleSort( QStringList& list, bool flat_mode )
+{
+    QStringList::Iterator b = list.begin();
+    QStringList::Iterator e = list.end();
+    QStringList::Iterator last = e;
+    --last;		// goto last
+    if ( last == b )	// shortcut
+	return;
+    while( b != last ) {// sort them
+	bool swapped = FALSE;
+	QStringList::Iterator swap_pos = b;
+	QStringList::Iterator x = e;
+	QStringList::Iterator y = x;
+	--y;
+	QString swap_str;
+	do {
+	    --x;
+	    --y;
+	    if ( XLessThanY(*x,*y, flat_mode) ) {
+		swapped = TRUE;
+		swap_str = (*x); // Swap -------
+		(*x) = (*y);
+		(*y) = swap_str; // ------------
+		swap_pos = y;
+	    }
+	} while( y != b );
+	if ( !swapped )
+	    return;
+	b = swap_pos;
+	++b;
+    }
+}
+// ------------------------------------------------------------------
+
+void VcprojGenerator::initSourceFiles()
+{
+    vcProject.SourceFiles.flat_files = project->isActiveConfig("flat");
+    vcProject.SourceFiles.Name = "Source Files";
+    vcProject.SourceFiles.Filter = "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat";
+    vcProject.SourceFiles.Files += project->variables()["SOURCES"].gres("&", "&amp;");
+    nonflatDir_BubbleSort( vcProject.SourceFiles.Files,
+			   vcProject.SourceFiles.flat_files );
+    vcProject.SourceFiles.Project = this;
+    vcProject.SourceFiles.Config = &(vcProject.Configuration);
+    vcProject.SourceFiles.CustomBuild = none;
+}
+
+void VcprojGenerator::initHeaderFiles()
+{
+    vcProject.HeaderFiles.flat_files = project->isActiveConfig("flat");
+    vcProject.HeaderFiles.Name = "Header Files";
+    vcProject.HeaderFiles.Filter = "h;hpp;hxx;hm;inl";
+    vcProject.HeaderFiles.Files += project->variables()["HEADERS"];
+    if (usePCH) { // Generated PCH cpp file
+	if (!vcProject.HeaderFiles.Files.contains(precompH))
+	    vcProject.HeaderFiles.Files += precompH;
+    }
+    nonflatDir_BubbleSort( vcProject.HeaderFiles.Files,
+			   vcProject.HeaderFiles.flat_files );
+    vcProject.HeaderFiles.Project = this;
+    vcProject.HeaderFiles.Config = &(vcProject.Configuration);
+    vcProject.HeaderFiles.CustomBuild = moc;
+}
+
+void VcprojGenerator::initMOCFiles()
+{
+    vcProject.MOCFiles.flat_files = project->isActiveConfig("flat");
+    vcProject.MOCFiles.Name = "Generated MOC Files";
+    vcProject.MOCFiles.Filter = "cpp;c;cxx;moc";
+    vcProject.MOCFiles.Files += project->variables()["SRCMOC"].gres("&", "&amp;");
+    nonflatDir_BubbleSort( vcProject.MOCFiles.Files,
+			   vcProject.MOCFiles.flat_files );
+    vcProject.MOCFiles.Project = this;
+    vcProject.MOCFiles.Config = &(vcProject.Configuration);
+    vcProject.MOCFiles.CustomBuild = moc;
+}
+
+void VcprojGenerator::initUICFiles()
+{
+    vcProject.UICFiles.flat_files = project->isActiveConfig("flat");
+    vcProject.UICFiles.Name = "Generated Form Files";
+    vcProject.UICFiles.Filter = "cpp;c;cxx;h;hpp;hxx;";
+    vcProject.UICFiles.Project = this;
+    vcProject.UICFiles.Files += project->variables()["UICDECLS"].gres("&", "&amp;");
+    vcProject.UICFiles.Files += project->variables()["UICIMPLS"].gres("&", "&amp;");
+    nonflatDir_BubbleSort( vcProject.UICFiles.Files,
+			   vcProject.UICFiles.flat_files );
+    vcProject.UICFiles.Config = &(vcProject.Configuration);
+    vcProject.UICFiles.CustomBuild = none;
+}
+
+void VcprojGenerator::initFormsFiles()
+{
+    vcProject.FormFiles.flat_files = project->isActiveConfig("flat");
+    vcProject.FormFiles.Name = "Forms";
+    vcProject.FormFiles.ParseFiles = _False;
+    vcProject.FormFiles.Filter = "ui";
+    vcProject.FormFiles.Files += project->variables()["FORMS"].gres("&", "&amp;");
+    nonflatDir_BubbleSort( vcProject.FormFiles.Files,
+			   vcProject.FormFiles.flat_files );
+    vcProject.FormFiles.Project = this;
+    vcProject.FormFiles.Config = &(vcProject.Configuration);
+    vcProject.FormFiles.CustomBuild = uic;
+}
+
+void VcprojGenerator::initTranslationFiles()
+{
+    vcProject.TranslationFiles.flat_files = project->isActiveConfig("flat");
+    vcProject.TranslationFiles.Name = "Translations Files";
+    vcProject.TranslationFiles.ParseFiles = _False;
+    vcProject.TranslationFiles.Filter = "ts";
+    vcProject.TranslationFiles.Files += project->variables()["TRANSLATIONS"].gres("&", "&amp;");
+    nonflatDir_BubbleSort( vcProject.TranslationFiles.Files,
+			   vcProject.TranslationFiles.flat_files );
+    vcProject.TranslationFiles.Project = this;
+    vcProject.TranslationFiles.Config = &(vcProject.Configuration);
+    vcProject.TranslationFiles.CustomBuild = none;
+}
+
+void VcprojGenerator::initLexYaccFiles()
+{
+    vcProject.LexYaccFiles.flat_files = project->isActiveConfig("flat");
+    vcProject.LexYaccFiles.Name = "Lex / Yacc Files";
+    vcProject.LexYaccFiles.ParseFiles = _False;
+    vcProject.LexYaccFiles.Filter = "l;y";
+    vcProject.LexYaccFiles.Files += project->variables()["LEXSOURCES"].gres("&", "&amp;");
+    vcProject.LexYaccFiles.Files += project->variables()["YACCSOURCES"].gres("&", "&amp;");
+    nonflatDir_BubbleSort( vcProject.LexYaccFiles.Files,
+			   vcProject.LexYaccFiles.flat_files );
+    vcProject.LexYaccFiles.Project = this;
+    vcProject.LexYaccFiles.Config = &(vcProject.Configuration);
+    vcProject.LexYaccFiles.CustomBuild = lexyacc;
+}
+
+void VcprojGenerator::initResourceFiles()
+{
+    vcProject.ResourceFiles.flat_files = project->isActiveConfig("flat");
+    vcProject.ResourceFiles.Name = "Resources";
+    vcProject.ResourceFiles.ParseFiles = _False;
+    vcProject.ResourceFiles.Filter = "cpp;ico;png;jpg;jpeg;gif;xpm;bmp;rc;ts";
+    if (!project->variables()["RC_FILE"].isEmpty())
+	vcProject.ResourceFiles.Files += project->variables()["RC_FILE"].gres("&", "&amp;");
+    if (!project->variables()["RES_FILE"].isEmpty())
+	vcProject.ResourceFiles.Files += project->variables()["RES_FILE"].gres("&", "&amp;");
+    vcProject.ResourceFiles.Files += project->variables()["QMAKE_IMAGE_COLLECTION"].gres("&", "&amp;");
+    vcProject.ResourceFiles.Files += project->variables()["IMAGES"].gres("&", "&amp;");
+    vcProject.ResourceFiles.Files += project->variables()["IDLSOURCES"].gres("&", "&amp;");
+    nonflatDir_BubbleSort( vcProject.ResourceFiles.Files,
+			   vcProject.ResourceFiles.flat_files );
+    vcProject.ResourceFiles.Project = this;
+    vcProject.ResourceFiles.Config = &(vcProject.Configuration);
+    vcProject.ResourceFiles.CustomBuild = resource;
+}
+
+/* \internal
+    Sets up all needed variables from the environment and all the different caches and .conf files
+*/
+
+void VcprojGenerator::initOld()
+{
+    if( init_flag )
+	return;
+
+    init_flag = TRUE;
+    QStringList::Iterator it;
+
+    if ( project->isActiveConfig("stl") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_ON"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_OFF"];
+    }
+    if ( project->isActiveConfig("exceptions") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_ON"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_OFF"];
+    }
+    if ( project->isActiveConfig("rtti") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_ON"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_OFF"];
+    }
+
+    // this should probably not be here, but I'm using it to wrap the .t files
+    if(project->first("TEMPLATE") == "vcapp" )
+	project->variables()["QMAKE_APP_FLAG"].append("1");
+    else if(project->first("TEMPLATE") == "vclib")
+	project->variables()["QMAKE_LIB_FLAG"].append("1");
+    if ( project->variables()["QMAKESPEC"].isEmpty() )
+	project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") );
+
+    bool is_qt =
+	( project->first("TARGET") == "qt"QTDLL_POSTFIX ||
+	  project->first("TARGET") == "qt-mt"QTDLL_POSTFIX );
+
+   QStringList &configs = project->variables()["CONFIG"];
+
+    if ( project->isActiveConfig( "shared" ) )
+	project->variables()["DEFINES"].append( "QT_DLL" );
+
+    if ( project->isActiveConfig( "qt_dll" ) &&
+	 configs.findIndex("qt") == -1 )
+	    configs.append("qt");
+
+    if ( project->isActiveConfig( "qt" ) ) {
+	if ( project->isActiveConfig( "plugin" ) ) {
+	    project->variables()["CONFIG"].append( "dll" );
+	    project->variables()["DEFINES"].append( "QT_PLUGIN" );
+	}
+	if ( ( project->variables()["DEFINES"].findIndex( "QT_NODLL" )   == -1 ) &&
+	    (( project->variables()["DEFINES"].findIndex( "QT_MAKEDLL" ) != -1   ||
+	       project->variables()["DEFINES"].findIndex( "QT_DLL" )     != -1 ) ||
+	     ( getenv( "QT_DLL" ) && !getenv( "QT_NODLL" ))) ) {
+	    project->variables()["QMAKE_QT_DLL"].append( "1" );
+	    if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() )
+		project->variables()["CONFIG"].append( "dll" );
+	}
+    }
+
+    // If we are a dll, then we cannot be a staticlib at the same time...
+    if ( project->isActiveConfig( "dll" ) || !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) {
+	project->variables()["CONFIG"].remove( "staticlib" );
+	project->variables()["QMAKE_APP_OR_DLL"].append( "1" );
+    } else {
+	project->variables()["CONFIG"].append( "staticlib" );
+    }
+
+    // If we need 'qt' and/or 'opengl', then we need windows and not console
+    if ( project->isActiveConfig( "qt" ) || project->isActiveConfig( "opengl" ) ) {
+	project->variables()["CONFIG"].append( "windows" );
+    }
+
+    // Decode version, and add it to $$MSVCPROJ_VERSION --------------
+    if ( !project->variables()["VERSION"].isEmpty() ) {
+	QString version = project->variables()["VERSION"][0];
+	int firstDot = version.find( "." );
+	QString major = version.left( firstDot );
+	QString minor = version.right( version.length() - firstDot - 1 );
+	minor.replace( QRegExp( "\\." ), "" );
+	project->variables()["MSVCPROJ_VERSION"].append( "/VERSION:" + major + "." + minor );
+    }
+
+    // QT ------------------------------------------------------------
+    if ( project->isActiveConfig("qt") ) {
+	project->variables()["CONFIG"].append("moc");
+	project->variables()["INCLUDEPATH"] +=	project->variables()["QMAKE_INCDIR_QT"];
+	project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"];
+
+	if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) {
+	    if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) {
+		project->variables()["DEFINES"].append("QT_MAKEDLL");
+		project->variables()["QMAKE_LFLAGS"].append("/BASE:0x39D00000");
+	    }
+	} else {
+	    if(project->isActiveConfig("thread"))
+		project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"];
+	    else
+		project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"];
+	    if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) {
+		int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt");
+		if( hver==-1 ) {
+		    hver = findHighestVersion( project->first("QMAKE_LIBDIR_QT"), "qt-mt" );
+		}
+
+		if(hver != -1) {
+		    QString ver;
+		    ver.sprintf("qt%s" QTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "-mt" : ""), hver);
+		    QStringList &libs = project->variables()["QMAKE_LIBS"];
+		    for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit)
+			(*libit).replace(QRegExp("qt(-mt)?\\.lib"), ver);
+		}
+	    }
+	    if ( project->isActiveConfig( "activeqt" ) ) {
+		project->variables().remove("QMAKE_LIBS_QT_ENTRY");
+		project->variables()["QMAKE_LIBS_QT_ENTRY"] = "qaxserver.lib";
+		if ( project->isActiveConfig( "dll" ) ) {
+		    project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"];
+		}
+	    }
+	    if ( !project->isActiveConfig("dll") && !project->isActiveConfig("plugin") ) {
+		project->variables()["QMAKE_LIBS"] +=project->variables()["QMAKE_LIBS_QT_ENTRY"];
+	    }
+	}
+    }
+
+    // Set target directories ----------------------------------------
+ //   if ( !project->first("OBJECTS_DIR").isEmpty() )
+	//project->variables()["MSVCPROJ_OBJECTSDIR"] = project->first("OBJECTS_DIR");
+ //   else
+	//project->variables()["MSVCPROJ_OBJECTSDIR"] = project->isActiveConfig( "release" )?"Release":"Debug";
+ //   if ( !project->first("DESTDIR").isEmpty() )
+	//project->variables()["MSVCPROJ_TARGETDIR"] = project->first("DESTDIR");
+ //   else
+	//project->variables()["MSVCPROJ_TARGETDIR"] = project->isActiveConfig( "release" )?"Release":"Debug";
+
+    // OPENGL --------------------------------------------------------
+    if ( project->isActiveConfig("opengl") ) {
+	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"];
+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"];
+    }
+
+    // THREAD --------------------------------------------------------
+    if ( project->isActiveConfig("thread") ) {
+	if(project->isActiveConfig("qt"))
+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT" );
+	if ( !project->variables()["DEFINES"].contains("QT_DLL") && is_qt
+	     && project->first("TARGET") != "qtmain" )
+	    project->variables()["QMAKE_LFLAGS"].append("/NODEFAULTLIB:libc");
+    }
+
+    // ACCESSIBILITY -------------------------------------------------
+    if(project->isActiveConfig("qt")) {
+	if ( project->isActiveConfig("accessibility" ) )
+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT");
+	if ( project->isActiveConfig("tablet") )
+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_TABLET_SUPPORT");
+    }
+
+    // DLL -----------------------------------------------------------
+    if ( project->isActiveConfig("dll") ) {
+	if ( !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) {
+	    QString ver_xyz(project->first("VERSION"));
+	    ver_xyz.replace(QRegExp("\\."), "");
+	    project->variables()["TARGET_EXT"].append(ver_xyz + ".dll");
+	} else {
+	    project->variables()["TARGET_EXT"].append(".dll");
+	}
+    }
+    // EXE / LIB -----------------------------------------------------
+    else {
+	if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty() )
+	    project->variables()["TARGET_EXT"].append(".exe");
+	else
+	    project->variables()["TARGET_EXT"].append(".lib");
+    }
+
+    project->variables()["MSVCPROJ_VER"] = "7.00";
+    project->variables()["MSVCPROJ_DEBUG_OPT"] = "/GZ /ZI";
+
+    // INCREMENTAL:NO ------------------------------------------------
+    if(!project->isActiveConfig("incremental")) {
+	project->variables()["QMAKE_LFLAGS"].append(QString("/INCREMENTAL:no"));
+        if ( is_qt )
+	    project->variables()["MSVCPROJ_DEBUG_OPT"] = "/GZ /Zi";
+    }
+
+    // MOC -----------------------------------------------------------
+    if ( project->isActiveConfig("moc") )
+	setMocAware(TRUE);
+
+    // /VERSION:x.yz -------------------------------------------------
+    if ( !project->variables()["VERSION"].isEmpty() ) {
+	QString version = project->variables()["VERSION"][0];
+	int firstDot = version.find( "." );
+	QString major = version.left( firstDot );
+	QString minor = version.right( version.length() - firstDot - 1 );
+	minor.replace( ".", "" );
+	project->variables()["QMAKE_LFLAGS"].append( "/VERSION:" + major + "." + minor );
+    }
+
+    project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
+    // Update -lname to name.lib, and -Ldir to
+    QStringList &libList = project->variables()["QMAKE_LIBS"];
+    for( it = libList.begin(); it != libList.end(); ) {
+	QString s = *it;
+	s.replace("&", "&amp;");
+	if( s.startsWith( "-l" ) ) {
+	    it = libList.remove( it );
+	    it = libList.insert( it, s.mid( 2 ) + ".lib" );
+	} else if( s.startsWith( "-L" ) ) {
+	    project->variables()["QMAKE_LIBDIR"] += (*it).mid(2);
+	    it = libList.remove( it );
+	} else {
+	    it++;
+	}
+    }
+
+    // Run through all variables containing filepaths, and -----------
+    // slash-slosh them correctly depending on current OS  -----------
+    project->variables()["QMAKE_FILETAGS"] += QStringList::split(' ', "HEADERS SOURCES DEF_FILE RC_FILE TARGET QMAKE_LIBS DESTDIR DLLDESTDIR INCLUDEPATH");
+    QStringList &l = project->variables()["QMAKE_FILETAGS"];
+    for(it = l.begin(); it != l.end(); ++it) {
+	QStringList &gdmf = project->variables()[(*it)];
+	for(QStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner)
+	    (*inner) = Option::fixPathToTargetOS((*inner), FALSE);
+    }
+
+     // Get filename w/o extention -----------------------------------
+    QString msvcproj_project = "";
+    QString targetfilename = "";
+    if ( project->variables()["TARGET"].count() ) {
+	msvcproj_project = project->variables()["TARGET"].first();
+	targetfilename = msvcproj_project;
+    }
+
+    // Save filename w/o extention in $$QMAKE_ORIG_TARGET ------------
+    project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
+
+    // TARGET (add extention to $$TARGET)
+    //project->variables()["MSVCPROJ_DEFINES"].append(varGlue(".first() += project->first("TARGET_EXT");
+
+    // Init base class too -------------------------------------------
+    MakefileGenerator::init();
+
+
+    if ( msvcproj_project.isEmpty() )
+	msvcproj_project = Option::output.name();
+
+    msvcproj_project = msvcproj_project.right( msvcproj_project.length() - msvcproj_project.findRev( "\\" ) - 1 );
+    msvcproj_project = msvcproj_project.left( msvcproj_project.findRev( "." ) );
+    msvcproj_project.replace(QRegExp("-"), "");
+
+    project->variables()["MSVCPROJ_PROJECT"].append(msvcproj_project);
+    QStringList &proj = project->variables()["MSVCPROJ_PROJECT"];
+
+    for(it = proj.begin(); it != proj.end(); ++it)
+	(*it).replace(QRegExp("\\.[a-zA-Z0-9_]*$"), "");
+
+    // SUBSYSTEM -----------------------------------------------------
+    if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) {
+	    project->variables()["MSVCPROJ_TEMPLATE"].append("win32app" + project->first( "VCPROJ_EXTENSION" ) );
+	    if ( project->isActiveConfig("console") ) {
+		project->variables()["MSVCPROJ_CONSOLE"].append("CONSOLE");
+		project->variables()["MSVCPROJ_WINCONDEF"].append("_CONSOLE");
+		project->variables()["MSVCPROJ_VCPROJTYPE"].append("0x0103");
+		project->variables()["MSVCPROJ_SUBSYSTEM"].append("CONSOLE");
+	    } else {
+		project->variables()["MSVCPROJ_CONSOLE"].clear();
+		project->variables()["MSVCPROJ_WINCONDEF"].append("_WINDOWS");
+		project->variables()["MSVCPROJ_VCPROJTYPE"].append("0x0101");
+		project->variables()["MSVCPROJ_SUBSYSTEM"].append("WINDOWS");
+	    }
+    } else {
+        if ( project->isActiveConfig("dll") ) {
+            project->variables()["MSVCPROJ_TEMPLATE"].append("win32dll" + project->first( "VCPROJ_EXTENSION" ) );
+        } else {
+            project->variables()["MSVCPROJ_TEMPLATE"].append("win32lib" + project->first( "VCPROJ_EXTENSION" ) );
+        }
+    }
+
+    // $$QMAKE.. -> $$MSVCPROJ.. -------------------------------------
+    project->variables()["MSVCPROJ_LIBS"] += project->variables()["QMAKE_LIBS"];
+    project->variables()["MSVCPROJ_LIBS"] += project->variables()["QMAKE_LIBS_WINDOWS"];
+    project->variables()["MSVCPROJ_LFLAGS" ] += project->variables()["QMAKE_LFLAGS"];
+    if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() ) {
+	QStringList strl = project->variables()["QMAKE_LIBDIR"];
+	QStringList::iterator stri;
+	for ( stri = strl.begin(); stri != strl.end(); ++stri ) {
+	    (*stri).replace("&", "&amp;");
+	    if ( !(*stri).startsWith("/LIBPATH:") )
+		(*stri).prepend( "/LIBPATH:" );
+	}
+	project->variables()["MSVCPROJ_LFLAGS"] += strl;
+    }
+    project->variables()["MSVCPROJ_CXXFLAGS" ] += project->variables()["QMAKE_CXXFLAGS"];
+    // We don't use this... Direct manipulation of compiler object
+    //project->variables()["MSVCPROJ_DEFINES"].append(varGlue("DEFINES","/D ","" " /D ",""));
+    //project->variables()["MSVCPROJ_DEFINES"].append(varGlue("PRL_EXPORT_DEFINES","/D ","" " /D ",""));
+    QStringList &incs = project->variables()["INCLUDEPATH"];
+    for(QStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) {
+	QString inc = (*incit);
+	inc.replace("&", "&amp;");
+	inc.replace(QRegExp("\""), "");
+	project->variables()["MSVCPROJ_INCPATH"].append("/I" + inc );
+    }
+    project->variables()["MSVCPROJ_INCPATH"].append("/I" + specdir());
+
+    QString dest;
+    project->variables()["MSVCPROJ_TARGET"] = project->first("TARGET");
+    Option::fixPathToTargetOS(project->first("TARGET"));
+    dest = project->first("TARGET") + project->first( "TARGET_EXT" );
+    if ( project->first("TARGET").startsWith("$(QTDIR)") )
+	dest.replace( QRegExp("\\$\\(QTDIR\\)"), getenv("QTDIR") );
+    project->variables()["MSVCPROJ_TARGET"] = dest;
+
+    // DLL COPY ------------------------------------------------------
+    if ( project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty() ) {
+	QStringList dlldirs = project->variables()["DLLDESTDIR"].gres("&", "&amp;");
+	QString copydll("");
+	QStringList::Iterator dlldir;
+	for ( dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) {
+	    if ( !copydll.isEmpty() )
+		copydll += " &amp;&amp; ";
+	    copydll += "copy  &quot;$(TargetPath)&quot; &quot;" + *dlldir + "&quot;";
+	}
+
+	QString deststr( "Copy " + dest + " to " );
+	for ( dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ) {
+	    deststr += *dlldir;
+	    ++dlldir;
+	    if ( dlldir != dlldirs.end() )
+		deststr += ", ";
+	}
+
+	project->variables()["MSVCPROJ_COPY_DLL"].append( copydll );
+	project->variables()["MSVCPROJ_COPY_DLL_DESC"].append( deststr );
+    }
+
+    // ACTIVEQT ------------------------------------------------------
+    if ( project->isActiveConfig("activeqt") ) {
+	QString idl = project->variables()["QMAKE_IDL"].first();
+	QString idc = project->variables()["QMAKE_IDC"].first();
+	QString version = project->variables()["VERSION"].first();
+	if ( version.isEmpty() )
+	    version = "1.0";
+
+	QString objdir = project->first( "OBJECTS_DIR" );
+	project->variables()["MSVCPROJ_IDLSOURCES"].append( objdir + targetfilename + ".idl" );
+	if ( project->isActiveConfig( "dll" ) ) {
+	    QString regcmd = "# Begin Special Build Tool\n"
+			    "TargetPath=" + targetfilename + "\n"
+			    "SOURCE=$(InputPath)\n"
+			    "PostBuild_Desc=Finalizing ActiveQt server...\n"
+			    "PostBuild_Cmds=" +
+			    idc + " %1 -idl " + objdir + targetfilename + ".idl -version " + version +
+			    "\t" + idl + " /nologo " + objdir + targetfilename + ".idl /tlb " + objdir + targetfilename + ".tlb" +
+			    "\t" + idc + " %1 /tlb " + objdir + targetfilename + ".tlb"
+			    "\tregsvr32 /s %1\n"
+			    "# End Special Build Tool";
+
+	    QString executable = project->variables()["MSVCPROJ_TARGETDIRREL"].first() + "\\" + project->variables()["TARGET"].first();
+	    project->variables()["MSVCPROJ_COPY_DLL_REL"].append( regcmd.arg(executable).arg(executable).arg(executable) );
+
+	    executable = project->variables()["MSVCPROJ_TARGETDIRDEB"].first() + "\\" + project->variables()["TARGET"].first();
+	    project->variables()["MSVCPROJ_COPY_DLL_DBG"].append( regcmd.arg(executable).arg(executable).arg(executable) );
+	} else {
+	    QString regcmd = "# Begin Special Build Tool\n"
+			    "TargetPath=" + targetfilename + "\n"
+			    "SOURCE=$(InputPath)\n"
+			    "PostBuild_Desc=Finalizing ActiveQt server...\n"
+			    "PostBuild_Cmds="
+			    "%1 -dumpidl " + objdir + targetfilename + ".idl -version " + version +
+			    "\t" + idl + " /nologo " + objdir + targetfilename + ".idl /tlb " + objdir + targetfilename + ".tlb"
+			    "\t" + idc + " %1 /tlb " + objdir + targetfilename + ".tlb"
+			    "\t%1 -regserver\n"
+			    "# End Special Build Tool";
+
+	    QString executable = project->variables()["MSVCPROJ_TARGETDIRREL"].first() + "\\" + project->variables()["TARGET"].first();
+	    project->variables()["MSVCPROJ_REGSVR_REL"].append( regcmd.arg(executable).arg(executable).arg(executable) );
+
+	    executable = project->variables()["MSVCPROJ_TARGETDIRDEB"].first() + "\\" + project->variables()["TARGET"].first();
+	    project->variables()["MSVCPROJ_REGSVR_DBG"].append( regcmd.arg(executable).arg(executable).arg(executable) );
+	}
+    }
+
+    if ( !project->variables()["DEF_FILE"].isEmpty() )
+	project->variables()["MSVCPROJ_LFLAGS"].append("/DEF:"+project->first("DEF_FILE"));
+
+    // FORMS ---------------------------------------------------------
+    QStringList &list = project->variables()["FORMS"];
+    for( it = list.begin(); it != list.end(); ++it ) {
+	if ( QFile::exists( *it + ".h" ) )
+	    project->variables()["SOURCES"].append( *it + ".h" );
+    }
+
+    project->variables()["QMAKE_INTERNAL_PRL_LIBS"] << "MSVCPROJ_LFLAGS" << "MSVCPROJ_LIBS";
+
+    // Verbose output if "-d -d"...
+    outputVariables();
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+
+bool VcprojGenerator::openOutput(QFile &file) const
+{
+    QString outdir;
+    if(!file.name().isEmpty()) {
+	QFileInfo fi(file);
+	if(fi.isDir())
+	    outdir = file.name() + QDir::separator();
+    }
+    if(!outdir.isEmpty() || file.name().isEmpty()) {
+	QString ext = project->first("VCPROJ_EXTENSION");
+	if(project->first("TEMPLATE") == "vcsubdirs")
+	    ext = project->first("VCSOLUTION_EXTENSION");
+	file.setName(outdir + project->first("TARGET") + ext);
+    }
+    if(QDir::isRelativePath(file.name())) {
+	file.setName( Option::fixPathToLocalOS(QDir::currentDirPath() + Option::dir_sep + fixFilename(file.name())) );
+    }
+    return Win32MakefileGenerator::openOutput(file);
+}
+
+QString VcprojGenerator::fixFilename(QString ofile) const
+{
+    int slashfind = ofile.findRev('\\');
+    if (slashfind == -1) {
+	ofile = ofile.replace('-', '_');
+    } else {
+	int hypenfind = ofile.find('-', slashfind);
+	while (hypenfind != -1 && slashfind < hypenfind) {
+	    ofile = ofile.replace(hypenfind, 1, '_');
+	    hypenfind = ofile.find('-', hypenfind + 1);
+	}
+    }
+    return ofile;
+}
+
+QString VcprojGenerator::findTemplate(QString file)
+{
+    QString ret;
+    if(!QFile::exists((ret = file)) &&
+       !QFile::exists((ret = QString(Option::mkfile::qmakespec + "/" + file))) &&
+       !QFile::exists((ret = QString(getenv("QTDIR")) + "/mkspecs/win32-msvc.net/" + file)) &&
+       !QFile::exists((ret = (QString(getenv("HOME")) + "/.tmake/" + file))))
+	return "";
+    debug_msg(1, "Generator: MSVC.NET: Found template \'%s\'", ret.latin1() );
+    return ret;
+}
+
+
+void VcprojGenerator::processPrlVariable(const QString &var, const QStringList &l)
+{
+    if(var == "QMAKE_PRL_DEFINES") {
+	QStringList &out = project->variables()["MSVCPROJ_DEFINES"];
+	for(QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
+	    if(out.findIndex((*it)) == -1)
+		out.append((" /D " + *it ));
+	}
+    } else {
+	MakefileGenerator::processPrlVariable(var, l);
+    }
+}
+
+void VcprojGenerator::outputVariables()
+{
+#if 0
+    qDebug( "Generator: MSVC.NET: List of current variables:" );
+    for ( QMap<QString, QStringList>::ConstIterator it = project->variables().begin(); it != project->variables().end(); ++it) {
+	qDebug( "Generator: MSVC.NET: %s => %s", it.key().latin1(), it.data().join(" | ").latin1() );
+    }
+#endif
+}
diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h
new file mode 100644
index 0000000..c565b49
--- /dev/null
+++ b/qmake/generators/win32/msvc_vcproj.h
@@ -0,0 +1,122 @@
+
+/****************************************************************************
+**
+** Definition of VcprojGenerator class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#ifndef __MSVC_VCPROJ_H__
+#define __MSVC_VCPROJ_H__
+
+#include "winmakefile.h"
+#include "msvc_objectmodel.h"
+
+enum target {
+    Application,
+    SharedLib,
+    StaticLib
+};
+
+struct QUuid;
+class VcprojGenerator : public Win32MakefileGenerator
+{
+    bool init_flag;
+    bool writeVcprojParts(QTextStream &);
+
+    bool writeMakefile(QTextStream &);
+    virtual void writeSubDirs(QTextStream &t);
+    QString findTemplate(QString file);
+    void init();
+
+public:
+    VcprojGenerator(QMakeProject *p);
+    ~VcprojGenerator();
+
+    QString defaultMakefile() const;
+    virtual bool doDepends() const { return FALSE; } //never necesary
+    QString precompH, precompHFilename,
+	    precompObj, precompPch;
+    bool usePCH;
+
+protected:
+    virtual bool openOutput(QFile &file) const;
+    virtual void processPrlVariable(const QString &, const QStringList &);
+    virtual bool findLibraries();
+    virtual void outputVariables();
+    QString fixFilename(QString ofile) const;
+    
+    void initOld();
+    void initProject();
+    void initConfiguration();
+    void initCompilerTool();
+    void initLinkerTool();
+    void initLibrarianTool();
+    void initIDLTool();
+    void initCustomBuildTool();
+    void initPreBuildEventTools();
+    void initPostBuildEventTools();
+    void initPreLinkEventTools();
+    void initSourceFiles();
+    void initHeaderFiles();
+    void initMOCFiles();
+    void initUICFiles();
+    void initFormsFiles();
+    void initTranslationFiles();
+    void initLexYaccFiles();
+    void initResourceFiles();
+
+    VCProject vcProject;
+    target projectTarget;
+
+private:
+    QUuid getProjectUUID(const QString &filename=QString::null);
+    QUuid increaseUUID(const QUuid &id);
+    friend class VCFilter;
+};
+
+inline VcprojGenerator::~VcprojGenerator()
+{ }
+
+inline QString VcprojGenerator::defaultMakefile() const
+{
+    return project->first("TARGET") + project->first("VCPROJ_EXTENSION");
+}
+
+inline bool VcprojGenerator::findLibraries()
+{ 
+    return Win32MakefileGenerator::findLibraries("MSVCVCPROJ_LIBS");
+}
+
+#endif /* __MSVC_VCPROJ_H__ */
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
new file mode 100644
index 0000000..1a0bfa0
--- /dev/null
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -0,0 +1,487 @@
+/****************************************************************************
+**
+** Implementation of Win32MakefileGenerator class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#include "winmakefile.h"
+#include "option.h"
+#include "project.h"
+#include "meta.h"
+#include <qtextstream.h>
+#include <qstring.h>
+#include <qdict.h>
+#include <qregexp.h>
+#include <qstringlist.h>
+#include <qdir.h>
+
+
+Win32MakefileGenerator::Win32MakefileGenerator(QMakeProject *p) : MakefileGenerator(p)
+{
+
+}
+
+
+struct SubDir
+{
+    QString directory, profile, target, makefile;
+};
+
+void
+Win32MakefileGenerator::writeSubDirs(QTextStream &t)
+{
+    QPtrList<SubDir> subdirs;
+    {
+	QStringList subdirs_in = project->variables()["SUBDIRS"];
+	for(QStringList::Iterator it = subdirs_in.begin(); it != subdirs_in.end(); ++it) {
+	    QString file = (*it);
+	    file = fileFixify(file);
+	    SubDir *sd = new SubDir;
+	    subdirs.append(sd);
+	    sd->makefile = "$(MAKEFILE)";
+	    if((*it).right(4) == ".pro") {
+		int slsh = file.findRev(Option::dir_sep);
+		if(slsh != -1) {
+		    sd->directory = file.left(slsh+1);
+		    sd->profile = file.mid(slsh+1);
+		} else {
+		    sd->profile = file;
+		}
+	    } else {
+		sd->directory = file;
+	    }
+	    while(sd->directory.right(1) == Option::dir_sep)
+		sd->directory = sd->directory.left(sd->directory.length() - 1);
+	    if(!sd->profile.isEmpty()) {
+		QString basename = sd->directory;
+		int new_slsh = basename.findRev(Option::dir_sep);
+		if(new_slsh != -1)
+		    basename = basename.mid(new_slsh+1);
+		if(sd->profile != basename + ".pro")
+		    sd->makefile += "." + sd->profile.left(sd->profile.length() - 4); //no need for the .pro
+	    }
+	    sd->target = "sub-" + (*it);
+	    sd->target.replace('/', '-');
+	    sd->target.replace('.', '_');
+	}
+    }
+    QPtrListIterator<SubDir> it(subdirs);
+
+    t << "MAKEFILE = " << (project->isEmpty("MAKEFILE") ? QString("Makefile") : var("MAKEFILE")) << endl;
+    t << "QMAKE =	" << (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : var("QMAKE_QMAKE")) << endl;
+    t << "SUBTARGETS	= ";
+    for( it.toFirst(); it.current(); ++it)
+	t << " \\\n\t\t" << it.current()->target;
+    t << endl << endl;
+    t << "all: $(MAKEFILE) $(SUBTARGETS)" << endl << endl;
+
+    for( it.toFirst(); it.current(); ++it) {
+	bool have_dir = !(*it)->directory.isEmpty();
+
+        //make the makefile
+	QString mkfile = (*it)->makefile;
+	if(have_dir)
+	    mkfile.prepend((*it)->directory + Option::dir_sep);
+	t << mkfile << ":";
+	if(have_dir)
+	    t << "\n\t" << "cd " << (*it)->directory;
+	t << "\n\t" << "$(QMAKE) " << (*it)->profile << " " << buildArgs();
+	t << " -o " << (*it)->makefile;
+	if(have_dir) {
+	    int subLevels = it.current()->directory.contains(Option::dir_sep) + 1;
+	    t << "\n\t" << "@cd ..";
+	    for(int i = 1; i < subLevels; i++ )
+		t << Option::dir_sep << "..";
+	}
+	t << endl;
+
+	//now actually build
+	t << (*it)->target << ": " << mkfile;
+	if(project->variables()["QMAKE_NOFORCE"].isEmpty())
+	    t << " FORCE";
+	if(have_dir)
+	    t << "\n\t" << "cd " << (*it)->directory;
+	t << "\n\t" << "$(MAKE)";
+        t << " -f " << (*it)->makefile;
+	if(have_dir) {
+	    int subLevels = it.current()->directory.contains(Option::dir_sep) + 1;
+	    t << "\n\t" << "@cd ..";
+	    for(int i = 1; i < subLevels; i++ )
+		t << Option::dir_sep << "..";
+	}
+	t << endl << endl;
+    }
+
+    if (project->isActiveConfig("ordered")) {   // generate dependencies
+        for( it.toFirst(); it.current(); ) {
+            QString tar = it.current()->target;
+            ++it;
+            if (it.current())
+                t << it.current()->target << ": " << tar << endl;
+        }
+        t << endl;
+    }
+
+    if(project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].findIndex("qmake_all") == -1)
+	project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].append("qmake_all");
+    writeMakeQmake(t);
+
+    t << "qmake_all:";
+    if ( !subdirs.isEmpty() ) {
+	for( it.toFirst(); it.current(); ++it) {
+            bool have_dir = !(*it)->directory.isEmpty();
+	    QString subdir = (*it)->directory;
+	    QString profile = (*it)->profile;
+	    int subLevels = subdir.contains(Option::dir_sep) + 1;
+            t << "\n\t";
+            if(have_dir)
+	      t << "cd " << subdir << "\n\t";
+	    int lastSlash = subdir.findRev(Option::dir_sep);
+	    if(lastSlash != -1)
+		subdir = subdir.mid( lastSlash + 1 );
+	    t << "$(QMAKE) "
+	      << ( !profile.isEmpty() ? profile : subdir + ".pro" )
+	      << " -o " << (*it)->makefile
+	      << " " << buildArgs() << "\n\t";
+            if(have_dir) {
+	        t << "@cd ..";
+                for(int i = 1; i < subLevels; i++ )
+                    t << Option::dir_sep << "..";
+            }
+	}
+    } else {
+	// Borland make does not like empty an empty command section, so insert
+	// a dummy command.
+	t << "\n\t" << "@cd .";
+    }
+    t << endl << endl;
+
+    QStringList targs;
+    targs << "clean" << "install_subdirs" << "mocables" << "uicables" << "uiclean" << "mocclean";
+    targs += project->values("SUBDIR_TARGETS");
+    for(QStringList::Iterator targ_it = targs.begin(); targ_it != targs.end(); ++targ_it) {
+        t << (*targ_it) << ": qmake_all";
+	QString targ = (*targ_it);
+	if(targ == "install_subdirs")
+	    targ = "install";
+	else if(targ == "uninstall_subdirs")
+	    targ = "uninstall";
+	if(targ == "clean")
+	    t << varGlue("QMAKE_CLEAN","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ", "");
+	if (!subdirs.isEmpty()) {
+	    for( it.toFirst(); it.current(); ++it) {
+		int subLevels = (*it)->directory.contains(Option::dir_sep) + 1;
+		bool have_dir = !(*it)->directory.isEmpty();
+		if(have_dir)
+		    t << "\n\t" << "cd " << (*it)->directory;
+		QString in_file = " -f " + (*it)->makefile;
+		t << "\n\t" << "$(MAKE) " << in_file << " " << targ;
+		if(have_dir) {
+		    t << "\n\t" << "@cd ..";
+		    for(int i = 1; i < subLevels; i++ )
+			t << Option::dir_sep << "..";
+		}
+	    }
+	} else {
+	    // Borland make does not like empty an empty command section, so
+	    // insert a dummy command.
+	    t << "\n\t" << "@cd .";
+	}
+	t << endl << endl;
+    }
+
+    //installations
+    project->variables()["INSTALLDEPS"]   += "install_subdirs";
+    project->variables()["UNINSTALLDEPS"] += "uninstall_subdirs";
+    writeInstalls(t, "INSTALLS");
+
+    // user defined targets
+    QStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"];
+    for(QStringList::Iterator sit = qut.begin(); sit != qut.end(); ++sit) {
+	QString targ = var((*sit) + ".target"),
+		 cmd = var((*sit) + ".commands"), deps;
+	if(targ.isEmpty())
+	    targ = (*sit);
+	QStringList &deplist = project->variables()[(*sit) + ".depends"];
+	for(QStringList::Iterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) {
+	    QString dep = var((*dep_it) + ".target");
+	    if(dep.isEmpty())
+		dep = (*dep_it);
+	    deps += " " + dep;
+	}
+	if(!project->variables()["QMAKE_NOFORCE"].isEmpty() &&
+	   project->variables()[(*sit) + ".CONFIG"].findIndex("phony") != -1)
+	    deps += QString(" ") + "FORCE";
+	t << targ << ":" << deps << "\n";
+        if(!cmd.isEmpty())
+            t << "\t" << cmd << endl;
+        t << endl;
+    }
+    t << endl << endl;
+
+    if(project->variables()["QMAKE_NOFORCE"].isEmpty())
+	t << "FORCE:" << endl << endl;
+}
+
+
+int
+Win32MakefileGenerator::findHighestVersion(const QString &d, const QString &stem)
+{
+    QString bd = Option::fixPathToLocalOS(d, TRUE);
+    if(!QFile::exists(bd))
+	return -1;
+    if(!project->variables()["QMAKE_" + stem.upper() + "_VERSION_OVERRIDE"].isEmpty())
+	return project->variables()["QMAKE_" + stem.upper() + "_VERSION_OVERRIDE"].first().toInt();
+
+    QDir dir(bd);
+    int biggest=-1;
+    QStringList entries = dir.entryList();
+    QString dllStem = stem + QTDLL_POSTFIX;
+    QRegExp regx( "(" + dllStem + "([0-9]*)).lib", FALSE );
+    for(QStringList::Iterator it = entries.begin(); it != entries.end(); ++it) {
+	if(regx.exactMatch((*it)))
+	    biggest = QMAX(biggest, (regx.cap(1) == dllStem ||
+				     regx.cap(2).isEmpty()) ? -1 : regx.cap(2).toInt());
+    }
+    QMakeMetaInfo libinfo;
+    if(libinfo.readLib(bd + dllStem)) {
+	if(!libinfo.isEmpty("QMAKE_PRL_VERSION"))
+	    biggest = QMAX(biggest, libinfo.first("QMAKE_PRL_VERSION").replace(".", "").toInt());
+    }
+    return biggest;
+}
+
+QString
+Win32MakefileGenerator::findDependency(const QString &dep)
+{
+    {
+	QStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"];
+	for(QStringList::Iterator it = qut.begin(); it != qut.end(); ++it) {
+	    QString targ = var((*it) + ".target");
+	    if(targ.isEmpty())
+		targ = (*it);
+	    if(targ.endsWith(dep))
+		return targ;
+	}
+    }
+    {
+	QStringList &quc = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"];
+	for(QStringList::Iterator it = quc.begin(); it != quc.end(); ++it) {
+	    QString tmp_out = project->variables()[(*it) + ".output"].first();
+	    QString tmp_cmd = project->variables()[(*it) + ".commands"].join(" ");
+	    if(tmp_out.isEmpty() || tmp_cmd.isEmpty())
+		continue;
+	    QStringList &tmp = project->variables()[(*it) + ".input"];
+	    for(QStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
+		QStringList &inputs = project->variables()[(*it2)];
+		for(QStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
+		    QString out = tmp_out;
+		    QFileInfo fi(Option::fixPathToLocalOS((*input)));
+		    out.replace("${QMAKE_FILE_BASE}", fi.baseName());
+		    out.replace("${QMAKE_FILE_NAME}", fi.filePath());
+		    if(out.endsWith(dep))
+			return out;
+		}
+	    }
+	}
+    }
+    return MakefileGenerator::findDependency(dep);
+}
+
+bool
+Win32MakefileGenerator::findLibraries(const QString &where)
+{
+
+    QStringList &l = project->variables()[where];
+    QPtrList<MakefileDependDir> dirs;
+    {
+	QStringList &libpaths = project->variables()["QMAKE_LIBDIR"];
+	for(QStringList::Iterator libpathit = libpaths.begin(); libpathit != libpaths.end(); ++libpathit) {
+	    QString r = (*libpathit), l = r;
+	    fixEnvVariables(l);
+	    dirs.append(new MakefileDependDir(r.replace("\"",""), l.replace("\"","")));
+	}
+    }
+    dirs.setAutoDelete(TRUE);
+    for(QStringList::Iterator it = l.begin(); it != l.end(); ) {
+	QChar quote;
+	bool modified_opt = FALSE, remove = FALSE;
+	QString opt = (*it).stripWhiteSpace();
+	if((opt[0] == '\'' || opt[0] == '"') && opt[(int)opt.length()-1] == opt[0]) {
+	    quote = opt[0];
+	    opt = opt.mid(1, opt.length()-2);
+	}
+	if(opt.startsWith("/LIBPATH:")) {
+            QString r = opt.mid(9), l = Option::fixPathToLocalOS(r);
+            dirs.append(new MakefileDependDir(r.replace("\"",""),
+                                              l.replace("\"","")));
+        } else if(opt.startsWith("-L") || opt.startsWith("/L")) {
+            QString r = opt.mid(2), l = Option::fixPathToLocalOS(r);
+            dirs.append(new MakefileDependDir(r.replace("\"",""),
+                                              l.replace("\"","")));
+            remove = TRUE; //we eat this switch
+        } else if(opt.startsWith("-l") || opt.startsWith("/l")) {
+            QString lib = opt.right(opt.length() - 2), out;
+            if(!lib.isEmpty()) {
+                for(MakefileDependDir *mdd = dirs.first(); mdd; mdd = dirs.next() ) {
+		    QString extension;
+                    int ver = findHighestVersion(mdd->local_dir, lib);
+		    if(ver > 0)
+			extension += QString::number(ver);
+		    extension += ".lib";
+		    if(QMakeMetaInfo::libExists(mdd->local_dir + Option::dir_sep + lib) ||
+		       QFile::exists(mdd->local_dir + Option::dir_sep + lib + extension)) {
+			out = mdd->real_dir + Option::dir_sep + lib + extension;
+			break;
+		    }
+                }
+            }
+            if(out.isEmpty()) {
+                remove = TRUE; //just eat it since we cannot find one..
+            } else {
+		modified_opt = TRUE;
+                (*it) = out;
+	    }
+        } else if(!QFile::exists(Option::fixPathToLocalOS(opt))) {
+	    QPtrList<MakefileDependDir> lib_dirs;
+	    QString file = opt;
+            int slsh = file.findRev(Option::dir_sep);
+            if(slsh != -1) {
+                QString r = file.left(slsh+1), l = r;
+		fixEnvVariables(l);
+		lib_dirs.append(new MakefileDependDir(r.replace("\"",""), l.replace("\"","")));
+                file = file.right(file.length() - slsh - 1);
+            } else {
+		lib_dirs = dirs;
+	    }
+#if 0
+	    if (!project->variables()["QMAKE_QT_DLL"].isEmpty()) {
+		if(file.endsWith(".lib")) {
+		    file = file.left(file.length() - 4);
+		    if(!file.at(file.length()-1).isNumber()) {
+			for(MakefileDependDir *mdd = lib_dirs.first(); mdd; mdd = lib_dirs.next() ) {
+			    QString lib_tmpl(file + "%1" + ".lib");
+			    int ver = findHighestVersion(mdd->local_dir, file);
+			    if(ver != -1) {
+				if(ver)
+				    lib_tmpl = lib_tmpl.arg(ver);
+				else
+				     lib_tmpl = lib_tmpl.arg("");
+				if(slsh != -1) {
+				    QString dir = mdd->real_dir;
+				    if(!dir.endsWith(Option::dir_sep))
+					dir += Option::dir_sep;
+				    lib_tmpl.prepend(dir);
+				}
+				modified_opt = TRUE;
+				(*it) = lib_tmpl;
+				break;
+			    }
+			}
+		    }
+		}
+	    }
+#endif
+        }
+        if(remove) {
+            it = l.remove(it);
+        } else {
+	    if(!quote.isNull() && modified_opt)
+		(*it) = quote + (*it) + quote;
+            ++it;
+	}
+    }
+    return TRUE;
+}
+
+void
+Win32MakefileGenerator::processPrlFiles()
+{
+    QDict<void> processed;
+    QPtrList<MakefileDependDir> libdirs;
+    libdirs.setAutoDelete(TRUE);
+    {
+	QStringList &libpaths = project->variables()["QMAKE_LIBDIR"];
+	for(QStringList::Iterator libpathit = libpaths.begin(); libpathit != libpaths.end(); ++libpathit) {
+	    QString r = (*libpathit), l = r;
+	    fixEnvVariables(l);
+	    libdirs.append(new MakefileDependDir(r.replace("\"",""),
+						 l.replace("\"","")));
+	}
+    }
+    for(bool ret = FALSE; TRUE; ret = FALSE) {
+	//read in any prl files included..
+	QStringList l_out;
+	QString where = "QMAKE_LIBS";
+	if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
+	    where = project->first("QMAKE_INTERNAL_PRL_LIBS");
+	QStringList &l = project->variables()[where];
+	for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	    QString opt = (*it);
+	    if(opt.startsWith("/")) {
+		if(opt.startsWith("/LIBPATH:")) {
+		    QString r = opt.mid(9), l = r;
+		    fixEnvVariables(l);
+		    libdirs.append(new MakefileDependDir(r.replace("\"",""),
+							 l.replace("\"","")));
+		}
+	    } else {
+		if(!processed[opt]) {
+		    if(processPrlFile(opt)) {
+			processed.insert(opt, (void*)1);
+			ret = TRUE;
+		    } else {
+			for(MakefileDependDir *mdd = libdirs.first(); mdd; mdd = libdirs.next() ) {
+			    QString prl = mdd->local_dir + Option::dir_sep + opt;
+			    if(processed[prl]) {
+				break;
+			    } else if(processPrlFile(prl)) {
+				processed.insert(prl, (void*)1);
+				ret = TRUE;
+				break;
+			    }
+			}
+		    }
+		}
+	    }
+	    if(!opt.isEmpty())
+		l_out.append(opt);
+	}
+	if(ret)
+	    l = l_out;
+	else
+	    break;
+    }
+}
diff --git a/qmake/generators/win32/winmakefile.h b/qmake/generators/win32/winmakefile.h
new file mode 100644
index 0000000..2d822dd
--- /dev/null
+++ b/qmake/generators/win32/winmakefile.h
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Definition of Win32MakefileGenerator class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#ifndef __WINMAKEFILE_H__
+#define __WINMAKEFILE_H__
+
+#include "makefile.h"
+
+// In the Qt evaluation and educational version, we have a postfix in the
+// library name (e.g. qtmteval301.dll). QTDLL_POSTFIX is used for this.
+// A script modifies these lines when building eval/edu version, so be careful
+// when changing them.
+#ifndef QTDLL_POSTFIX
+#define QTDLL_POSTFIX ""
+#endif
+
+class Win32MakefileGenerator : public MakefileGenerator
+{
+protected:
+    virtual void writeSubDirs(QTextStream &t);
+    int findHighestVersion(const QString &dir, const QString &stem);
+    bool findLibraries(const QString &);
+    QString findDependency(const QString &);
+    virtual bool findLibraries();
+    virtual void processPrlFiles();
+
+public:
+    Win32MakefileGenerator(QMakeProject *p);
+    ~Win32MakefileGenerator();
+};
+
+inline Win32MakefileGenerator::~Win32MakefileGenerator()
+{ }
+
+inline bool Win32MakefileGenerator::findLibraries()
+{ return findLibraries("QMAKE_LIBS"); }
+
+
+
+#endif /* __WINMAKEFILE_H__ */
diff --git a/qmake/main.cpp b/qmake/main.cpp
new file mode 100644
index 0000000..e70413a
--- /dev/null
+++ b/qmake/main.cpp
@@ -0,0 +1,195 @@
+/****************************************************************************
+**
+** ???
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#include "project.h"
+#include "property.h"
+#include "option.h"
+#include "makefile.h"
+#include <qnamespace.h>
+#include <qregexp.h>
+#include <qdir.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+// for Borland, main is defined to qMain which breaks qmake
+#undef main
+#ifdef Q_OS_MAC
+// for qurl
+bool qt_resolve_symlinks = FALSE;
+#endif
+
+#if defined(Q_WS_WIN)
+extern Q_EXPORT int qt_ntfs_permission_lookup;
+#endif
+
+int main(int argc, char **argv)
+{
+#if defined(Q_WS_WIN)
+    // Workaround for QFileInfo::isReadable() failing for certain users. See task: 54320
+    qt_ntfs_permission_lookup = 0;
+#endif
+
+    /* parse command line */
+    if(!Option::parseCommandLine(argc, argv))
+	return 666;
+
+    QDir sunworkshop42workaround = QDir::current();
+    QString oldpwd = sunworkshop42workaround.currentDirPath();
+#ifdef Q_WS_WIN
+    if(!(oldpwd.length() == 3 && oldpwd[0].isLetter() && oldpwd.endsWith(":/") ) )
+#endif
+    {
+	if(oldpwd.right(1) != QString(QChar(QDir::separator())))
+	    oldpwd += QDir::separator();
+    }
+    Option::output_dir = oldpwd; //for now this is the output dir
+
+    if(Option::output.name() != "-") {
+	QFileInfo fi(Option::output);
+	QString dir;
+	if(fi.isDir()) {
+	    dir = fi.filePath();
+	} else {
+	    QString tmp_dir = fi.dirPath();
+	    if(!tmp_dir.isEmpty() && QFile::exists(tmp_dir))
+		dir = tmp_dir;
+	}
+	if(!dir.isNull() && dir != ".") 
+	    Option::output_dir = dir;
+	if(QDir::isRelativePath(Option::output_dir))
+	    Option::output_dir.prepend(oldpwd);
+    }
+
+    QMakeProperty prop;
+    if(Option::qmake_mode == Option::QMAKE_QUERY_PROPERTY || Option::qmake_mode == Option::QMAKE_SET_PROPERTY) 
+	return prop.exec() ? 0 : 101;
+
+    QMakeProject proj(&prop);
+    int exit_val = 0;
+    QStringList files;
+    if(Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT)
+	files << "(*hack*)"; //we don't even use files, but we do the for() body once
+    else
+	files = Option::mkfile::project_files;
+    for(QStringList::Iterator pfile = files.begin(); pfile != files.end(); pfile++) {
+	if(Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE ||
+	   Option::qmake_mode == Option::QMAKE_GENERATE_PRL) {
+	    QString fn = Option::fixPathToLocalOS((*pfile));
+
+	    //setup pwd properly
+	    debug_msg(1, "Resetting dir to: %s", oldpwd.latin1());
+	    QDir::setCurrent(oldpwd); //reset the old pwd
+	    int di = fn.findRev(Option::dir_sep);
+	    if(di != -1) {
+		debug_msg(1, "Changing dir to: %s", fn.left(di).latin1());
+		if(!QDir::setCurrent(fn.left(di)))
+		    fprintf(stderr, "Cannot find directory: %s\n", fn.left(di).latin1());
+		fn = fn.right(fn.length() - di - 1);
+	    }
+
+	    /* read project.. */
+	    if(!proj.read(fn, oldpwd)) {
+		fprintf(stderr, "Error processing project file: %s\n", 
+			fn == "-" ? "(stdin)" : (*pfile).latin1());
+		exit_val = 2;
+		continue;
+	    }
+	    if(Option::mkfile::do_preprocess) //no need to create makefile
+		continue;
+	    
+	    /* let Option post-process */
+	    if(!Option::postProcessProject(&proj)) {
+		fprintf(stderr, "Error post-processing project file: %s", 
+			fn == "-" ? "(stdin)" : (*pfile).latin1());
+		exit_val = 8;
+		continue;
+	    }
+	}
+
+	bool using_stdout = FALSE;
+	MakefileGenerator *mkfile = MakefileGenerator::create(&proj); //figure out generator
+	if(mkfile && (Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE ||
+		      Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT)) {
+	    //open output
+	    if(!(Option::output.state() & IO_Open)) {
+		if(Option::output.name() == "-") {
+		    Option::output.setName("");
+		    Option::output_dir = QDir::currentDirPath();
+		    Option::output.open(IO_WriteOnly | IO_Translate, stdout);
+		    using_stdout = TRUE;
+		} else {
+		    if(Option::output.name().isEmpty() && Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE)
+			Option::output.setName(proj.first("QMAKE_MAKEFILE"));
+		    Option::output_dir = oldpwd;
+		    if(!mkfile->openOutput(Option::output)) {
+			fprintf(stderr, "Failure to open file: %s\n",
+				Option::output.name().isEmpty() ? "(stdout)" : Option::output.name().latin1());
+			return 5;
+		    }
+		}
+	    }
+	} else {
+	    using_stdout = TRUE; //kind of..
+	}
+	if(mkfile && !mkfile->write()) {
+	    if(Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT)
+		fprintf(stderr, "Unable to generate project file.\n");
+	    else
+		fprintf(stderr, "Unable to generate makefile for: %s\n", (*pfile).latin1());
+	    if(!using_stdout)
+		QFile::remove(Option::output.name());
+	    exit_val = 6;
+	}
+	delete mkfile;
+	mkfile = NULL;
+
+	/* debugging */
+	if(Option::debug_level) {
+	    QMap<QString, QStringList> &vars = proj.variables();
+	    for(QMap<QString, QStringList>::Iterator it = vars.begin(); it != vars.end(); ++it) {
+		if(!it.key().startsWith(".") && !it.data().isEmpty())
+		    debug_msg(1, "%s === %s", it.key().latin1(), it.data().join(" :: ").latin1());
+	    }
+	}
+    }
+    return exit_val;
+}
diff --git a/qmake/meta.cpp b/qmake/meta.cpp
new file mode 100644
index 0000000..35d94c2
--- /dev/null
+++ b/qmake/meta.cpp
@@ -0,0 +1,195 @@
+/****************************************************************************
+**
+** Implementation of QMakeMetaInfo class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#include "meta.h"
+#include "project.h"
+#include "option.h"
+#include <qdir.h>
+
+QMap<QString, QMap<QString, QStringList> > QMakeMetaInfo::cache_vars;
+
+QMakeMetaInfo::QMakeMetaInfo()
+{
+    
+}
+
+
+bool
+QMakeMetaInfo::readLib(const QString &lib)
+{
+    clear();
+    QString meta_file = findLib(lib);
+    
+    if(cache_vars.contains(meta_file)) {
+	vars = cache_vars[meta_file];
+	return TRUE;
+    }
+
+    bool ret = FALSE;
+    if(!meta_file.isNull()) {
+	if(meta_file.endsWith(Option::pkgcfg_ext)) {
+	    if((ret=readPkgCfgFile(meta_file))) 
+		meta_type = "pkgcfg";
+	} else if(meta_file.endsWith(Option::libtool_ext)) {
+	    if((ret=readLibtoolFile(meta_file))) 
+		meta_type = "libtool";
+	} else if(meta_file.endsWith(Option::prl_ext)) {
+	    QMakeProject proj;
+	    if(!proj.read(Option::fixPathToLocalOS(meta_file), 
+			  QDir::currentDirPath(), QMakeProject::ReadProFile))
+		return FALSE;
+	    meta_type = "qmake";
+	    vars = proj.variables();
+	    ret = TRUE;
+	} else {
+	    warn_msg(WarnLogic, "QMakeMetaInfo: unknown file format for %s", meta_file.latin1());
+	}
+    }
+    if(ret) 
+	cache_vars.insert(meta_file, vars);
+    return ret;
+}
+
+
+void
+QMakeMetaInfo::clear()
+{
+    vars.clear();
+}
+
+
+QString
+QMakeMetaInfo::findLib(const QString &lib)
+{
+    QString ret = QString::null;
+    QString extns[] = { Option::prl_ext, /*Option::pkgcfg_ext, Option::libtool_ext,*/ QString::null };
+    for(int extn = 0; !extns[extn].isNull(); extn++) {
+	if(lib.endsWith(extns[extn]))
+	    ret = QFile::exists(lib) ? lib : QString::null;
+    }
+    if(ret.isNull()) {
+	for(int extn = 0; !extns[extn].isNull(); extn++) {
+	    if(QFile::exists(lib + extns[extn])) {
+		ret = lib + extns[extn];
+		break;
+	    }
+	}
+    }
+    if(ret.isNull())
+	debug_msg(2, "QMakeMetaInfo: Cannot find info file for %s", lib.latin1());
+    else
+	debug_msg(2, "QMakeMetaInfo: Found info file %s for %s", ret.latin1(), lib.latin1());
+    return ret;
+}
+
+
+bool
+QMakeMetaInfo::readLibtoolFile(const QString &f)
+{
+    /* I can just run the .la through the .pro parser since they are compatible.. */
+    QMakeProject proj;
+    if(!proj.read(Option::fixPathToLocalOS(f), QDir::currentDirPath(), QMakeProject::ReadProFile))
+	return FALSE;
+    QString dirf = Option::fixPathToTargetOS(f).section(Option::dir_sep, 0, -2);
+    if(dirf == f)
+	dirf = "";
+    else if(!dirf.isEmpty() && !dirf.endsWith(Option::output_dir))
+	dirf += Option::dir_sep;
+    QMap<QString, QStringList> &v = proj.variables();
+    for(QMap<QString, QStringList>::Iterator it = v.begin(); it != v.end(); ++it) {
+	QStringList lst = it.data();
+	if(lst.count() == 1 && (lst.first().startsWith("'") || lst.first().startsWith("\"")) &&
+	   lst.first().endsWith(QString(lst.first()[0])))
+	    lst = lst.first().mid(1, lst.first().length() - 2);
+	if(!vars.contains("QMAKE_PRL_TARGET") &&
+	   (it.key() == "dlname" || it.key() == "library_names" || it.key() == "old_library")) {
+	    QString dir = v["libdir"].first();
+	    if((dir.startsWith("'") || dir.startsWith("\"")) && dir.endsWith(QString(dir[0])))
+		dir = dir.mid(1, dir.length() - 2);
+	    dir = dir.stripWhiteSpace();
+	    if(!dir.isEmpty() && !dir.endsWith(Option::dir_sep))
+		dir += Option::dir_sep;
+	    if(lst.count() == 1)
+		lst = QStringList::split(" ", lst.first());
+	    for(QStringList::Iterator lst_it = lst.begin(); lst_it != lst.end(); ++lst_it) {
+		bool found = FALSE;
+		QString dirs[] = { "", dir, dirf, dirf + ".libs" + QDir::separator(), "(term)" };
+		for(int i = 0; !found && dirs[i] != "(term)"; i++) {
+		    if(QFile::exists(dirs[i] + (*lst_it))) {
+			QString targ = dirs[i] + (*lst_it);
+			if(QDir::isRelativePath(targ)) 
+			    targ.prepend(QDir::currentDirPath() + QDir::separator());
+			vars["QMAKE_PRL_TARGET"] << targ;
+			found = TRUE;
+		    }
+		}
+		if(found)
+ 		    break;
+	    }
+	} else if(it.key() == "dependency_libs") {
+	    if(lst.count() == 1) {
+		QString dep = lst.first();
+		if((dep.startsWith("'") || dep.startsWith("\"")) && dep.endsWith(QString(dep[0])))
+		    dep = dep.mid(1, dep.length() - 2);
+		lst = QStringList::split(" ", dep.stripWhiteSpace());
+	    }
+	    QMakeProject *conf = NULL;
+	    for(QStringList::Iterator lit = lst.begin(); lit != lst.end(); ++lit) {
+		if((*lit).startsWith("-R")) {
+		    if(!conf) {
+			conf = new QMakeProject;
+			conf->read(QMakeProject::ReadAll ^ QMakeProject::ReadProFile);
+		    }
+		    if(!conf->isEmpty("QMAKE_RPATH"))
+			(*lit) = conf->first("QMAKE_RPATH") + (*lit).mid(2);
+		}
+	    }
+	    if(conf)
+		delete conf;
+	    vars["QMAKE_PRL_LIBS"] += lst;
+	}
+    }
+    return TRUE;
+}
+
+bool
+QMakeMetaInfo::readPkgCfgFile(const QString &f)
+{
+    fprintf(stderr, "Must implement reading in pkg-config files (%s)!!!\n", f.latin1());
+    return FALSE;
+}
diff --git a/qmake/meta.h b/qmake/meta.h
new file mode 100644
index 0000000..16114be
--- /dev/null
+++ b/qmake/meta.h
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** Definition of QMakeMetaInfo class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#ifndef __META_H__
+#define __META_H__
+
+#include <qmap.h>
+#include <qstringlist.h>
+#include <qstring.h>
+
+class QMakeMetaInfo 
+{
+    bool readLibtoolFile(const QString &f);
+    bool readPkgCfgFile(const QString &f);
+    QMap<QString, QStringList> vars;
+    QString meta_type;
+    static QMap<QString, QMap<QString, QStringList> > cache_vars;
+    void clear();
+public:
+    QMakeMetaInfo();
+
+    bool readLib(const QString &lib);
+    static QString findLib(const QString &lib);
+    static bool libExists(const QString &lib);
+    QString type() const;
+
+    bool isEmpty(const QString &v);
+    QStringList &values(const QString &v);
+    QString first(const QString &v);
+    QMap<QString, QStringList> &variables();
+};
+
+inline bool QMakeMetaInfo::isEmpty(const QString &v)
+{ return !vars.contains(v) || vars[v].isEmpty(); }
+
+inline QString QMakeMetaInfo::type() const
+{ return meta_type; }
+
+inline QStringList &QMakeMetaInfo::values(const QString &v)
+{ return vars[v]; }
+
+inline QString QMakeMetaInfo::first(const QString &v)
+{
+#if defined(Q_CC_SUN) && (__SUNPRO_CC == 0x500) || defined(Q_CC_HP)
+    // workaround for Sun WorkShop 5.0 bug fixed in Forte 6
+    if (isEmpty(v))
+	return QString("");
+    else
+	return vars[v].first();
+#else
+    return isEmpty(v) ? QString("") : vars[v].first();
+#endif
+}
+
+inline QMap<QString, QStringList> &QMakeMetaInfo::variables()
+{ return vars; }
+
+inline bool QMakeMetaInfo::libExists(const QString &lib)
+{ return !findLib(lib).isNull(); }
+
+#endif /* __META_H__ */
diff --git a/qmake/option.cpp b/qmake/option.cpp
new file mode 100644
index 0000000..bfb34f7
--- /dev/null
+++ b/qmake/option.cpp
@@ -0,0 +1,548 @@
+/****************************************************************************
+**
+** Implementation of Option class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#include "option.h"
+#include <qdir.h>
+#include <qregexp.h>
+#include <stdlib.h>
+#include <stdarg.h>
+
+//convenience
+QString Option::prf_ext;
+QString Option::prl_ext;
+QString Option::libtool_ext;
+QString Option::pkgcfg_ext;
+QString Option::ui_ext;
+QStringList Option::h_ext;
+QString Option::cpp_moc_ext;
+QString Option::h_moc_ext;
+QStringList Option::cpp_ext;
+QString Option::obj_ext;
+QString Option::lex_ext;
+QString Option::yacc_ext;
+QString Option::dir_sep;
+QString Option::h_moc_mod;
+QString Option::cpp_moc_mod;
+QString Option::yacc_mod;
+QString Option::lex_mod;
+
+//mode
+Option::QMAKE_MODE Option::qmake_mode = Option::QMAKE_GENERATE_NOTHING;
+
+//all modes
+int Option::warn_level = WarnLogic;
+int Option::debug_level = 0;
+QFile Option::output("");
+QString Option::output_dir;
+QStringList Option::before_user_vars;
+QStringList Option::after_user_vars;
+QString Option::user_template;
+QString Option::user_template_prefix;
+#if defined(Q_OS_WIN32)
+Option::TARG_MODE Option::target_mode = Option::TARG_WIN_MODE;
+#elif defined(Q_OS_MAC9)
+Option::TARG_MODE Option::target_mode = Option::TARG_MAC9_MODE;
+#elif defined(Q_OS_MACX)
+Option::TARG_MODE Option::target_mode = Option::TARG_MACX_MODE;
+#elif defined(Q_OS_QNX6)
+Option::TARG_MODE Option::target_mode = Option::TARG_QNX6_MODE;
+#else
+Option::TARG_MODE Option::target_mode = Option::TARG_UNIX_MODE;
+#endif
+
+//QMAKE_*_PROPERTY stuff
+QStringList Option::prop::properties;
+
+//QMAKE_GENERATE_PROJECT stuff
+bool Option::projfile::do_pwd = TRUE;
+bool Option::projfile::do_recursive = TRUE;
+QStringList Option::projfile::project_dirs;
+
+//QMAKE_GENERATE_MAKEFILE stuff
+QString Option::mkfile::qmakespec;
+int Option::mkfile::cachefile_depth = -1;
+bool Option::mkfile::do_deps = TRUE;
+bool Option::mkfile::do_mocs = TRUE;
+bool Option::mkfile::do_dep_heuristics = TRUE;
+bool Option::mkfile::do_preprocess = FALSE;
+bool Option::mkfile::do_cache = TRUE;
+QString Option::mkfile::cachefile;
+QStringList Option::mkfile::project_files;
+QString Option::mkfile::qmakespec_commandline;
+
+static Option::QMAKE_MODE default_mode(QString progname)
+{
+    int s = progname.findRev(Option::dir_sep);
+    if(s != -1)
+	progname = progname.right(progname.length() - (s + 1));
+    if(progname == "qmakegen")
+	return Option::QMAKE_GENERATE_PROJECT;
+    else if(progname == "qt-config")
+	return Option::QMAKE_QUERY_PROPERTY;
+    return Option::QMAKE_GENERATE_MAKEFILE;
+}
+
+QString project_builtin_regx();
+bool usage(const char *a0)
+{
+    fprintf(stdout, "Usage: %s [mode] [options] [files]\n"
+	    "\n"
+	    "   QMake has two modes, one mode for generating project files based on\n"
+	    "some heuristics, and the other for generating makefiles. Normally you\n"
+	    "shouldn't need to specify a mode, as makefile generation is the default\n"
+	    "mode for qmake, but you may use this to test qmake on an existing project\n"
+	    "\n"
+	    "Mode:\n"
+	    "\t-project       Put qmake into project file generation mode%s\n"
+	    "\t               In this mode qmake interprets files as files to\n"
+	    "\t               be built,\n"
+	    "\t               defaults to %s\n"
+	    "\t-makefile      Put qmake into makefile generation mode%s\n"
+	    "\t               In this mode qmake interprets files as project files to\n"
+	    "\t               be processed, if skipped qmake will try to find a project\n"
+	    "\t               file in your current working directory\n"
+	    "\n"
+	    "Warnings Options:\n"
+	    "\t-Wnone         Turn off all warnings\n"
+	    "\t-Wall          Turn on all warnings\n"
+	    "\t-Wparser       Turn on parser warnings\n"
+	    "\t-Wlogic        Turn on logic warnings\n"
+	    "\n"
+	    "Options:\n"
+	    "\t * You can place any variable assignment in options and it will be     *\n"
+	    "\t * processed as if it was in [files]. These assignments will be parsed *\n"
+	    "\t * before [files].                                                     *\n"
+	    "\t-o file        Write output to file\n"
+	    "\t-unix          Run in unix mode\n"
+	    "\t-win32         Run in win32 mode\n"
+	    "\t-macx          Run in Mac OS X mode\n"
+	    "\t-d             Increase debug level\n"
+	    "\t-t templ       Overrides TEMPLATE as templ\n"
+	    "\t-tp prefix     Overrides TEMPLATE so that prefix is prefixed into the value\n"
+	    "\t-help          This help\n"
+	    "\t-v             Version information\n"
+	    "\t-after         All variable assignments after this will be\n"
+	    "\t               parsed after [files]\n"
+	    "\t-cache file    Use file as cache           [makefile mode only]\n"
+	    "\t-spec spec     Use spec as QMAKESPEC       [makefile mode only]\n"
+	    "\t-nocache       Don't use a cache file      [makefile mode only]\n"
+	    "\t-nodepend      Don't generate dependencies [makefile mode only]\n"
+	    "\t-nomoc         Don't generate moc targets  [makefile mode only]\n"
+	    "\t-nopwd         Don't look for files in pwd [ project mode only]\n"
+	    "\t-norecursive   Don't do a recursive search [ project mode only]\n"
+	    ,a0, 
+	    default_mode(a0) == Option::QMAKE_GENERATE_PROJECT  ? " (default)" : "", project_builtin_regx().latin1(),
+	    default_mode(a0) == Option::QMAKE_GENERATE_MAKEFILE ? " (default)" : "");
+    return FALSE;
+}
+
+enum {
+    QMAKE_CMDLINE_SUCCESS,
+    QMAKE_CMDLINE_SHOW_USAGE,
+    QMAKE_CMDLINE_BAIL
+};
+int
+Option::internalParseCommandLine(int argc, char **argv, int skip)
+{
+    bool before = TRUE;
+    for(int x = skip; x < argc; x++) {
+	if(*argv[x] == '-' && strlen(argv[x]) > 1) { /* options */
+	    QString opt = argv[x] + 1;
+
+	    //first param is a mode, or we default
+	    if(x == 1) {
+		bool specified = TRUE;
+		if(opt == "project") {
+		    Option::qmake_mode = Option::QMAKE_GENERATE_PROJECT;
+		} else if(opt == "prl") {
+		    Option::mkfile::do_deps = FALSE;
+		    Option::mkfile::do_mocs = FALSE;
+		    Option::qmake_mode = Option::QMAKE_GENERATE_PRL;
+		} else if(opt == "set") {
+		    Option::qmake_mode = Option::QMAKE_SET_PROPERTY;
+		} else if(opt == "query") {
+		    Option::qmake_mode = Option::QMAKE_QUERY_PROPERTY;
+		} else if(opt == "makefile") {
+		    Option::qmake_mode = Option::QMAKE_GENERATE_MAKEFILE;
+		} else {
+		    specified = FALSE;
+		}
+		if(specified)
+		    continue;
+	    }
+	    //all modes
+	    if(opt == "o" || opt == "output") {
+		Option::output.setName(argv[++x]);
+	    } else if(opt == "after") {
+		before = FALSE;
+	    } else if(opt == "t" || opt == "template") {
+		Option::user_template = argv[++x];
+	    } else if(opt == "tp" || opt == "template_prefix") {
+		Option::user_template_prefix = argv[++x];
+	    } else if(opt == "mac9") {
+		Option::target_mode = TARG_MAC9_MODE;
+	    } else if(opt == "macx") {
+		Option::target_mode = TARG_MACX_MODE;
+	    } else if(opt == "unix") {
+		Option::target_mode = TARG_UNIX_MODE;
+	    } else if(opt == "win32") {
+		Option::target_mode = TARG_WIN_MODE;
+	    } else if(opt == "d") {
+		Option::debug_level++;
+	    } else if(opt == "version" || opt == "v" || opt == "-version") {
+		fprintf(stderr, "Qmake version: %s (Qt %s)\n", qmake_version(), QT_VERSION_STR);
+		fprintf(stderr, "Qmake is free software from Trolltech ASA.\n");
+		return QMAKE_CMDLINE_BAIL;
+	    } else if(opt == "h" || opt == "help") {
+		return QMAKE_CMDLINE_SHOW_USAGE;
+	    } else if(opt == "Wall") {
+		Option::warn_level |= WarnAll;
+	    } else if(opt == "Wparser") {
+		Option::warn_level |= WarnParser;
+	    } else if(opt == "Wlogic") {
+		Option::warn_level |= WarnLogic;
+	    } else if(opt == "Wnone") {
+		Option::warn_level = WarnNone;
+	    } else {
+		if(Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE ||
+		   Option::qmake_mode == Option::QMAKE_GENERATE_PRL) {
+		    if(opt == "nodepend") {
+			Option::mkfile::do_deps = FALSE;
+		    } else if(opt == "nomoc") {
+			Option::mkfile::do_mocs = FALSE;
+		    } else if(opt == "nocache") {
+			Option::mkfile::do_cache = FALSE;
+		    } else if(opt == "nodependheuristics") {
+			Option::mkfile::do_dep_heuristics = FALSE;
+		    } else if(opt == "E") {
+			Option::mkfile::do_preprocess = TRUE;
+		    } else if(opt == "cache") {
+			Option::mkfile::cachefile = argv[++x];
+		    } else if(opt == "platform" || opt == "spec") {
+			Option::mkfile::qmakespec = argv[++x];
+			Option::mkfile::qmakespec_commandline = argv[x];
+		    } else {
+			fprintf(stderr, "***Unknown option -%s\n", opt.latin1());
+			return QMAKE_CMDLINE_SHOW_USAGE;
+		    }
+		} else if(Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT) {
+		    if(opt == "nopwd") {
+			Option::projfile::do_pwd = FALSE;
+		    } else if(opt == "r") {
+			Option::projfile::do_recursive = TRUE;
+		    } else if(opt == "norecursive") {
+			Option::projfile::do_recursive = FALSE;
+		    } else {
+			fprintf(stderr, "***Unknown option -%s\n", opt.latin1());
+			return QMAKE_CMDLINE_SHOW_USAGE;
+		    }
+		}
+	    }
+	} else {
+	    QString arg = argv[x];
+	    if(arg.find('=') != -1) {
+		if(before)
+		    Option::before_user_vars.append(arg);
+		else
+		    Option::after_user_vars.append(arg);
+	    } else {
+		bool handled = TRUE;
+		if(Option::qmake_mode == Option::QMAKE_QUERY_PROPERTY ||
+		    Option::qmake_mode == Option::QMAKE_SET_PROPERTY) {
+		    Option::prop::properties.append(arg);
+		} else {
+		    QFileInfo fi(arg);
+		    if(!fi.convertToAbs()) //strange
+			arg = fi.filePath();
+		    if(Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE ||
+		       Option::qmake_mode == Option::QMAKE_GENERATE_PRL)
+			Option::mkfile::project_files.append(arg);
+		    else if(Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT)
+			Option::projfile::project_dirs.append(arg);
+		    else 
+			handled = FALSE;
+		}
+		if(!handled)
+		    return QMAKE_CMDLINE_SHOW_USAGE;
+	    }
+	}
+    }
+    return QMAKE_CMDLINE_SUCCESS;
+}
+
+
+bool
+Option::parseCommandLine(int argc, char **argv)
+{
+    Option::cpp_moc_mod = "";
+    Option::h_moc_mod = "moc_";
+    Option::lex_mod = "_lex";
+    Option::yacc_mod = "_yacc";
+    Option::prl_ext = ".prl";
+    Option::libtool_ext = ".la";
+    Option::pkgcfg_ext = ".pc";
+    Option::prf_ext = ".prf";
+    Option::ui_ext = ".ui";
+    Option::h_ext << ".h" << ".hpp" << ".hh" << ".H" << ".hxx";
+    Option::cpp_moc_ext = ".moc";
+    Option::h_moc_ext = ".cpp";
+    Option::cpp_ext << ".cpp" << ".cc" << ".cxx" << ".C";
+    Option::lex_ext = ".l";
+    Option::yacc_ext = ".y";
+
+    if(Option::qmake_mode == Option::QMAKE_GENERATE_NOTHING)
+	Option::qmake_mode = default_mode(argv[0]);
+    if(const char *envflags = getenv("QMAKEFLAGS")) {
+	int env_argc = 0, env_size = 0, currlen=0;
+	char quote = 0, **env_argv = NULL;
+	for(int i = 0; envflags[i]; i++) {
+	    if(!quote && (envflags[i] == '\'' || envflags[i] == '"')) {
+		quote = envflags[i];
+	    } else if(envflags[i] == quote) {
+		quote = 0;
+	    } else if(!quote && envflags[i] == ' ') {
+		if(currlen && env_argv && env_argv[env_argc]) {
+		    env_argv[env_argc][currlen] = '\0';
+		    currlen = 0;
+		    env_argc++;
+		}
+	    } else {
+		if(!env_argv || env_argc > env_size) {
+		    env_argv = (char **)realloc(env_argv, sizeof(char *)*(env_size+=10));
+		    for(int i2 = env_argc; i2 < env_size; i2++)
+			env_argv[i2] = NULL;
+		}
+		if(!env_argv[env_argc]) {
+		    currlen = 0;
+		    env_argv[env_argc] = (char*)malloc(255);
+		}
+		if(currlen < 255) 
+		    env_argv[env_argc][currlen++] = envflags[i];
+	    }
+	}
+	if(env_argv[env_argc]) {
+	    env_argv[env_argc][currlen] = '\0';
+	    currlen = 0;
+	    env_argc++;
+	}
+	internalParseCommandLine(env_argc, env_argv);
+	for(int i2 = 0; i2 < env_size; i2++) {
+	    if(env_argv[i2])
+		free(env_argv[i2]);
+	}
+	free(env_argv);
+    }
+    {
+	int ret = internalParseCommandLine(argc, argv, 1);
+	if(ret != QMAKE_CMDLINE_SUCCESS) 
+	    return ret == QMAKE_CMDLINE_SHOW_USAGE ? usage(argv[0]) : FALSE;
+    }
+
+    //last chance for defaults
+    if(Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE ||
+	Option::qmake_mode == Option::QMAKE_GENERATE_PRL) {
+	if(Option::mkfile::qmakespec.isNull() || Option::mkfile::qmakespec.isEmpty())
+	    Option::mkfile::qmakespec = getenv("QMAKESPEC");
+
+	//try REALLY hard to do it for them, lazy..
+	if(Option::mkfile::project_files.isEmpty()) {
+	    QString pwd = QDir::currentDirPath(), 
+		   proj = pwd + "/" + pwd.right(pwd.length() - (pwd.findRev('/') + 1)) + ".pro";
+	    if(QFile::exists(proj)) {
+		Option::mkfile::project_files.append(proj);
+	    } else { //last try..
+		QDir d(pwd, "*.pro");
+		if(d.count() != 1)
+		    return usage(argv[0]);
+		Option::mkfile::project_files.append(pwd + "/" + d[0]);
+	    }
+	}
+    }
+
+    //defaults for globals
+    if(Option::target_mode == Option::TARG_WIN_MODE) {
+	Option::dir_sep = "\\";
+	Option::obj_ext =  ".obj";
+    } else {
+	if(Option::target_mode == Option::TARG_MAC9_MODE)
+	    Option::dir_sep = ":";
+	else
+	    Option::dir_sep = "/";
+	Option::obj_ext = ".o";
+    }
+    return TRUE;
+}
+
+bool Option::postProcessProject(QMakeProject *project)
+{
+    Option::cpp_ext = project->variables()["QMAKE_EXT_CPP"];
+    if(cpp_ext.isEmpty())
+	cpp_ext << ".cpp"; //something must be there
+    Option::h_ext = project->variables()["QMAKE_EXT_H"];
+    if(h_ext.isEmpty())
+	h_ext << ".h";
+
+    if(!project->isEmpty("QMAKE_EXT_PKGCONFIG"))
+	Option::pkgcfg_ext = project->first("QMAKE_EXT_PKGCONFIG");
+    if(!project->isEmpty("QMAKE_EXT_LIBTOOL"))
+	Option::libtool_ext = project->first("QMAKE_EXT_LIBTOOL");
+    if(!project->isEmpty("QMAKE_EXT_PRL"))
+	Option::prl_ext = project->first("QMAKE_EXT_PRL");
+    if(!project->isEmpty("QMAKE_EXT_PRF"))
+	Option::prf_ext = project->first("QMAKE_EXT_PRF");
+    if(!project->isEmpty("QMAKE_EXT_UI"))
+	Option::ui_ext = project->first("QMAKE_EXT_UI");
+    if(!project->isEmpty("QMAKE_EXT_CPP_MOC"))
+	Option::cpp_moc_ext = project->first("QMAKE_EXT_CPP_MOC");
+    if(!project->isEmpty("QMAKE_EXT_H_MOC"))
+	Option::h_moc_ext = project->first("QMAKE_EXT_H_MOC");
+    if(!project->isEmpty("QMAKE_EXT_LEX"))
+	Option::lex_ext = project->first("QMAKE_EXT_LEX");
+    if(!project->isEmpty("QMAKE_EXT_YACC"))
+	Option::yacc_ext = project->first("QMAKE_EXT_YACC");
+    if(!project->isEmpty("QMAKE_EXT_OBJ"))
+	Option::obj_ext = project->first("QMAKE_EXT_OBJ");
+    if(!project->isEmpty("QMAKE_H_MOD_MOC"))
+	Option::h_moc_mod = project->first("QMAKE_H_MOD_MOC");
+    if(!project->isEmpty("QMAKE_CPP_MOD_MOC"))
+	Option::cpp_moc_mod = project->first("QMAKE_CPP_MOD_MOC");
+    if(!project->isEmpty("QMAKE_MOD_LEX"))
+	Option::lex_mod = project->first("QMAKE_MOD_LEX");
+    if(!project->isEmpty("QMAKE_MOD_YACC"))
+	Option::yacc_mod = project->first("QMAKE_MOD_YACC");
+    if(!project->isEmpty("QMAKE_DIR_SEP"))
+	Option::dir_sep = project->first("QMAKE_DIR_SEP");
+    return TRUE;
+}
+
+void fixEnvVariables(QString &x)
+{
+    int rep;
+    QRegExp reg_var("\\$\\(.*\\)");
+    reg_var.setMinimal( TRUE );
+    while((rep = reg_var.search(x)) != -1)
+	x.replace(rep, reg_var.matchedLength(), QString(getenv(x.mid(rep + 2, reg_var.matchedLength() - 3).latin1())));
+}
+static QString fixPath(QString x)
+{
+#if 0
+    QFileInfo fi(x);
+    if(fi.isDir()) {
+	QDir dir(x);
+	x = dir.canonicalPath();
+    } else {
+	QString dir = fi.dir().canonicalPath();
+	if(!dir.isEmpty() && dir.right(1) != Option::dir_sep)
+	    dir += Option::dir_sep;
+	x = dir + fi.fileName();
+    }
+#endif
+    return QDir::cleanDirPath(x);
+}
+
+
+QString
+Option::fixPathToTargetOS(const QString& in, bool fix_env, bool canonical)
+{
+    QString tmp(in);
+    if(fix_env)
+	fixEnvVariables(tmp);
+    if(canonical)
+	tmp = fixPath(tmp);
+    QString rep;
+    if(Option::target_mode == TARG_MAC9_MODE) 
+	tmp = tmp.replace('/', Option::dir_sep).replace('\\', Option::dir_sep);
+    else if(Option::target_mode == TARG_WIN_MODE) 
+	tmp = tmp.replace('/', Option::dir_sep);
+    else 
+	tmp = tmp.replace('\\', Option::dir_sep);
+    return tmp;
+}
+
+QString
+Option::fixPathToLocalOS(const QString& in, bool fix_env, bool canonical)
+{
+    QString tmp(in);
+    if(fix_env)
+	fixEnvVariables(tmp);
+    if(canonical)
+	tmp = fixPath(tmp);
+#if defined(Q_OS_WIN32)
+    return tmp.replace('/', '\\');
+#else
+    return tmp.replace('\\', '/');
+#endif
+}
+
+const char *qmake_version()
+{
+    static char *ret = NULL;
+    if(ret)
+	return ret;
+    ret = (char *)malloc(15);
+    sprintf(ret, "%d.%02d%c", QMAKE_VERSION_MAJOR, QMAKE_VERSION_MINOR, 'a' + QMAKE_VERSION_PATCH);
+    return ret;
+}
+
+void debug_msg(int level, const char *fmt, ...)
+{
+    if(Option::debug_level < level)
+	return;
+    fprintf(stderr, "DEBUG %d: ", level);
+    {
+	va_list ap;
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
+	va_end(ap);
+    }
+    fprintf(stderr, "\n");
+}
+
+void warn_msg(QMakeWarn type, const char *fmt, ...)
+{
+    if(!(Option::warn_level & type))
+	return;
+    fprintf(stderr, "WARNING: ");
+    {
+	va_list ap;
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
+	va_end(ap);
+    }
+    fprintf(stderr, "\n");
+}
diff --git a/qmake/option.h b/qmake/option.h
new file mode 100644
index 0000000..4b55479
--- /dev/null
+++ b/qmake/option.h
@@ -0,0 +1,137 @@
+/****************************************************************************
+**
+** Definition of Option class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#ifndef __OPTION_H__
+#define __OPTION_H__
+
+#include "project.h"
+#include <qstring.h>
+#include <qstringlist.h>
+#include <qfile.h>
+
+#define QMAKE_VERSION_MAJOR 1
+#define QMAKE_VERSION_MINOR 7
+#define QMAKE_VERSION_PATCH 0
+const char *qmake_version();
+
+void fixEnvVariables(QString &x);
+void debug_msg(int level, const char *fmt, ...);
+enum QMakeWarn {
+    WarnNone    = 0x00,
+    WarnParser  = 0x01,
+    WarnLogic   = 0x02,
+    WarnAll     = 0xFF
+};
+void warn_msg(QMakeWarn t, const char *fmt, ...);
+
+struct Option
+{
+    //simply global convenience
+    static QString libtool_ext;
+    static QString pkgcfg_ext;
+    static QString prf_ext;
+    static QString prl_ext;
+    static QString ui_ext;
+    static QStringList h_ext;
+    static QStringList cpp_ext;
+    static QString h_moc_ext;
+    static QString cpp_moc_ext;
+    static QString obj_ext;
+    static QString lex_ext;
+    static QString yacc_ext;
+    static QString h_moc_mod;
+    static QString cpp_moc_mod;
+    static QString lex_mod;
+    static QString yacc_mod;
+    static QString dir_sep;
+    //both of these must be called..
+    static bool parseCommandLine(int argc, char **argv); //parse cmdline
+    static bool postProcessProject(QMakeProject *); 
+
+    //and convenience functions    
+    static QString fixPathToLocalOS(const QString& in, bool fix_env=TRUE, bool canonical=TRUE);
+    static QString fixPathToTargetOS(const QString& in, bool fix_env=TRUE, bool canonical=TRUE);
+
+    //global qmake mode, can only be in one mode per invocation!
+    enum QMAKE_MODE { QMAKE_GENERATE_NOTHING, QMAKE_GENERATE_PROJECT, QMAKE_GENERATE_MAKEFILE, 
+		      QMAKE_GENERATE_PRL, QMAKE_SET_PROPERTY, QMAKE_QUERY_PROPERTY };
+    static QMAKE_MODE qmake_mode;
+
+    //all modes
+    static QFile output;
+    static QString output_dir;
+    static int debug_level;
+    static int warn_level;
+    static QStringList before_user_vars, after_user_vars;
+    enum TARG_MODE { TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE, TARG_MAC9_MODE, TARG_QNX6_MODE };
+    static TARG_MODE target_mode;
+    static QString user_template, user_template_prefix;
+
+    
+    //QMAKE_*_PROPERTY options
+    struct prop {
+	static QStringList properties;
+    };
+
+    //QMAKE_GENERATE_PROJECT options
+    struct projfile {
+	static bool do_pwd;
+	static bool do_recursive;
+	static QStringList project_dirs;
+    };
+
+    //QMAKE_GENERATE_MAKEFILE options
+    struct mkfile {
+	static QString qmakespec;
+	static bool do_cache;
+	static bool do_deps;
+	static bool do_mocs;
+	static bool do_dep_heuristics;
+	static bool do_preprocess;
+	static QString cachefile;
+	static int cachefile_depth;
+	static QStringList project_files;
+	static QString qmakespec_commandline;
+    };
+
+private:
+    static int internalParseCommandLine(int, char **, int=0);
+};
+
+
+#endif /* __OPTION_H__ */
diff --git a/qmake/project.cpp b/qmake/project.cpp
new file mode 100644
index 0000000..3957144
--- /dev/null
+++ b/qmake/project.cpp
@@ -0,0 +1,1397 @@
+/****************************************************************************
+**
+** Implementation of QMakeProject class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#include "project.h"
+#include "property.h"
+#include "option.h"
+#include <qfile.h>
+#include <qdir.h>
+#include <qregexp.h>
+#include <qtextstream.h>
+#include <qvaluestack.h>
+#ifdef Q_OS_UNIX
+# include <unistd.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifdef Q_OS_WIN32
+#define QT_POPEN _popen
+#else
+#define QT_POPEN popen
+#endif
+
+struct parser_info {
+    QString file;
+    int line_no;
+} parser;
+
+static void qmake_error_msg(const char *msg)
+{
+    fprintf(stderr, "%s:%d: %s\n", parser.file.latin1(), parser.line_no, msg);
+}
+
+QStringList qmake_mkspec_paths()
+{
+    QStringList ret;
+    const QString concat = QDir::separator() + QString("mkspecs");
+    if(const char *qmakepath = getenv("QMAKEPATH")) {
+#ifdef Q_OS_WIN
+	QStringList lst = QStringList::split(';', qmakepath);
+	for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it) {
+	    QStringList lst2 = QStringList::split(':', (*it));
+	    for(QStringList::Iterator it2 = lst2.begin(); it2 != lst2.end(); ++it2)
+		ret << ((*it2) + concat);
+	}
+#else
+	QStringList lst = QStringList::split(':', qmakepath);
+	for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it)
+	    ret << ((*it) + concat);
+#endif
+    }
+    if(const char *qtdir = getenv("QTDIR"))
+	ret << (QString(qtdir) + concat);
+#ifdef QT_INSTALL_PREFIX
+    ret << (QT_INSTALL_PREFIX + concat);
+#endif
+#if defined(HAVE_QCONFIG_CPP)
+    ret << (qInstallPath() + concat);
+#endif
+#ifdef QT_INSTALL_DATA
+    ret << (QT_INSTALL_DATA + concat);
+#endif
+#if defined(HAVE_QCONFIG_CPP)
+    ret << (qInstallPathData() + concat);
+#endif
+
+    /* prefer $QTDIR if it is set */
+    if (getenv("QTDIR"))
+	ret << getenv("QTDIR");
+    ret << qInstallPathData();
+    return ret;
+}
+
+static QString varMap(const QString &x)
+{
+    QString ret(x);
+    if(ret.startsWith("TMAKE")) //tmake no more!
+	ret = "QMAKE" + ret.mid(5);
+    else if(ret == "INTERFACES")
+	ret = "FORMS";
+    else if(ret == "QMAKE_POST_BUILD")
+	ret = "QMAKE_POST_LINK";
+    else if(ret == "TARGETDEPS")
+	ret = "POST_TARGETDEPS";
+    else if(ret == "LIBPATH")
+	ret = "QMAKE_LIBDIR";
+    else if(ret == "QMAKE_EXT_MOC")
+	ret = "QMAKE_EXT_CPP_MOC";
+    else if(ret == "QMAKE_MOD_MOC")
+	ret = "QMAKE_H_MOD_MOC";
+    else if(ret == "QMAKE_LFLAGS_SHAPP")
+	ret = "QMAKE_LFLAGS_APP";
+    else if(ret == "PRECOMPH")
+	ret = "PRECOMPILED_HEADER";
+    else if(ret == "PRECOMPCPP")
+	ret = "PRECOMPILED_SOURCE";
+    else if(ret == "INCPATH")
+	ret = "INCLUDEPATH";
+    return ret;
+}
+
+static QStringList split_arg_list(const QString &params)
+{
+    QChar quote = 0;
+    QStringList args;
+    for(int x = 0, last = 0, parens = 0; x <= (int)params.length(); x++) {
+	if(x == (int)params.length()) {
+	    QString mid = params.mid(last, x - last).stripWhiteSpace();
+            if(quote) {
+                if(mid[(int)mid.length()-1] == quote)
+                    mid.truncate(1);
+                quote = 0;
+            }
+	    args << mid;
+	} else if(params[x] == ')') {
+	    parens--;
+	} else if(params[x] == '(') {
+	    parens++;
+	} else if(params[x] == quote) {
+	    quote = 0;
+	} else if(!quote && (params[x] == '\'' || params[x] == '"')) {
+	    quote = params[x];
+	} else if(!parens && !quote && params[x] == ',') {
+	    args << params.mid(last, x - last).stripWhiteSpace();
+	    last = x+1;
+	}
+    }
+    return args;
+}
+
+static QStringList split_value_list(const QString &vals, bool do_semicolon=FALSE)
+{
+    QString build;
+    QStringList ret;
+    QValueStack<QChar> quote;
+    for(int x = 0; x < (int)vals.length(); x++) {
+	if(x != (int)vals.length()-1 && vals[x] == '\\' && (vals[x+1] == '\'' || vals[x+1] == '"'))
+	    build += vals[x++]; //get that 'escape'
+	else if(!quote.isEmpty() && vals[x] == quote.top())
+	    quote.pop();
+	else if(vals[x] == '\'' || vals[x] == '"')
+	    quote.push(vals[x]);
+
+	if(quote.isEmpty() && ((do_semicolon && vals[x] == ';') ||  vals[x] == ' ')) {
+	    ret << build;
+	    build = "";
+	} else {
+	    build += vals[x];
+	}
+    }
+    if(!build.isEmpty())
+	ret << build;
+    return ret;
+}
+
+QMakeProject::QMakeProject()
+{
+    prop = NULL;
+}
+
+QMakeProject::QMakeProject(QMakeProperty *p)
+{
+    prop = p;
+}
+
+void
+QMakeProject::reset()
+{
+    /* scope blocks start at true */
+    test_status = TestNone;
+    scope_flag = 0x01;
+    scope_block = 0;
+}
+
+bool
+QMakeProject::parse(const QString &t, QMap<QString, QStringList> &place)
+{
+    QString s = t.simplifyWhiteSpace();
+    int hash_mark = s.find("#");
+    if(hash_mark != -1) //good bye comments
+	s = s.left(hash_mark);
+    if(s.isEmpty()) /* blank_line */
+	return TRUE;
+
+    if(s.stripWhiteSpace().left(1) == "}") {
+	debug_msg(1, "Project Parser: %s:%d : Leaving block %d", parser.file.latin1(),
+		  parser.line_no, scope_block);
+	test_status = ((scope_flag & (0x01 << scope_block)) ? TestFound : TestSeek);
+	scope_block--;
+	s = s.mid(1).stripWhiteSpace();
+	if(s.isEmpty())
+	    return TRUE;
+    }
+    if(!(scope_flag & (0x01 << scope_block))) {
+	/* adjust scope for each block which appears on a single line */
+	for(int i = (s.contains('{')-s.contains('}')); i>0; i--)
+	    scope_flag &= ~(0x01 << (++scope_block));
+	debug_msg(1, "Project Parser: %s:%d : Ignored due to block being false.",
+		  parser.file.latin1(), parser.line_no);
+	return TRUE;
+    }
+
+    QString scope, var, op;
+    QStringList val;
+#define SKIP_WS(d) while(*d && (*d == ' ' || *d == '\t')) d++
+    const char *d = s.latin1();
+    SKIP_WS(d);
+    bool scope_failed = FALSE, else_line = FALSE, or_op=FALSE;
+    int parens = 0, scope_count=0;
+    while(*d) {
+	if(!parens) {
+	    if(*d == '=')
+		break;
+	    if(*d == '+' || *d == '-' || *d == '*' || *d == '~') {
+		if(*(d+1) == '=') {
+		    break;
+		} else if(*(d+1) == ' ') {
+		    const char *k = d + 1;
+		    SKIP_WS(k);
+		    if(*k == '=') {
+			QString msg;
+			qmake_error_msg(*d + "must be followed immediately by =");
+			return FALSE;
+		    }
+		}
+	    }
+	}
+
+	if ( *d == '(' )
+	    ++parens;
+	else if ( *d == ')' )
+	    --parens;
+
+	if(!parens && (*d == ':' || *d == '{' || *d == ')' || *d == '|')) {
+	    scope_count++;
+	    scope = var.stripWhiteSpace();
+	    if ( *d == ')' )
+		scope += *d; /* need this */
+	    var = "";
+
+	    bool test = scope_failed;
+	    if(scope.lower() == "else") {
+		if(scope_count != 1 || test_status == TestNone) {
+		    qmake_error_msg("Unexpected " + scope + " ('" + s + "')");
+		    return FALSE;
+		}
+		else_line = TRUE;
+		test = (test_status == TestSeek);
+		debug_msg(1, "Project Parser: %s:%d : Else%s %s.", parser.file.latin1(), parser.line_no,
+			  scope == "else" ? "" : QString(" (" + scope + ")").latin1(),
+			  test ? "considered" : "excluded");
+	    } else {
+		QString comp_scope = scope;
+		bool invert_test = (comp_scope.left(1) == "!");
+		if(invert_test)
+		    comp_scope = comp_scope.right(comp_scope.length()-1);
+		int lparen = comp_scope.find('(');
+		if(or_op == scope_failed) {
+		    if(lparen != -1) { /* if there is an lparen in the scope, it IS a function */
+			int rparen = comp_scope.findRev(')');
+			if(rparen == -1) {
+			    QCString error;
+			    error.sprintf("Function missing right paren: %s ('%s')",
+					  comp_scope.latin1(), s.latin1());
+			    qmake_error_msg(error);
+			    return FALSE;
+			}
+			QString func = comp_scope.left(lparen);
+			test = doProjectTest(func, comp_scope.mid(lparen+1, rparen - lparen - 1), place);
+			if ( *d == ')' && !*(d+1) ) {
+			    if(invert_test)
+				test = !test;
+			    test_status = (test ? TestFound : TestSeek);
+			    return TRUE;  /* assume we are done */
+			}
+		    } else {
+			test = isActiveConfig(comp_scope.stripWhiteSpace(), TRUE, &place);
+		    }
+		    if(invert_test)
+			test = !test;
+		}
+	    }
+	    if(!test && !scope_failed)
+		debug_msg(1, "Project Parser: %s:%d : Test (%s) failed.", parser.file.latin1(),
+			  parser.line_no, scope.latin1());
+	    if(test == or_op)
+		scope_failed = !test;
+	    or_op = (*d == '|');
+	    if(*d == '{') { /* scoping block */
+		if(!scope_failed)
+		    scope_flag |= (0x01 << (++scope_block));
+		else
+		    scope_flag &= ~(0x01 << (++scope_block));
+		debug_msg(1, "Project Parser: %s:%d : Entering block %d (%d).", parser.file.latin1(),
+			  parser.line_no, scope_block, !scope_failed);
+	    }
+	} else if(!parens && *d == '}') {
+	    if(!scope_block) {
+		warn_msg(WarnParser, "Possible braces mismatch %s:%d", parser.file.latin1(), parser.line_no);
+	    } else {
+		debug_msg(1, "Project Parser: %s:%d : Leaving block %d", parser.file.latin1(),
+			  parser.line_no, scope_block);
+		--scope_block;
+	    }
+	} else {
+	    var += *d;
+	}
+	d++;
+    }
+    var = var.stripWhiteSpace();
+    if(!scope_count || (scope_count == 1 && else_line))
+	test_status = TestNone;
+    else if(!else_line || test_status != TestFound)
+	test_status = (scope_failed ? TestSeek : TestFound);
+    if(!*d) {
+	if(!var.stripWhiteSpace().isEmpty())
+	    qmake_error_msg("Parse Error ('" + s + "')");
+	return var.isEmpty(); /* allow just a scope */
+    }
+
+    SKIP_WS(d);
+    for( ; *d && op.find('=') == -1; op += *(d++))
+	;
+    op.replace(QRegExp("\\s"), "");
+
+    SKIP_WS(d);
+    QString vals(d); /* vals now contains the space separated list of values */
+    int rbraces = vals.contains('}'), lbraces = vals.contains('{');
+    if(scope_block && rbraces - lbraces == 1) {
+	debug_msg(1, "Project Parser: %s:%d : Leaving block %d", parser.file.latin1(),
+		  parser.line_no, scope_block);
+	test_status = ((scope_flag & (0x01 << scope_block)) ? TestFound : TestSeek);
+	scope_block--;
+	vals.truncate(vals.length()-1);
+    } else if(rbraces != lbraces) {
+	warn_msg(WarnParser, "Possible braces mismatch {%s} %s:%d",
+		 vals.latin1(), parser.file.latin1(), parser.line_no);
+    }
+    doVariableReplace(vals, place);
+    if(scope_failed)
+	return TRUE; /* oh well */
+#undef SKIP_WS
+
+    if(!var.isEmpty() && Option::mkfile::do_preprocess) {
+	static QString last_file("*none*");
+	if(parser.file != last_file) {
+	    fprintf(stdout, "#file %s:%d\n", parser.file.latin1(), parser.line_no);
+	    last_file = parser.file;
+	}
+	fprintf(stdout, "%s %s %s\n", var.latin1(), op.latin1(), vals.latin1());
+    }
+    var = varMap(var); //backwards compatability
+
+    /* vallist is the broken up list of values */
+    QStringList vallist = split_value_list(vals, (var == "DEPENDPATH" || var == "INCLUDEPATH"));
+    if(!vallist.grep("=").isEmpty())
+	warn_msg(WarnParser, "Detected possible line continuation: {%s} %s:%d",
+		 var.latin1(), parser.file.latin1(), parser.line_no);
+
+    QStringList &varlist = place[var]; /* varlist is the list in the symbol table */
+    debug_msg(1, "Project Parser: %s:%d :%s: :%s: (%s)", parser.file.latin1(), parser.line_no,
+	var.latin1(), op.latin1(), vallist.isEmpty() ? "" : vallist.join(" :: ").latin1());
+
+    /* now do the operation */
+    if(op == "~=") {
+	if(vallist.count() != 1) {
+	    qmake_error_msg("~= operator only accepts one right hand paramater ('" +
+		s + "')");
+	    return FALSE;
+	}
+	QString val(vallist.first());
+	if(val.length() < 4 || val.at(0) != 's') {
+	    qmake_error_msg("~= operator only can handle s/// function ('" +
+		s + "')");
+	    return FALSE;
+	}
+	QChar sep = val.at(1);
+	QStringList func = QStringList::split(sep, val, TRUE);
+	if(func.count() < 3 || func.count() > 4) {
+	    qmake_error_msg("~= operator only can handle s/// function ('" +
+		s + "')");
+	    return FALSE;
+	}
+	bool global = FALSE, case_sense = TRUE;
+	if(func.count() == 4) {
+	    global = func[3].find('g') != -1;
+	    case_sense = func[3].find('i') == -1;
+	}
+	QRegExp regexp(func[1], case_sense);
+	for(QStringList::Iterator varit = varlist.begin();
+	    varit != varlist.end(); ++varit) {
+	    if((*varit).contains(regexp)) {
+		(*varit) = (*varit).replace(regexp, func[2]);
+		if(!global)
+		    break;
+	    }
+	}
+    } else {
+	if(op == "=") {
+	    if(!varlist.isEmpty())
+		warn_msg(WarnParser, "Operator=(%s) clears variables previously set: %s:%d",
+			 var.latin1(), parser.file.latin1(), parser.line_no);
+	    varlist.clear();
+	}
+	for(QStringList::Iterator valit = vallist.begin();
+	    valit != vallist.end(); ++valit) {
+	    if((*valit).isEmpty())
+		continue;
+	    if((op == "*=" && !(*varlist.find((*valit)))) ||
+	       op == "=" || op == "+=")
+		varlist.append((*valit));
+	    else if(op == "-=")
+		varlist.remove((*valit));
+	}
+    }
+    if(var == "REQUIRES") /* special case to get communicated to backends! */
+	doProjectCheckReqs(vallist, place);
+
+    return TRUE;
+}
+
+bool
+QMakeProject::read(const QString &file, QMap<QString, QStringList> &place)
+{
+    parser_info pi = parser;
+    reset();
+
+    QString filename = Option::fixPathToLocalOS(file);
+    doVariableReplace(filename, place);
+    bool ret = FALSE, using_stdin = FALSE;
+    QFile qfile;
+    if(!strcmp(filename, "-")) {
+	qfile.setName("");
+	ret = qfile.open(IO_ReadOnly, stdin);
+	using_stdin = TRUE;
+    } else {
+	qfile.setName(filename);
+	ret = qfile.open(IO_ReadOnly);
+    }
+    if ( ret ) {
+	QTextStream t( &qfile );
+	QString s, line;
+	parser.file = filename;
+	parser.line_no = 0;
+	while ( !t.eof() ) {
+	    parser.line_no++;
+	    line = t.readLine().stripWhiteSpace();
+	    int prelen = line.length();
+
+	    int hash_mark = line.find("#");
+	    if(hash_mark != -1) //good bye comments
+		line = line.left(hash_mark);
+	    if(!line.isEmpty() && line.right(1) == "\\") {
+		if (!line.startsWith("#")) {
+		    line.truncate(line.length() - 1);
+		    s += line + " ";
+		}
+	    } else if(!line.isEmpty() || (line.isEmpty() && !prelen)) {
+		if(s.isEmpty() && line.isEmpty())
+		    continue;
+		if(!line.isEmpty())
+		    s += line;
+		if(!s.isEmpty()) {
+		    if(!(ret = parse(s, place)))
+			break;
+		    s = "";
+		}
+	    }
+	}
+	if(!using_stdin)
+	    qfile.close();
+    }
+    parser = pi;
+    if(scope_block != 0)
+	warn_msg(WarnParser, "%s: Unterminated conditional at end of file.",
+		 file.latin1());
+    return ret;
+}
+
+bool
+QMakeProject::read(const QString &project, const QString &, uchar cmd)
+{
+    pfile = project;
+    return read(cmd);
+}
+
+bool
+QMakeProject::read(uchar cmd)
+{
+    if(cfile.isEmpty()) {
+	// hack to get the Option stuff in there
+	base_vars["QMAKE_EXT_CPP"] = Option::cpp_ext;
+	base_vars["QMAKE_EXT_H"] = Option::h_ext;
+	if(!Option::user_template_prefix.isEmpty())
+	    base_vars["TEMPLATE_PREFIX"] = Option::user_template_prefix;
+
+	if(cmd & ReadCache && Option::mkfile::do_cache) {	/* parse the cache */
+	    if(Option::mkfile::cachefile.isEmpty())  { //find it as it has not been specified
+		QString dir = QDir::convertSeparators(Option::output_dir);
+		while(!QFile::exists((Option::mkfile::cachefile = dir +
+				      QDir::separator() + ".qmake.cache"))) {
+		    dir = dir.left(dir.findRev(QDir::separator()));
+		    if(dir.isEmpty() || dir.find(QDir::separator()) == -1) {
+			Option::mkfile::cachefile = "";
+			break;
+		    }
+		    if(Option::mkfile::cachefile_depth == -1)
+			Option::mkfile::cachefile_depth = 1;
+		    else
+			Option::mkfile::cachefile_depth++;
+		}
+	    }
+	    if(!Option::mkfile::cachefile.isEmpty()) {
+		read(Option::mkfile::cachefile, cache);
+		if(Option::mkfile::qmakespec.isEmpty() && !cache["QMAKESPEC"].isEmpty())
+		    Option::mkfile::qmakespec = cache["QMAKESPEC"].first();
+	    }
+	}
+	if(cmd & ReadConf) { 	    /* parse mkspec */
+	    QStringList mkspec_roots = qmake_mkspec_paths();
+	    if(Option::mkfile::qmakespec.isEmpty()) {
+		for(QStringList::Iterator it = mkspec_roots.begin(); it != mkspec_roots.end(); ++it) {
+		    QString mkspec = (*it) + QDir::separator() + "default";
+                    QFileInfo default_info(mkspec);
+                    if(default_info.exists() && default_info.isSymLink()) {
+			Option::mkfile::qmakespec = mkspec;
+			break;
+		    }
+		}
+		if(Option::mkfile::qmakespec.isEmpty()) {
+		    fprintf(stderr, "QMAKESPEC has not been set, so configuration cannot be deduced.\n");
+		    return FALSE;
+		}
+	    }
+
+	    if(QDir::isRelativePath(Option::mkfile::qmakespec)) {
+		bool found_mkspec = FALSE;
+		for(QStringList::Iterator it = mkspec_roots.begin(); it != mkspec_roots.end(); ++it) {
+		    QString mkspec = (*it) + QDir::separator() + Option::mkfile::qmakespec;
+		    if(QFile::exists(mkspec)) {
+			found_mkspec = TRUE;
+			Option::mkfile::qmakespec = mkspec;
+			break;
+		    }
+		}
+		if(!found_mkspec) {
+		    fprintf(stderr, "Could not find mkspecs for your QMAKESPEC after trying:\n\t%s\n",
+			    mkspec_roots.join("\n\t").latin1());
+		    return FALSE;
+		}
+	    }
+
+	    /* parse qmake configuration */
+	    while(Option::mkfile::qmakespec.endsWith(QString(QChar(QDir::separator()))))
+		Option::mkfile::qmakespec.truncate(Option::mkfile::qmakespec.length()-1);
+	    QString spec = Option::mkfile::qmakespec + QDir::separator() + "qmake.conf";
+	    if(!QFile::exists(spec) &&
+	       QFile::exists(Option::mkfile::qmakespec + QDir::separator() + "tmake.conf"))
+		spec = Option::mkfile::qmakespec + QDir::separator() + "tmake.conf";
+	    debug_msg(1, "QMAKESPEC conf: reading %s", spec.latin1());
+	    if(!read(spec, base_vars)) {
+		fprintf(stderr, "Failure to read QMAKESPEC conf file %s.\n", spec.latin1());
+		return FALSE;
+	    }
+	    if(Option::mkfile::do_cache && !Option::mkfile::cachefile.isEmpty()) {
+		debug_msg(1, "QMAKECACHE file: reading %s", Option::mkfile::cachefile.latin1());
+		read(Option::mkfile::cachefile, base_vars);
+	    }
+	}
+	if(cmd & ReadCmdLine) {
+	    /* commandline */
+	    cfile = pfile;
+	    parser.line_no = 1; //really arg count now.. duh
+	    parser.file = "(internal)";
+	    reset();
+	    for(QStringList::Iterator it = Option::before_user_vars.begin();
+		it != Option::before_user_vars.end(); ++it) {
+		if(!parse((*it), base_vars)) {
+		    fprintf(stderr, "Argument failed to parse: %s\n", (*it).latin1());
+		    return FALSE;
+		}
+		parser.line_no++;
+	    }
+	}
+    }
+
+    vars = base_vars; /* start with the base */
+
+    if(cmd & ReadProFile) { /* parse project file */
+	debug_msg(1, "Project file: reading %s", pfile.latin1());
+	if(pfile != "-" && !QFile::exists(pfile) && !pfile.endsWith(".pro"))
+	    pfile += ".pro";
+	if(!read(pfile, vars))
+	    return FALSE;
+    }
+
+    if(cmd & ReadPostFiles) { /* parse post files */
+	const QStringList l = vars["QMAKE_POST_INCLUDE_FILES"];
+	for(QStringList::ConstIterator it = l.begin(); it != l.end(); ++it)
+	    read((*it), vars);
+    }
+
+    if(cmd & ReadCmdLine) {
+	parser.line_no = 1; //really arg count now.. duh
+	parser.file = "(internal)";
+	reset();
+	for(QStringList::Iterator it = Option::after_user_vars.begin();
+	    it != Option::after_user_vars.end(); ++it) {
+	    if(!parse((*it), vars)) {
+		fprintf(stderr, "Argument failed to parse: %s\n", (*it).latin1());
+		return FALSE;
+	    }
+	    parser.line_no++;
+	}
+    }
+
+    /* now let the user override the template from an option.. */
+    if(!Option::user_template.isEmpty()) {
+	debug_msg(1, "Overriding TEMPLATE (%s) with: %s", vars["TEMPLATE"].first().latin1(),
+		  Option::user_template.latin1());
+	vars["TEMPLATE"].clear();
+	vars["TEMPLATE"].append(Option::user_template);
+    }
+
+    QStringList &templ = vars["TEMPLATE"];
+    if(templ.isEmpty())
+	templ.append(QString("app"));
+    else if(vars["TEMPLATE"].first().endsWith(".t"))
+	templ = QStringList(templ.first().left(templ.first().length() - 2));
+    if ( !Option::user_template_prefix.isEmpty() )
+	templ.first().prepend(Option::user_template_prefix);
+
+    if(vars["TARGET"].isEmpty()) {
+	// ### why not simply use:
+	// QFileInfo fi(pfile);
+	// fi.baseName();
+	QString tmp = pfile;
+	if(tmp.findRev('/') != -1)
+	    tmp = tmp.right( tmp.length() - tmp.findRev('/') - 1 );
+	if(tmp.findRev('.') != -1)
+	    tmp = tmp.left(tmp.findRev('.'));
+	vars["TARGET"].append(tmp);
+    }
+
+    QString test_version = getenv("QTESTVERSION");
+    if (!test_version.isEmpty()) {
+	QString s = vars["TARGET"].first();
+	if (s == "qt" || s == "qt-mt" || s == "qte" || s == "qte-mt") {
+	    QString &ver = vars["VERSION"].first();
+//	    fprintf(stderr,"Current QT version number: " + ver + "\n");
+	    if (ver != "" && ver != test_version) {
+		ver = test_version;
+		fprintf(stderr,"Changed QT version number to " + test_version + "!\n");
+	    }
+	}
+    }
+    return TRUE;
+}
+
+bool
+QMakeProject::isActiveConfig(const QString &x, bool regex, QMap<QString, QStringList> *place)
+{
+    if(x.isEmpty())
+	return TRUE;
+
+    if((Option::target_mode == Option::TARG_MACX_MODE || Option::target_mode == Option::TARG_QNX6_MODE ||
+	Option::target_mode == Option::TARG_UNIX_MODE) && x == "unix")
+	return TRUE;
+    else if(Option::target_mode == Option::TARG_MACX_MODE && x == "macx")
+	return TRUE;
+    else if(Option::target_mode == Option::TARG_QNX6_MODE && x == "qnx6")
+	return TRUE;
+    else if(Option::target_mode == Option::TARG_MAC9_MODE && x == "mac9")
+	return TRUE;
+    else if((Option::target_mode == Option::TARG_MAC9_MODE || Option::target_mode == Option::TARG_MACX_MODE) &&
+	    x == "mac")
+	return TRUE;
+    else if(Option::target_mode == Option::TARG_WIN_MODE && x == "win32")
+	return TRUE;
+
+
+    QRegExp re(x, FALSE, TRUE);
+    QString spec = Option::mkfile::qmakespec.right(Option::mkfile::qmakespec.length() -
+						   (Option::mkfile::qmakespec.findRev(QDir::separator())+1));
+    if((regex && re.exactMatch(spec)) || (!regex && spec == x))
+	return TRUE;
+#ifdef Q_OS_UNIX
+    else if(spec == "default") {
+	static char *buffer = NULL;
+	if(!buffer)
+	    buffer = (char *)malloc(1024);
+	int l = readlink(Option::mkfile::qmakespec, buffer, 1024);
+	if(l != -1) {
+	    buffer[l] = '\0';
+	    QString r = buffer;
+	    if(r.findRev('/') != -1)
+		r = r.mid(r.findRev('/') + 1);
+	    if((regex && re.exactMatch(r)) || (!regex && r == x))
+		return TRUE;
+	}
+    }
+#endif
+
+
+    QStringList &configs = (place ? (*place)["CONFIG"] : vars["CONFIG"]);
+    for(QStringList::Iterator it = configs.begin(); it != configs.end(); ++it) {
+	if((regex && re.exactMatch((*it))) || (!regex && (*it) == x))
+	if(re.exactMatch((*it)))
+	    return TRUE;
+    }
+    return FALSE;
+}
+
+bool
+QMakeProject::doProjectTest(const QString& func, const QString &params, QMap<QString, QStringList> &place)
+{
+    QStringList args = split_arg_list(params);
+    for(QStringList::Iterator arit = args.begin(); arit != args.end(); ++arit) {
+	QString tmp = (*arit).stripWhiteSpace();
+	if((tmp[0] == '\'' || tmp[0] == '"') && tmp.right(1) == tmp.left(1))
+	    tmp = tmp.mid(1, tmp.length() - 2);
+    }
+    return doProjectTest(func.stripWhiteSpace(), args, place);
+}
+
+bool
+QMakeProject::doProjectTest(const QString& func, QStringList args, QMap<QString, QStringList> &place)
+{
+    for(QStringList::Iterator arit = args.begin(); arit != args.end(); ++arit) {
+	(*arit) = (*arit).stripWhiteSpace(); // blah, get rid of space
+	doVariableReplace((*arit), place);
+    }
+    debug_msg(1, "Running project test: %s( %s )", func.latin1(), args.join("::").latin1());
+
+    if(func == "requires") {
+	return doProjectCheckReqs(args, place);
+    } else if(func == "equals") {
+	if(args.count() != 2) {
+	    fprintf(stderr, "%s:%d: equals(variable, value) requires two arguments.\n", parser.file.latin1(),
+		    parser.line_no);
+	    return FALSE;
+	}
+	QString value = args[1];
+	if((value.left(1) == "\"" || value.left(1) == "'") && value.right(1) == value.left(1))
+	    value = value.mid(1, value.length()-2);
+	return vars[args[0]].join(" ") == value;
+    } else if(func == "exists") {
+	if(args.count() != 1) {
+	    fprintf(stderr, "%s:%d: exists(file) requires one argument.\n", parser.file.latin1(),
+		    parser.line_no);
+	    return FALSE;
+	}
+	QString file = args.first();
+	file = Option::fixPathToLocalOS(file);
+	doVariableReplace(file, place);
+
+	if(QFile::exists(file))
+	    return TRUE;
+	//regular expression I guess
+	QString dirstr = QDir::currentDirPath();
+	int slsh = file.findRev(Option::dir_sep);
+	if(slsh != -1) {
+	    dirstr = file.left(slsh+1);
+	    file = file.right(file.length() - slsh - 1);
+	}
+	QDir dir(dirstr, file);
+	return dir.count() != 0;
+    } else if(func == "system") {
+	if(args.count() != 1) {
+	    fprintf(stderr, "%s:%d: system(exec) requires one argument.\n", parser.file.latin1(),
+		    parser.line_no);
+	    return FALSE;
+	}
+	return system(args.first().latin1()) == 0;
+    } else if(func == "contains") {
+	if(args.count() != 2) {
+	    fprintf(stderr, "%s:%d: contains(var, val) requires two arguments.\n", parser.file.latin1(),
+		    parser.line_no);
+	    return FALSE;
+	}
+	QRegExp regx(args[1]);
+	QStringList &l = place[args[0]];
+	for(QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
+	    if(regx.exactMatch((*it)))
+		return TRUE;
+	}
+	return FALSE;
+    } else if(func == "infile") {
+	if(args.count() < 2 || args.count() > 3) {
+	    fprintf(stderr, "%s:%d: infile(file, var, val) requires at least 2 arguments.\n",
+		    parser.file.latin1(), parser.line_no);
+	    return FALSE;
+	}
+	QMakeProject proj;
+	QString file = args[0];
+	doVariableReplace(file, place);
+	fixEnvVariables(file);
+	int di = file.findRev(Option::dir_sep);
+	QDir sunworkshop42workaround = QDir::current();
+	QString oldpwd = sunworkshop42workaround.currentDirPath();
+	if(di != -1) {
+	    if(!QDir::setCurrent(file.left(file.findRev(Option::dir_sep)))) {
+		fprintf(stderr, "Cannot find directory: %s\n", file.left(di).latin1());
+		return FALSE;
+	    }
+	    file = file.right(file.length() - di - 1);
+	}
+	parser_info pi = parser;
+	bool ret = !proj.read(file, oldpwd);
+	parser = pi;
+	if(ret) {
+	    fprintf(stderr, "Error processing project file: %s\n", file.latin1());
+	    QDir::setCurrent(oldpwd);
+	    return FALSE;
+	}
+	if(args.count() == 2) {
+	    ret = !proj.isEmpty(args[1]);
+	} else {
+	    QRegExp regx(args[2]);
+	    QStringList &l = proj.values(args[1]);
+	    for(QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
+		if(regx.exactMatch((*it))) {
+		    ret = TRUE;
+		    break;
+		}
+	    }
+	}
+	QDir::setCurrent(oldpwd);
+	return ret;
+    } else if(func == "count") {
+	if(args.count() != 2) {
+	    fprintf(stderr, "%s:%d: count(var, count) requires two arguments.\n", parser.file.latin1(),
+		    parser.line_no);
+	    return FALSE;
+	}
+	return vars[args[0]].count() == args[1].toUInt();
+    } else if(func == "isEmpty") {
+	if(args.count() != 1) {
+	    fprintf(stderr, "%s:%d: isEmpty(var) requires one argument.\n", parser.file.latin1(),
+		    parser.line_no);
+	    return FALSE;
+	}
+	return vars[args[0]].isEmpty();
+    } else if(func == "include" || func == "load") {
+	QString seek_var;
+	if(args.count() == 2 && func == "include") {
+	    seek_var = args[1];
+	} else if(args.count() != 1) {
+	    QString func_desc = "include(file)";
+	    if(func == "load")
+		func_desc = "load(feature)";
+	    fprintf(stderr, "%s:%d: %s requires one argument.\n", parser.file.latin1(),
+		    parser.line_no, func_desc.latin1());
+	    return FALSE;
+	}
+
+	QString file = args.first();
+	file = Option::fixPathToLocalOS(file);
+	file.replace("\"", "");
+	doVariableReplace(file, place);
+	if(func == "load") {
+	    if(!file.endsWith(Option::prf_ext))
+		file += Option::prf_ext;
+	    if(file.find(Option::dir_sep) == -1 || !QFile::exists(file)) {
+		bool found = FALSE;
+		const QString concat = QDir::separator() + QString("mkspecs") +
+				       QDir::separator() + QString("features");
+		QStringList feature_roots;
+		if(const char *mkspec_path = getenv("QMAKEFEATURES")) {
+#ifdef Q_OS_WIN
+		    QStringList lst = QStringList::split(';', mkspec_path);
+		    for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it)
+			feature_roots += QStringList::split(':', (*it));
+#else
+		    feature_roots += QStringList::split(':', mkspec_path);
+#endif
+		}
+		if(const char *qmakepath = getenv("QMAKEPATH")) {
+#ifdef Q_OS_WIN
+		    QStringList lst = QStringList::split(';', qmakepath);
+		    for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it) {
+			QStringList lst2 = QStringList::split(':', (*it));
+			for(QStringList::Iterator it2 = lst2.begin(); it2 != lst2.end(); ++it2)
+			    feature_roots << ((*it2) + concat);
+		    }
+#else
+		    QStringList lst = QStringList::split(':', qmakepath);
+		    for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it)
+			feature_roots << ((*it) + concat);
+#endif
+		}
+		feature_roots << Option::mkfile::qmakespec;
+		if(const char *qtdir = getenv("QTDIR"))
+		    feature_roots << (qtdir + concat);
+#ifdef QT_INSTALL_PREFIX
+		feature_roots << (QT_INSTALL_PREFIX + concat);
+#endif
+#if defined(HAVE_QCONFIG_CPP)
+		feature_roots << (qInstallPath() + concat);
+#endif
+#ifdef QT_INSTALL_DATA
+		feature_roots << (QT_INSTALL_DATA + concat);
+#endif
+#if defined(HAVE_QCONFIG_CPP)
+		feature_roots << (qInstallPathData() + concat);
+#endif
+		for(QStringList::Iterator it = feature_roots.begin(); it != feature_roots.end(); ++it) {
+		    QString prf = (*it) + QDir::separator() + file;
+		    if(QFile::exists(prf)) {
+			found = TRUE;
+			file = prf;
+			break;
+		    }
+		}
+		if(!found) {
+		    printf("Project LOAD(): Feature %s cannot be found.\n", args.first().latin1());
+		    exit(3);
+		}
+	    }
+	}
+	if(QDir::isRelativePath(file)) {
+	    QStringList include_roots;
+	    include_roots << Option::output_dir;
+	    QString pfilewd = QFileInfo(parser.file).dirPath();
+	    if(!pfilewd.isEmpty() && pfilewd != QDir::currentDirPath() && pfilewd != ".")
+		include_roots << pfilewd;
+	    if(Option::output_dir != QDir::currentDirPath())
+		include_roots << QDir::currentDirPath();
+	    for(QStringList::Iterator it = include_roots.begin(); it != include_roots.end(); ++it) {
+		if(QFile::exists((*it) + QDir::separator() + file)) {
+		    file = (*it) + QDir::separator() + file;
+		    break;
+		}
+	    }
+	}
+
+	if(Option::mkfile::do_preprocess) //nice to see this first..
+	    fprintf(stderr, "#switching file %s(%s) - %s:%d\n", func.latin1(), file.latin1(),
+		    parser.file.latin1(), parser.line_no);
+	debug_msg(1, "Project Parser: %s'ing file %s.", func.latin1(), file.latin1());
+	QString orig_file = file;
+	int di = file.findRev(Option::dir_sep);
+	QDir sunworkshop42workaround = QDir::current();
+	QString oldpwd = sunworkshop42workaround.currentDirPath();
+	if(di != -1) {
+	    if(!QDir::setCurrent(file.left(file.findRev(Option::dir_sep)))) {
+		fprintf(stderr, "Cannot find directory: %s\n", file.left(di).latin1());
+		return FALSE;
+	    }
+	    file = file.right(file.length() - di - 1);
+	}
+	parser_info pi = parser;
+	int sb = scope_block;
+	int sf = scope_flag;
+	TestStatus sc = test_status;
+	bool r = FALSE;
+	if(!seek_var.isNull()) {
+	    QMap<QString, QStringList> tmp;
+	    if((r = read(file.latin1(), tmp)))
+		place[seek_var] += tmp[seek_var];
+	} else {
+	    r = read(file.latin1(), place);
+	}
+	if(r)
+	    vars["QMAKE_INTERNAL_INCLUDED_FILES"].append(orig_file);
+	else
+	    warn_msg(WarnParser, "%s:%d: Failure to include file %s.",
+		     pi.file.latin1(), pi.line_no, orig_file.latin1());
+	parser = pi;
+	test_status = sc;
+	scope_flag = sf;
+	scope_block = sb;
+	QDir::setCurrent(oldpwd);
+	return r;
+    } else if(func == "error" || func == "message") {
+	if(args.count() != 1) {
+	    fprintf(stderr, "%s:%d: %s(message) requires one argument.\n", parser.file.latin1(),
+		    parser.line_no, func.latin1());
+	    return FALSE;
+	}
+	QString msg = args.first();
+	if((msg.startsWith("\"") || msg.startsWith("'")) && msg.endsWith(msg.left(1)))
+	    msg = msg.mid(1, msg.length()-2);
+	msg.replace(QString("${QMAKE_FILE}"), parser.file.latin1());
+	msg.replace(QString("${QMAKE_LINE_NUMBER}"), QString::number(parser.line_no));
+	msg.replace(QString("${QMAKE_DATE}"), QDateTime::currentDateTime().toString());
+	doVariableReplace(msg, place);
+	fixEnvVariables(msg);
+	fprintf(stderr, "Project %s: %s\n", func.upper().latin1(), msg.latin1());
+	if(func == "message")
+	    return TRUE;
+	exit(2);
+    } else {
+	fprintf(stderr, "%s:%d: Unknown test function: %s\n", parser.file.latin1(), parser.line_no,
+		func.latin1());
+    }
+    return FALSE;
+}
+
+bool
+QMakeProject::doProjectCheckReqs(const QStringList &deps, QMap<QString, QStringList> &place)
+{
+    bool ret = FALSE;
+    for(QStringList::ConstIterator it = deps.begin(); it != deps.end(); ++it) {
+	QString chk = (*it);
+	if(chk.isEmpty())
+	    continue;
+	bool invert_test = (chk.left(1) == "!");
+	if(invert_test)
+	    chk = chk.right(chk.length() - 1);
+
+	bool test;
+	int lparen = chk.find('(');
+	if(lparen != -1) { /* if there is an lparen in the chk, it IS a function */
+	    int rparen = chk.findRev(')');
+	    if(rparen == -1) {
+		QCString error;
+		error.sprintf("Function (in REQUIRES) missing right paren: %s", chk.latin1());
+		qmake_error_msg(error);
+	    } else {
+		QString func = chk.left(lparen);
+		test = doProjectTest(func, chk.mid(lparen+1, rparen - lparen - 1), place);
+	    }
+	} else {
+	    test = isActiveConfig(chk, TRUE, &place);
+	}
+	if(invert_test) {
+	    chk.prepend("!");
+	    test = !test;
+	}
+	if(!test) {
+	    debug_msg(1, "Project Parser: %s:%d Failed test: REQUIRES = %s",
+		      parser.file.latin1(), parser.line_no, chk.latin1());
+	    place["QMAKE_FAILED_REQUIREMENTS"].append(chk);
+	    ret = FALSE;
+	}
+    }
+    return ret;
+}
+
+
+QString
+QMakeProject::doVariableReplace(QString &str, const QMap<QString, QStringList> &place)
+{
+    for(int var_begin, var_last=0; (var_begin = str.find("$$", var_last)) != -1; var_last = var_begin) {
+	if(var_begin >= (int)str.length() + 2) {
+	    break;
+	} else if(var_begin != 0 && str[var_begin-1] == '\\') {
+	    str.replace(var_begin-1, 1, "");
+	    var_begin += 1;
+	    continue;
+	}
+
+	int var_incr = var_begin + 2;
+	bool in_braces = FALSE, as_env = FALSE, as_prop = FALSE;
+	if(str[var_incr] == '{') {
+	    in_braces = TRUE;
+	    var_incr++;
+	    while(var_incr < (int)str.length() &&
+		  (str[var_incr] == ' ' || str[var_incr] == '\t' || str[var_incr] == '\n'))
+		var_incr++;
+	}
+	if(str[var_incr] == '(') {
+	    as_env = TRUE;
+	    var_incr++;
+	} else if(str[var_incr] == '[') {
+	    as_prop = TRUE;
+	    var_incr++;
+	}
+	QString val, args;
+	while(var_incr < (int)str.length() &&
+	      (str[var_incr].isLetter() || str[var_incr].isNumber() || str[var_incr] == '.' || str[var_incr] == '_'))
+	    val += str[var_incr++];
+	if(as_env) {
+	    if(str[var_incr] != ')') {
+		var_incr++;
+		warn_msg(WarnParser, "%s:%d: Unterminated env-variable replacement '%s' (%s)",
+			 parser.file.latin1(), parser.line_no,
+			 str.mid(var_begin, QMAX(var_incr - var_begin,
+						 (int)str.length())).latin1(), str.latin1());
+		var_begin += var_incr;
+		continue;
+	    }
+	    var_incr++;
+	} else if(as_prop) {
+	    if(str[var_incr] != ']') {
+		var_incr++;
+		warn_msg(WarnParser, "%s:%d: Unterminated prop-variable replacement '%s' (%s)",
+			 parser.file.latin1(), parser.line_no,
+			 str.mid(var_begin, QMAX(var_incr - var_begin, int(str.length()))).latin1(), str.latin1());
+		var_begin += var_incr;
+		continue;
+	    }
+	    var_incr++;
+	} else if(str[var_incr] == '(') { //args
+	    for(int parens = 0; var_incr < (int)str.length(); var_incr++) {
+		if(str[var_incr] == '(') {
+		    parens++;
+		    if(parens == 1)
+			continue;
+		} else if(str[var_incr] == ')') {
+		    parens--;
+		    if(!parens) {
+			var_incr++;
+			break;
+		    }
+		}
+		args += str[var_incr];
+	    }
+	}
+	if(var_incr > (int)str.length() || (in_braces && str[var_incr] != '}')) {
+	    var_incr++;
+	    warn_msg(WarnParser, "%s:%d: Unterminated variable replacement '%s' (%s)",
+		     parser.file.latin1(), parser.line_no,
+		     str.mid(var_begin, QMAX(var_incr - var_begin,
+					     (int)str.length())).latin1(), str.latin1());
+	    var_begin += var_incr;
+	    continue;
+	} else if(in_braces) {
+	    var_incr++;
+	}
+
+	QString replacement;
+	if(as_env) {
+	    replacement = getenv(val);
+	} else if(as_prop) {
+	    if(prop)
+		replacement = prop->value(val);
+	} else if(args.isEmpty()) {
+	    if(val.left(1) == ".")
+		replacement = "";
+	    else if(val == "LITERAL_WHITESPACE")
+		replacement = "\t";
+	    else if(val == "LITERAL_DOLLAR")
+		replacement = "$";
+	    else if(val == "LITERAL_HASH")
+		replacement = "#";
+	    else if(val == "PWD")
+		replacement = QDir::currentDirPath();
+	    else if(val == "DIR_SEPARATOR")
+		replacement = Option::dir_sep;
+	    else
+		replacement = place[varMap(val)].join(" ");
+	} else {
+	    QStringList arg_list = split_arg_list(doVariableReplace(args, place));
+	    debug_msg(1, "Running function: %s( %s )", val.latin1(), arg_list.join("::").latin1());
+	    if(val.lower() == "member") {
+		if(arg_list.count() < 1 || arg_list.count() > 3) {
+		    fprintf(stderr, "%s:%d: member(var, start, end) requires three arguments.\n",
+			    parser.file.latin1(), parser.line_no);
+		} else {
+		    const QStringList &var = place[varMap(arg_list.first())];
+		    int start = 0;
+		    if(arg_list.count() >= 2)
+			start = arg_list[1].toInt();
+		    if(start < 0)
+			start += int(var.count());
+		    int end = start;
+		    if(arg_list.count() == 3)
+			end = arg_list[2].toInt();
+		    if(end < 0)
+			end += int(var.count());
+		    if(end < start)
+			end = start;
+		    for(int i = start; i <= end && (int)var.count() >= i; i++) {
+			if(!replacement.isEmpty())
+			    replacement += " ";
+			replacement += var[i];
+		    }
+		}
+	    } else if(val.lower() == "fromfile") {
+		if(arg_list.count() != 2) {
+		    fprintf(stderr, "%s:%d: fromfile(file, variable) requires two arguments.\n",
+			    parser.file.latin1(), parser.line_no);
+		} else {
+		    QString file = arg_list[0];
+		    file = Option::fixPathToLocalOS(file);
+		    file.replace("\"", "");
+
+		    if(QDir::isRelativePath(file)) {
+			QStringList include_roots;
+			include_roots << Option::output_dir;
+			QString pfilewd = QFileInfo(parser.file).dirPath();
+			if(pfilewd.isEmpty())
+			    include_roots << pfilewd;
+			if(Option::output_dir != QDir::currentDirPath())
+			    include_roots << QDir::currentDirPath();
+			for(QStringList::Iterator it = include_roots.begin(); it != include_roots.end(); ++it) {
+			    if(QFile::exists((*it) + QDir::separator() + file)) {
+				file = (*it) + QDir::separator() + file;
+				break;
+			    }
+			}
+		    }
+		    QString orig_file = file;
+		    int di = file.findRev(Option::dir_sep);
+		    QDir sunworkshop42workaround = QDir::current();
+		    QString oldpwd = sunworkshop42workaround.currentDirPath();
+		    if(di != -1 && QDir::setCurrent(file.left(file.findRev(Option::dir_sep))))
+			file = file.right(file.length() - di - 1);
+		    parser_info pi = parser;
+		    int sb = scope_block;
+		    int sf = scope_flag;
+		    TestStatus sc = test_status;
+		    QMap<QString, QStringList> tmp;
+		    bool r = read(file.latin1(), tmp);
+		    if(r) {
+			replacement = tmp[arg_list[1]].join(" ");
+			vars["QMAKE_INTERNAL_INCLUDED_FILES"].append(orig_file);
+		    } else {
+			warn_msg(WarnParser, "%s:%d: Failure to include file %s.",
+				 pi.file.latin1(), pi.line_no, orig_file.latin1());
+		    }
+		    parser = pi;
+		    test_status = sc;
+		    scope_flag = sf;
+		    scope_block = sb;
+		    QDir::setCurrent(oldpwd);
+		}
+	    } else if(val.lower() == "eval") {
+		for(QStringList::ConstIterator arg_it = arg_list.begin();
+		    arg_it != arg_list.end(); ++arg_it) {
+		    if(!replacement.isEmpty())
+			replacement += " ";
+		    replacement += place[(*arg_it)].join(" ");
+		}
+	    } else if(val.lower() == "list") {
+		static int x = 0;
+		replacement.sprintf(".QMAKE_INTERNAL_TMP_VAR_%d", x++);
+		QStringList &lst = (*((QMap<QString, QStringList>*)&place))[replacement];
+		lst.clear();
+		for(QStringList::ConstIterator arg_it = arg_list.begin();
+		    arg_it != arg_list.end(); ++arg_it)
+		    lst += split_value_list((*arg_it));
+	    } else if(val.lower() == "join") {
+		if(arg_list.count() < 1 || arg_list.count() > 4) {
+		    fprintf(stderr, "%s:%d: join(var, glue, before, after) requires four"
+			    "arguments.\n", parser.file.latin1(), parser.line_no);
+		} else {
+		    QString glue, before, after;
+		    if(arg_list.count() >= 2)
+			glue = arg_list[1].replace("\"", "" );
+		    if(arg_list.count() >= 3)
+			before = arg_list[2].replace("\"", "" );
+		    if(arg_list.count() == 4)
+			after = arg_list[3].replace("\"", "" );
+		    const QStringList &var = place[varMap(arg_list.first())];
+		    if(!var.isEmpty())
+			replacement = before + var.join(glue) + after;
+		}
+	    } else if(val.lower() == "split") {
+		if(arg_list.count() < 2 || arg_list.count() > 3) {
+		    fprintf(stderr, "%s:%d split(var, sep, join) requires three arguments\n",
+			    parser.file.latin1(), parser.line_no);
+		} else {
+		    QString sep = arg_list[1], join = " ";
+		    if(arg_list.count() == 3)
+			join = arg_list[2];
+		    QStringList var = place[varMap(arg_list.first())];
+		    for(QStringList::Iterator vit = var.begin(); vit != var.end(); ++vit) {
+			QStringList lst = QStringList::split(sep, (*vit));
+			for(QStringList::Iterator spltit = lst.begin(); spltit != lst.end(); ++spltit) {
+			    if(!replacement.isEmpty())
+				replacement += join;
+			    replacement += (*spltit);
+			}
+		    }
+		}
+	    } else if(val.lower() == "find") {
+		if(arg_list.count() != 2) {
+		    fprintf(stderr, "%s:%d find(var, str) requires two arguments\n",
+			    parser.file.latin1(), parser.line_no);
+		} else {
+		    QRegExp regx(arg_list[1]);
+		    const QStringList &var = place[varMap(arg_list.first())];
+		    for(QStringList::ConstIterator vit = var.begin();
+			vit != var.end(); ++vit) {
+			if(regx.search(*vit) != -1) {
+			    if(!replacement.isEmpty())
+				replacement += " ";
+			    replacement += (*vit);
+			}
+		    }
+		}
+	    } else if(val.lower() == "system") {
+		if(arg_list.count() != 1) {
+		    fprintf(stderr, "%s:%d system(execut) requires one argument\n",
+			    parser.file.latin1(), parser.line_no);
+		} else {
+		    char buff[256];
+		    FILE *proc = QT_POPEN(arg_list.join(" ").latin1(), "r");
+		    while(proc && !feof(proc)) {
+			int read_in = int(fread(buff, 1, 255, proc));
+			if(!read_in)
+			    break;
+			for(int i = 0; i < read_in; i++) {
+			    if(buff[i] == '\n' || buff[i] == '\t')
+				buff[i] = ' ';
+			}
+			buff[read_in] = '\0';
+			replacement += buff;
+		    }
+		}
+	    } else if(val.lower() == "files") {
+		if(arg_list.count() != 1) {
+		    fprintf(stderr, "%s:%d files(pattern) requires one argument\n",
+			    parser.file.latin1(), parser.line_no);
+		} else {
+		    QString dir, regex = arg_list[0];
+		    regex = Option::fixPathToLocalOS(regex);
+		    regex.replace("\"", "");
+		    if(regex.findRev(QDir::separator()) != -1) {
+			dir = regex.left(regex.findRev(QDir::separator()) + 1);
+			regex = regex.right(regex.length() - dir.length());
+		    }
+		    QDir d(dir, regex);
+		    for(int i = 0; i < (int)d.count(); i++) {
+			if(!replacement.isEmpty())
+			    replacement += " ";
+			replacement += dir + d[i];
+		    }
+		}
+	    } else if(val.lower() == "prompt") {
+		if(arg_list.count() != 1) {
+		    fprintf(stderr, "%s:%d prompt(question) requires one argument\n",
+			    parser.file.latin1(), parser.line_no);
+		} else if(projectFile() == "-") {
+		    fprintf(stderr, "%s:%d prompt(question) cannot be used when '-o -' is used.\n",
+			    parser.file.latin1(), parser.line_no);
+		} else {
+		    QString msg = arg_list.first();
+		    if((msg.startsWith("\"") || msg.startsWith("'")) && msg.endsWith(msg.left(1)))
+			msg = msg.mid(1, msg.length()-2);
+		    msg.replace(QString("${QMAKE_FILE}"), parser.file.latin1());
+		    msg.replace(QString("${QMAKE_LINE_NUMBER}"), QString::number(parser.line_no));
+		    msg.replace(QString("${QMAKE_DATE}"), QDateTime::currentDateTime().toString());
+		    doVariableReplace(msg, place);
+		    fixEnvVariables(msg);
+		    if(!msg.endsWith("?"))
+			msg += "?";
+		    fprintf(stderr, "Project %s: %s ", val.upper().latin1(), msg.latin1());
+
+		    QFile qfile;
+		    if(qfile.open(IO_ReadOnly, stdin)) {
+			QTextStream t(&qfile);
+			replacement = t.readLine();
+		    }
+		}
+	    } else {
+		fprintf(stderr, "%s:%d: Unknown replace function: %s\n",
+			parser.file.latin1(), parser.line_no, val.latin1());
+	    }
+	}
+	//actually do replacement now..
+	int mlen = var_incr - var_begin;
+	debug_msg(2, "Project Parser [var replace]: '%s' :: %s -> %s", str.latin1(),
+		  str.mid(var_begin, mlen).latin1(), replacement.latin1());
+	str.replace(var_begin, mlen, replacement);
+	var_begin += replacement.length();
+    }
+    return str;
+}
diff --git a/qmake/project.h b/qmake/project.h
new file mode 100644
index 0000000..23b70c9
--- /dev/null
+++ b/qmake/project.h
@@ -0,0 +1,124 @@
+/****************************************************************************
+**
+** Definition of QMakeProject class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#ifndef __PROJECT_H__
+#define __PROJECT_H__
+
+#include <qstringlist.h>
+#include <qstring.h>
+#include <qmap.h>
+
+class QMakeProperty;
+
+class QMakeProject
+{
+    enum TestStatus { TestNone, TestFound, TestSeek } test_status;
+    int scope_block, scope_flag;
+
+    QString pfile, cfile;
+    QMakeProperty *prop;
+    void reset();
+    QMap<QString, QStringList> vars, base_vars, cache;
+    bool parse(const QString &text, QMap<QString, QStringList> &place);
+    bool doProjectTest(const QString &func, const QString &params, QMap<QString, QStringList> &place);
+    bool doProjectTest(const QString &func, QStringList args, QMap<QString, QStringList> &place);
+    bool doProjectCheckReqs(const QStringList &deps, QMap<QString, QStringList> &place);
+    QString doVariableReplace(QString &str, const QMap<QString, QStringList> &place);
+
+public:
+    QMakeProject();
+    QMakeProject(QMakeProperty *);
+
+    enum { ReadCache=0x01, ReadConf=0x02, ReadCmdLine=0x04, ReadProFile=0x08, ReadPostFiles=0x10, ReadAll=0xFF };
+    bool read(const QString &project, const QString &pwd, uchar cmd=ReadAll);
+    bool read(uchar cmd=ReadAll);
+
+    QString projectFile();
+    QString configFile();
+
+    bool isEmpty(const QString &v);
+    QStringList &values(const QString &v);
+    QString first(const QString &v);
+    QMap<QString, QStringList> &variables();
+    bool isActiveConfig(const QString &x, bool regex=FALSE, QMap<QString, QStringList> *place=NULL);
+
+protected:
+    friend class MakefileGenerator;
+    bool read(const QString &file, QMap<QString, QStringList> &place);
+
+};
+
+inline QString QMakeProject::projectFile()
+{
+#if defined(Q_CC_SUN) && (__SUNPRO_CC == 0x500) || defined(Q_CC_HP)
+    // workaround for Sun WorkShop 5.0 bug fixed in Forte 6
+    if (pfile == "-")
+	return QString("(stdin)");
+    else
+	return pfile;
+#else
+    return pfile == "-" ? QString("(stdin)") : pfile;
+#endif
+}
+
+inline QString QMakeProject::configFile()
+{ return cfile; }
+
+inline bool QMakeProject::isEmpty(const QString &v)
+{ return !vars.contains(v) || vars[v].isEmpty(); }
+
+inline QStringList &QMakeProject::values(const QString &v)
+{ return vars[v]; }
+
+inline QString QMakeProject::first(const QString &v)
+{
+#if defined(Q_CC_SUN) && (__SUNPRO_CC == 0x500) || defined(Q_CC_HP)
+    // workaround for Sun WorkShop 5.0 bug fixed in Forte 6
+    if (isEmpty(v))
+	return QString("");
+    else
+	return vars[v].first();
+#else
+    return isEmpty(v) ? QString("") : vars[v].first();
+#endif
+}
+
+inline QMap<QString, QStringList> &QMakeProject::variables()
+{ return vars; }
+
+#endif /* __PROJECT_H__ */
diff --git a/qmake/property.cpp b/qmake/property.cpp
new file mode 100644
index 0000000..fca4d1f
--- /dev/null
+++ b/qmake/property.cpp
@@ -0,0 +1,189 @@
+/****************************************************************************
+**
+** Implementation of QMakeProperty class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#include "property.h"
+#include "option.h"
+#include <qsettings.h>
+#include <qdir.h>
+#include <qmap.h>
+#include <qstringlist.h>
+#include <stdio.h>
+
+QStringList qmake_mkspec_paths(); //project.cpp
+
+QMakeProperty::QMakeProperty() : sett(NULL)
+{
+}
+
+QMakeProperty::~QMakeProperty()
+{
+    delete sett;;
+    sett = NULL;
+}
+
+
+bool QMakeProperty::initSettings()
+{
+    if(sett)
+	return TRUE;
+    sett = new QSettings;
+    return TRUE;
+}
+
+QString
+QMakeProperty::keyBase(bool version) const
+{
+    QString ret = "/QMake/properties/";
+    if(version)
+	ret += QString(qmake_version()) + "/";
+    return ret;
+}
+
+
+QString
+QMakeProperty::value(QString v, bool just_check)
+{
+    if(v == "QT_INSTALL_PREFIX") {
+#ifdef QT_INSTALL_PREFIX
+	return QT_INSTALL_PREFIX;
+#elif defined(HAVE_QCONFIG_CPP)
+	return qInstallPath();
+#endif
+    } else if(v == "QT_INSTALL_DATA") {
+#ifdef QT_INSTALL_DATA
+	return QT_INSTALL_DATA;
+#elif defined(HAVE_QCONFIG_CPP)
+	return qInstallPathData();
+#endif
+    } else if(v == "QMAKE_MKSPECS") {
+	return qmake_mkspec_paths().join(Option::target_mode == Option::TARG_WIN_MODE ? ";" : ":");
+    } else if(v == "QMAKE_VERSION") {
+	return qmake_version();
+    }
+
+    if(initSettings()) {
+	bool ok;
+	int slash = v.findRev('/');
+	QString ret = sett->readEntry(keyBase(slash == -1) + v, QString::null, &ok);
+	if(!ok) {
+	    QString version = qmake_version();
+	    if(slash != -1) {
+		version = v.left(slash-1);
+		v = v.mid(slash+1);
+	    }
+	    QStringList subs = sett->subkeyList(keyBase(FALSE));
+	    subs.sort();
+	    for(QStringList::Iterator it = subs.fromLast(); it != subs.end(); --it) {
+		if((*it).isEmpty() || (*it) > version)
+		    continue;
+		ret = sett->readEntry(keyBase(FALSE) + (*it) + "/" + v, QString::null, &ok);
+		if(ok) {
+		    if(!just_check)
+			debug_msg(1, "Fell back from %s -> %s for '%s'.", version.latin1(),
+				  (*it).latin1(), v.latin1());
+		    return ret;
+		}
+	    }
+	}
+	return ok ? ret : QString::null;
+    }
+    return QString::null;
+}
+
+bool
+QMakeProperty::hasValue(QString v)
+{
+    if(initSettings())
+	return !value(v, TRUE).isNull();
+    return FALSE;
+}
+
+void
+QMakeProperty::setValue(QString var, const QString &val)
+{
+    if(initSettings())
+	sett->writeEntry(keyBase() + var, val);
+}
+
+bool
+QMakeProperty::exec()
+{
+    bool ret = TRUE;
+    if(Option::qmake_mode == Option::QMAKE_QUERY_PROPERTY) {
+	if(Option::prop::properties.isEmpty() && initSettings()) {
+	    QStringList subs = sett->subkeyList(keyBase(FALSE));
+	    subs.sort();
+	    for(QStringList::Iterator it = subs.fromLast(); it != subs.end(); --it) {
+		if((*it).isEmpty())
+		    continue;
+		QStringList keys = sett->entryList(keyBase(FALSE) + (*it));
+		for(QStringList::Iterator it2 = keys.begin(); it2 != keys.end(); it2++) {
+		    QString ret = sett->readEntry(keyBase(FALSE) + (*it) + "/" + (*it2));
+		    if((*it) != qmake_version())
+			fprintf(stdout, "%s/", (*it).latin1());
+		    fprintf(stdout, "%s:%s\n", (*it2).latin1(), ret.latin1());
+		}
+	    }
+	    return TRUE;
+	}
+	for(QStringList::Iterator it = Option::prop::properties.begin(); 
+	    it != Option::prop::properties.end(); it++) {
+	    if(Option::prop::properties.count() > 1)
+		fprintf(stdout, "%s:", (*it).latin1());
+	    if(!hasValue((*it))) {
+		ret = FALSE;
+		fprintf(stdout, "**Unknown**\n");
+	    } else {
+		fprintf(stdout, "%s\n", value((*it)).latin1());
+	    }
+	}
+    } else if(Option::qmake_mode == Option::QMAKE_SET_PROPERTY) {
+	for(QStringList::Iterator it = Option::prop::properties.begin(); 
+	    it != Option::prop::properties.end(); it++) {
+	    QString var = (*it);
+	    it++;
+	    if(it == Option::prop::properties.end()) {
+		ret = FALSE;
+		break;
+	    }
+	    if(!var.startsWith("."))
+		setValue(var, (*it));
+	}
+    }
+    return ret;
+}
diff --git a/qmake/property.h b/qmake/property.h
new file mode 100644
index 0000000..4ca45a4
--- /dev/null
+++ b/qmake/property.h
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Definition of QMakeProperty class.
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of qmake.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file.  Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#ifndef __PROPERTY_H__
+#define __PROPERTY_H__
+
+#include <qstring.h>
+
+class QSettings;
+
+class QMakeProperty 
+{
+    QSettings *sett;
+    QString keyBase(bool =TRUE) const;
+    bool initSettings();
+    QString value(QString, bool just_check); 
+public:
+    QMakeProperty();
+    ~QMakeProperty();
+
+    bool hasValue(QString);
+    QString value(QString v) { return value(v, FALSE); }
+    void setValue(QString, const QString &);
+
+    bool exec();
+};
+
+#endif /* __PROPERTY_H__ */
diff --git a/qmake/qtmd5.cpp b/qmake/qtmd5.cpp
new file mode 100644
index 0000000..03c60c3
--- /dev/null
+++ b/qmake/qtmd5.cpp
@@ -0,0 +1,304 @@
+/* derived from the RSA Data Security, Inc. MD5 Message-Digest Algorithm */
+#include <qstring.h>
+#include "qtmd5.h"
+
+typedef unsigned char *POINTER;
+typedef unsigned short int UINT2;
+typedef unsigned long int UINT4;
+
+typedef struct {
+    UINT4 state[4];            // state(ABCD)
+    UINT4 count[2];            // number of bits, modulo 2^64(lsb first)
+    unsigned char buffer[64];  // input buffer
+} MD5_CTX;
+
+static void MD5Init(MD5_CTX *);
+static void MD5Update(MD5_CTX *, unsigned char *, unsigned int);
+static void MD5Final(unsigned char [16], MD5_CTX *);
+static void MD5Transform(UINT4[4], unsigned char[64]);
+static void Encode(unsigned char *, UINT4 *, unsigned int);
+static void Decode(UINT4 *, unsigned char *, unsigned int);
+static void MD5_memset(POINTER, int, unsigned int);
+static void MD5_memcpy(POINTER output,POINTER input,unsigned int len);
+
+// Constants for MD5Transform routine.
+enum {
+    S11 = 7, S12 = 12, S13 = 17, S14 = 22, S21 = 5, S22 = 9,  S23 = 14, S24 = 20,
+    S31 = 4, S32 = 11, S33 = 16, S34 = 23, S41 = 6, S42 = 10, S43 = 15, S44 = 21
+};
+
+static unsigned char PADDING[64] = {
+    0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+// F, G, H and I are basic MD5 functions.
+static inline UINT4 F(UINT4 x, UINT4 y, UINT4 z)
+{
+    return(x & y) |((~x) & z);
+}
+
+static inline UINT4 G(UINT4 x, UINT4 y, UINT4 z)
+{
+    return(x & z) |(y &(~z));
+}
+
+static inline UINT4 H(UINT4 x, UINT4 y, UINT4 z)
+{
+    return x ^ y ^ z;
+}
+
+static inline UINT4 I(UINT4 x, UINT4 y, UINT4 z)
+{
+    return y ^(x |(~z));
+}
+
+static inline UINT4 rotateLeft(UINT4 x, UINT4 n)
+{
+    return(x << n) |(x >>(32-(n)));
+}
+
+// FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
+// Rotation is separate from addition to prevent recomputation.
+static inline void FF(UINT4 &a, UINT4 b, UINT4 c, UINT4 d, UINT4 x, UINT4 s, UINT4 ac)
+{
+    a += F(b, c, d) + x + ac;
+    a = rotateLeft(a, s);
+    a += b;
+}
+
+static inline void GG(UINT4 &a, UINT4 b, UINT4 c, UINT4 d, UINT4 x, UINT4 s, UINT4 ac)
+{
+    a += G(b, c, d) + x +(UINT4)(ac);
+    a = rotateLeft(a, s);
+    a += b;
+}
+
+static inline void HH(UINT4 &a, UINT4 b, UINT4 c, UINT4 d, UINT4 x, UINT4 s, UINT4 ac)
+{
+    a += H(b, c, d) + x +(UINT4)(ac);
+    a = rotateLeft(a, s);
+    a += b;
+}
+
+static inline void II(UINT4 &a, UINT4 b, UINT4 c, UINT4 d, UINT4 x, UINT4 s, UINT4 ac)
+{
+    a += I(b, c, d) + x +(UINT4)(ac);
+    a = rotateLeft(a, s);
+    a += b;
+}
+
+// MD5 initialization. Begins an MD5 operation, writing a new context.
+static void MD5Init(MD5_CTX *context)
+{
+    context->count[0] = context->count[1] = 0;
+
+    // Load magic initialization constants.
+    context->state[0] = 0x67452301;
+    context->state[1] = 0xefcdab89;
+    context->state[2] = 0x98badcfe;
+    context->state[3] = 0x10325476;
+}
+
+// MD5 block update operation. Continues an MD5 message-digest
+// operation, processing another message block, and updating the
+// context.
+static void MD5Update(MD5_CTX *context, unsigned char *input, unsigned int inputLen)
+{
+    unsigned int i, index, partLen;
+    // Compute number of bytes mod 64
+    index =(unsigned int)((context->count[0] >> 3) & 0x3F);
+
+    // Update number of bits
+    if ((context->count[0] +=((UINT4)inputLen << 3)) <((UINT4)inputLen << 3))
+	context->count[1]++;
+
+    context->count[1] +=((UINT4)inputLen >> 29);
+    partLen = 64 - index;
+
+    // Transform as many times as possible.
+    if (inputLen >= partLen) {
+	MD5_memcpy((POINTER)&context->buffer[index],(POINTER)input, partLen);
+	MD5Transform(context->state, context->buffer);
+	for (i = partLen; i + 63 < inputLen; i += 64)
+	    MD5Transform(context->state, &input[i]);
+	index = 0;
+    } else {
+	i = 0;
+    }
+
+    // Buffer remaining input
+    MD5_memcpy((POINTER)&context->buffer[index],(POINTER)&input[i],
+	       inputLen-i);
+}
+
+// MD5 finalization. Ends an MD5 message-digest operation, writing the
+// the message digest and zeroizing the context.
+static void MD5Final(unsigned char digest[16], MD5_CTX *context)
+{
+    unsigned char bits[8];
+    unsigned int index, padLen;
+
+    // Save number of bits
+    Encode(bits, context->count, 8);
+
+    // Pad out to 56 mod 64.
+    index =(unsigned int)((context->count[0] >> 3) & 0x3f);
+    padLen =(index < 56) ?(56 - index) :(120 - index);
+    MD5Update(context, PADDING, padLen);
+
+    // Append length(before padding)
+    MD5Update(context, bits, 8);
+
+    // Store state in digest
+    Encode(digest, context->state, 16);
+
+    // Zeroize sensitive information.
+    MD5_memset((POINTER)context, 0, sizeof(*context));
+}
+
+// MD5 basic transformation. Transforms state based on block.
+static void MD5Transform(UINT4 state[4], unsigned char block[64])
+{
+    UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
+    Decode(x, block, 64);
+
+    // Round 1
+    FF(a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
+    FF(d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
+    FF(c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
+    FF(b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
+    FF(a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
+    FF(d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
+    FF(c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
+    FF(b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
+    FF(a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
+    FF(d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
+    FF(c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
+    FF(b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
+    FF(a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
+    FF(d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
+    FF(c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
+    FF(b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
+
+    // Round 2
+    GG(a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
+    GG(d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
+    GG(c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
+    GG(b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
+    GG(a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
+    GG(d, a, b, c, x[10], S22,  0x2441453); /* 22 */
+    GG(c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
+    GG(b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
+    GG(a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
+    GG(d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
+    GG(c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
+    GG(b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
+    GG(a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
+    GG(d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
+    GG(c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
+    GG(b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
+
+    // Round 3
+    HH(a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
+    HH(d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
+    HH(c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
+    HH(b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
+    HH(a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
+    HH(d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
+    HH(c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
+    HH(b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
+    HH(a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
+    HH(d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
+    HH(c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
+    HH(b, c, d, a, x[ 6], S34,  0x4881d05); /* 44 */
+    HH(a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
+    HH(d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
+    HH(c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
+    HH(b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
+
+    // Round 4
+    II(a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
+    II(d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
+    II(c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
+    II(b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
+    II(a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
+    II(d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
+    II(c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
+    II(b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
+    II(a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
+    II(d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
+    II(c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
+    II(b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
+    II(a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
+    II(d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
+    II(c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
+    II(b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
+    state[0] += a;
+    state[1] += b;
+    state[2] += c;
+    state[3] += d;
+
+    // Zeroize sensitive information.
+    MD5_memset((POINTER)x, 0, sizeof(x));
+}
+
+// Encodes input(UINT4) into output(unsigned char). Assumes len is a
+// multiple of 4.
+static void Encode(unsigned char *output, UINT4 *input, unsigned int len)
+{
+    unsigned int i, j;
+    for (i = 0, j = 0; j < len; i++, j += 4) {
+	output[j] = (unsigned char) (input[i] & 0xff);
+	output[j+1] = (unsigned char) ((input[i] >> 8) & 0xff);
+	output[j+2] = (unsigned char) ((input[i] >> 16) & 0xff);
+	output[j+3] = (unsigned char) ((input[i] >> 24) & 0xff);
+    }
+}
+
+// Decodes input(unsigned char) into output(UINT4). Assumes len is a
+// multiple of 4.
+static void Decode(UINT4 *output, unsigned char *input, unsigned int len)
+{
+    unsigned int i, j;
+    for (i = 0, j = 0; j < len; i++, j += 4)
+	output[i] =((UINT4)input[j]) |(((UINT4)input[j+1]) << 8) |
+		  (((UINT4)input[j+2]) << 16) |(((UINT4)input[j+3]) << 24);
+}
+
+// Note: Replace "for loop" with standard memset if possible.
+static void MD5_memset(POINTER output, int value, unsigned int len)
+{
+    unsigned int i;
+    for (i = 0; i < len; i++)
+	((char *)output)[i] =(char)value;
+}
+
+// Note: Replace "for loop" with standard memcpy if possible.
+static void MD5_memcpy(POINTER output,POINTER input,unsigned int len)
+{
+    unsigned int i;
+    for (i = 0; i < len; i++)
+	output[i] = input[i];
+}
+
+void qtMD5(const QByteArray &src, unsigned char *digest)
+{
+    MD5_CTX context;
+
+    MD5Init(&context);
+    MD5Update(&context, (unsigned char *) src.data(), src.size());
+    MD5Final(digest, &context);
+}
+
+QString qtMD5(const QByteArray &src)
+{
+    unsigned char digest[16];
+    qtMD5(src, digest);
+
+    QString output, tmp;
+    for (int i = 0; i < 16; ++i) 
+	output += tmp.sprintf("%02x", digest[i]);
+    return output;
+}
diff --git a/qmake/qtmd5.h b/qmake/qtmd5.h
new file mode 100644
index 0000000..c8e541b
--- /dev/null
+++ b/qmake/qtmd5.h
@@ -0,0 +1,11 @@
+#ifndef QTMD5_H
+#define QTMD5_H
+#include <qstring.h>
+#include <qcstring.h>
+
+void qtMD5(const QByteArray &src, unsigned char *digest);
+QString qtMD5(const QByteArray &src);
+
+#endif
+
+