Test conversion to TQt3 from Qt3 8c6fc1f8e35fd264dd01c582ca5e7549b32ab731

25 files changed, 17044 insertions, 0 deletions

diff --git a/qmake/generators/mac/metrowerks_xml.cpp b/qmake/generators/mac/metrowerks_xml.cpp
new file mode 100644
index 000000000..2fbb5b1d7
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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(TQWS) && defined(Q_OS_MAC)
+#include <Carbon/Carbon.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#endif
+
+MetrowerksMakefileGenerator::MetrowerksMakefileGenerator(TQMakeProject *p) : MakefileGenerator(p), init_flag(FALSE)
+{
+
+}
+
+bool
+MetrowerksMakefileGenerator::writeMakefile(TQTextStream &t)
+{
+    if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) {
+	/* for now just dump, I need to generated an empty xml or something.. */
+	fprintf(stderr, "Project file not generated because all retquirements not met:\n\t%s\n",
+		var("QMAKE_FAILED_RETQUIREMENTS").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(TQTextStream &t)
+{
+    //..grrr.. libs!
+    TQStringList 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(TQStringList::Iterator val_it = extra_objs.begin(); 
+	val_it != extra_objs.end(); ++val_it) {
+	if((*val_it).startsWith("-L")) {
+	    TQString 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")) {
+	    TQString 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;
+	    TQString frmwrk = (*val_it) + ".framework";
+	    if(project->variables()["FRAMEWORKS"].findIndex(frmwrk) == -1)
+		project->variables()["FRAMEWORKS"].append(frmwrk);
+	} else if((*val_it).left(1) != "-") {
+	    TQString lib=(*val_it);
+	    int s = lib.findRev('/');
+	    if(s != -1) {
+		TQString 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
+    TQDict<void> seen(293);
+    TQString paths[] = { TQString("SRCMOC"), TQString("FORMS"), TQString("UICDECLS"),
+			TQString("UICIMPLS"), TQString("SOURCES"),TQString("HEADERS"),
+			TQString::null };
+    for(int y = 0; paths[y] != TQString::null; y++) {
+	TQStringList &l = project->variables()[paths[y]];
+	for(TQStringList::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
+	    TQStringList &d = findDependencies((*val_it)); //depends
+	    for(TQStringList::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) {
+		TQString dir = (*val_it).left(s);
+		(*val_it) = (*val_it).right((*val_it).length() - s - 1);
+		TQString tmpd=dir, tmpv;
+		if(fixifyToMacPath(tmpd, tmpv)) {
+		    bool add_in = TRUE;
+		    TQString deps[] = { TQString("DEPENDPATH"), 
+				     TQString("INCLUDEPATH"), TQString::null }, 
+				     dd, dv;
+		    for(int yy = 0; deps[yy] != TQString::null; yy++) {
+			TQStringList &l2 = project->variables()[deps[yy]];
+			for(TQStringList::Iterator val_it2 = l2.begin(); 
+			    val_it2 != l2.end(); ++val_it2) {
+			    TQString 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")) {
+	TQString 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");
+    }
+
+    TQString xmlfile = findTemplate(project->first("QMAKE_XML_TEMPLATE"));
+    TQFile file(xmlfile);
+    if(!file.open(IO_ReadOnly )) {
+	fprintf(stderr, "Cannot open XML file: %s\n", 
+		project->first("QMAKE_XML_TEMPLATE").latin1());
+	return FALSE;
+    }
+    TQTextStream xml(&file);
+    createFork(Option::output.name());
+
+    int rep;
+    TQString line;
+    while ( !xml.eof() ) {
+	line = xml.readLine();
+	while((rep = line.find(TQRegExp("\\$\\$[!a-zA-Z0-9_-]*"))) != -1) {
+	    TQString torep = line.mid(rep, line.find(TQRegExp("[^\\$!a-zA-Z0-9_-]"), rep) - rep);
+	    TQString 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") {
+		TQString outcmd=variable.right(variable.length() - variable.findRev('_') - 1);
+		TQStringList args;
+		if(outcmd == "TQPREPROCESS")
+		    args << "UICS" << "MOCS";
+		else if(outcmd == "TQPREPROCESSOUT")
+		    args << "SRCMOC" << "UICIMPLS" << "UICDELCS";
+		else
+		    args << outcmd;
+		for(TQStringList::Iterator arit = args.begin(); arit != args.end(); ++arit) {
+		    TQString arg = (*arit);
+		    TQString kind = "Text";
+		    if(arg == "LIBRARIES")
+			kind = "Library";
+		    if(!project->variables()[arg].isEmpty()) {
+			TQStringList &list = project->variables()[arg];
+			for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+			    TQString flag;
+			    if(project->isActiveConfig("debug")) {
+				bool debug = TRUE;
+				if(outcmd == "TQPREPROCESS") {
+				    debug = FALSE;
+				} else {
+				    for(TQStringList::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") {
+		TQString outcmd=variable.mid(variable.find('_')+1, 
+					    variable.findRev('_')-(variable.find('_')+1));
+		TQStringList args;
+		if(outcmd == "TQPREPROCESS")
+		    args << "UICS" << "MOCS";
+		else if(outcmd == "TQPREPROCESSOUT")
+		    args << "SRCMOC" << "UICIMPLS" << "UICDELCS";
+		else
+		    args << outcmd;
+		for(TQStringList::Iterator arit = args.begin(); arit != args.end(); ++arit) {
+		    TQString arg = (*arit);
+		    if(!project->variables()[arg].isEmpty()) {
+			TQStringList &list = project->variables()[arg];
+			for(TQStringList::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") {
+		TQString outcmd = variable.mid(variable.find('_')+1, 
+					      variable.findRev('_')-(variable.find('_')+1));
+		TQStringList args;
+		if(outcmd == "TQPREPROCESS")
+		    args << "UICS" << "MOCS";
+		else if(outcmd == "TQPREPROCESSOUT")
+		    args << "SRCMOC" << "UICIMPLS" << "UICDELCS";
+		else
+		    args << outcmd;
+		for(TQStringList::Iterator arit = args.begin(); arit != args.end(); ++arit) {
+		    TQString arg = (*arit);
+		    if(!project->variables()[arg].isEmpty()) {
+			TQStringList &list = project->variables()[arg];
+			for(TQStringList::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")) {
+		    TQStringList &list = project->variables()["FRAMEWORKS"];
+		    for(TQStringList::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") {	
+		TQString arg=variable.right(variable.length()-variable.find('_')-1);
+		TQStringList list;
+		if(arg == "INCLUDEPATH") {
+		    list = project->variables()[arg];
+		    list << Option::mkfile::qmakespec;
+		    list << TQDir::current().currentDirPath();
+
+		    TQStringList &l = project->variables()["QMAKE_LIBS_PATH"];
+		    for(TQStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) {
+			TQString 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") {
+		    TQStringList &l = project->variables()[arg];
+		    for(TQStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it)
+		    {
+			//apparently tmake used colon separation...
+			TQStringList damn = TQStringList::split(':', (*val_it));
+			if(!damn.isEmpty())
+			    list += damn;
+			else
+			    list.append((*val_it));
+		    }
+		} else {
+		    list = project->variables()[arg];
+		}
+		for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+		    TQString 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") {
+		TQString 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")) {
+		    TQString 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()) { 
+	TQString mocs = project->first("MOCS");
+	TQFile mocfile(mocs);
+	if(!mocfile.open(IO_WriteOnly)) {
+	    fprintf(stderr, "Cannot open MOCS file: %s\n", mocs.latin1());
+	} else {
+	    createFork(mocs);
+	    TQTextStream mocs(&mocfile);
+	    TQStringList &list = project->variables()["SRCMOC"];
+	    for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+		TQString src = findMocSource((*it));
+		if(src.findRev('/') != -1)
+		    src = src.right(src.length() - src.findRev('/') - 1);
+		mocs << src << endl;
+	    }
+	    mocfile.close();
+	}
+    }
+
+    if(!project->isEmpty("FORMS")) { 
+	TQString uics = project->first("UICS");
+	TQFile uicfile(uics);
+	if(!uicfile.open(IO_WriteOnly)) {
+	    fprintf(stderr, "Cannot open UICS file: %s\n", uics.latin1());
+	} else {
+	    createFork(uics);
+	    TQTextStream uics(&uicfile);
+	    TQStringList &list = project->variables()["FORMS"];
+	    for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+		TQString 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")) {
+	TQFile 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"));
+	    TQTextStream prefix(&prefixfile);
+	    TQStringList &list = project->variables()["DEFINES"];
+	    for(TQStringList::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");
+
+    TQStringList &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") == "tqt-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") ? TQString("0") : 
+						project->first("VER_PAT")) );
+    TQStringList ver = TQStringList::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") ) {
+	TQString 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")) {
+	TQString 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(TQDir::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") == "tqt-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"));
+    }
+}
+
+
+TQString
+MetrowerksMakefileGenerator::findTemplate(const TQString &file)
+{
+    TQString ret;
+    if(!TQFile::exists(ret = file) && 
+       !TQFile::exists((ret = Option::mkfile::qmakespec + TQDir::separator() + file)) && 
+       !TQFile::exists((ret = TQString(getenv("QTDIR")) + "/mkspecs/mac-mwerks/" + file)) &&
+       !TQFile::exists((ret = (TQString(getenv("HOME")) + "/.tmake/" + file))))
+	return "";
+    return ret;
+}
+
+bool
+MetrowerksMakefileGenerator::createFork(const TQString &f)
+{
+#if !defined(TQWS) && defined(Q_OS_MACX)
+    FSRef fref;
+    FSSpec fileSpec;
+    if(TQFile::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(TQString &p, TQString &v, bool )
+{
+    v = "Absolute";
+    if(p.find(':') != -1) //guess its macish already
+	return TRUE;
+
+    static TQString st_volume;
+    if(st_volume.isEmpty()) {
+	st_volume = var("QMAKE_VOLUMENAME");
+#if !defined(TQWS) && 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
+    }
+    TQString 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(TQDir::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 {
+	    TQFileInfo fi(p);
+	    if(fi.convertToAbs()) //strange
+		return FALSE;
+	    p = fi.filePath();
+	} 
+    } 
+    p = TQDir::cleanDirPath(p);
+    if(!volume.isEmpty()) 
+	v = volume;
+    p.replace("/", ":");
+    if(p.right(1) != ":")
+	p += ':';
+    return TRUE;
+}
+
+void
+MetrowerksMakefileGenerator::processPrlFiles()
+{
+    TQPtrList<MakefileDependDir> libdirs;
+    libdirs.setAutoDelete(TRUE);
+    const TQString lflags[] = { "QMAKE_LIBS", TQString::null };
+    for(int i = 0; !lflags[i].isNull(); i++) {
+	for(bool ret = FALSE; TRUE; ret = FALSE) {
+	    TQStringList l_out;
+	    TQStringList &l = project->variables()[lflags[i]];
+	    for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+		TQString opt = (*it);
+		if(opt.startsWith("-")) {
+		    if(opt.startsWith("-L")) {
+			TQString r = opt.right(opt.length() - 2), l = r;
+			fixEnvVariables(l);
+			libdirs.append(new MakefileDependDir(r.replace( "\"", ""),
+							     l.replace( "\"", "")));
+		    } else if(opt.left(2) == "-l") {
+			TQString 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);
+				TQRegExp 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);
+			TQString 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 TQString &var, const TQStringList &l)
+{
+    if(var == "QMAKE_PRL_LIBS") {
+	TQStringList &out = project->variables()["QMAKE_LIBS"];
+	for(TQStringList::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(TQStringList::ConstIterator outit = out.begin(); 
+			outit != out.end(); ++it) {
+			if((*outit) == "-framework") {
+			    ++outit;
+			    if((*outit) == (*it)) {
+				append = FALSE;
+				break;
+			    }
+			}
+		    }
+		}
+	    } else if(TQFile::exists((*it))) {
+		append = out.findIndex((*it));
+	    }
+	    if(append)
+		out.append((*it));
+	}
+    } else {
+	MakefileGenerator::processPrlVariable(var, l);
+    }
+}
+
+
+bool
+MetrowerksMakefileGenerator::openOutput(TQFile &file) const
+{
+    TQString outdir;
+    if(!file.name().isEmpty()) {
+	TQFileInfo fi(file);
+	if(fi.isDir())
+	    outdir = file.name() + TQDir::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 000000000..f018dd708
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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 TQString &f);
+    bool fixifyToMacPath(TQString &c, TQString &v, bool exists=TRUE);
+
+    bool init_flag;
+
+    bool writeMakeParts(TQTextStream &);
+    bool writeSubDirs(TQTextStream &);
+
+    bool writeMakefile(TQTextStream &);
+    TQString findTemplate(const TQString &file);
+    void init();
+public:
+    MetrowerksMakefileGenerator(TQMakeProject *p);
+    ~MetrowerksMakefileGenerator();
+
+    bool openOutput(TQFile &file) const;
+protected:
+    virtual void processPrlFiles();
+    virtual void processPrlVariable(const TQString &var, const TQStringList &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 000000000..84e9494ad
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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(TQMakeProject *p) : UnixMakefileGenerator(p)
+{
+
+}
+
+bool
+ProjectBuilderMakefileGenerator::writeMakefile(TQTextStream &t)
+{
+    if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) {
+	/* for now just dump, I need to generated an empty xml or something.. */
+	fprintf(stderr, "Project file not generated because all retquirements not met:\n\t%s\n",
+		var("QMAKE_FAILED_RETQUIREMENTS").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(TQTextStream &t, bool direct)
+{
+    TQString mkwrap = fileFixify(pbx_dir + Option::dir_sep + ".." + Option::dir_sep + project->first("MAKEFILE"),
+				TQDir::currentDirPath());
+    TQFile mkwrapf(mkwrap);
+    if(mkwrapf.open(IO_WriteOnly | IO_Translate)) {
+	debug_msg(1, "pbuilder: Creating file: %s", mkwrap.latin1());
+	TQTextStream 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
+    TQStringList subdirs = project->variables()["SUBDIRS"];
+    TQString oldpwd = TQDir::currentDirPath();
+    TQMap<TQString, TQStringList> groups;
+    for(TQStringList::Iterator it = subdirs.begin(); it != subdirs.end(); ++it) {
+	TQFileInfo fi(Option::fixPathToLocalOS((*it), TRUE));
+	if(fi.exists()) {
+	    if(fi.isDir()) {
+		TQString profile = (*it);
+		if(!profile.endsWith(Option::dir_sep))
+		    profile += Option::dir_sep;
+		profile += fi.baseName() + ".pro";
+		subdirs.append(profile);
+	    } else {
+		TQMakeProject tmp_proj;
+		TQString dir = fi.dirPath(), fn = fi.fileName();
+		if(!dir.isEmpty()) {
+		    if(!TQDir::setCurrent(dir))
+			fprintf(stderr, "Cannot find directory: %s\n", dir.latin1());
+		}
+		if(tmp_proj.read(fn, oldpwd)) {
+		    if(Option::debug_level) {
+			TQMap<TQString, TQStringList> &vars = tmp_proj.variables();
+			for(TQMap<TQString, TQStringList>::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") {
+			TQString pbxproj = TQDir::currentDirPath() + Option::dir_sep + tmp_proj.first("TARGET") + projectSuffix();
+			if(!TQFile::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;
+			    TQString name = TQDir::currentDirPath();
+			    TQString project_key = keyFor(pbxproj + "_PROJECTREF");
+			    if(project->isActiveConfig("flat")) {
+				TQString flat_file = fileFixify(name, oldpwd, Option::output_dir, TRUE);
+				if(flat_file.find(Option::dir_sep) != -1) {
+				    TQStringList dirs = TQStringList::split(Option::dir_sep, flat_file);
+				    name = dirs.back();
+				}
+			    } else {
+				TQString flat_file = fileFixify(name, oldpwd, Option::output_dir, TRUE);
+				if(TQDir::isRelativePath(flat_file) && flat_file.find(Option::dir_sep) != -1) {
+				    TQString last_grp("QMAKE_PBX_HEIR_GROUP");
+				    TQStringList dirs = TQStringList::split(Option::dir_sep, flat_file);
+				    name = dirs.back();
+				    for(TQStringList::Iterator dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) {
+					TQString 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:
+		TQDir::setCurrent(oldpwd);
+	    }
+	}
+    }
+    for(TQMap<TQString, TQStringList>::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
+    TQString active_buildstyle;
+#if 0
+    for(int as_release = 0; as_release < 2; as_release++)
+#else
+	bool as_release = !project->isActiveConfig("debug");
+#endif
+    {
+        TQMap<TQString, TQString> settings;
+        settings.insert("COPY_PHASE_STRIP", (as_release ? "YES" : "NO"));
+        if(as_release)
+            settings.insert("GCC_GENERATE_DEBUGGING_SYMBOLS", "NO");
+        TQString name;
+        if(pbVersion >= 42)
+            name = (as_release ? "Release" : "Debug");
+        else
+            name = (as_release ? "Deployment" : "Development");
+
+        if(pbVersion >= 42) {
+            TQString 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(TQMap<TQString, TQString>::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";
+        }
+
+        TQString 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(TQMap<TQString, TQString>::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 TQStringList &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";
+    {
+	TQStringList &libdirs = project->variables()["QMAKE_PBX_SUBDIRS"];
+	for(TQStringList::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(TQTextStream &t)
+{
+    int i;
+    TQStringList 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)") {
+	TQString mkfile = pbx_dir + Option::dir_sep + "qt_makeqmake.mak";
+	TQFile mkf(mkfile);
+	if(mkf.open(IO_WriteOnly | IO_Translate)) {
+	    debug_msg(1, "pbuilder: Creating file: %s", mkfile.latin1());
+	    TQTextStream mkt(&mkf);
+	    writeHeader(mkt);
+	    mkt << "QMAKE    = "	<<
+		(project->isEmpty("QMAKE_QMAKE") ? TQString("$(QTDIR)/bin/qmake") :
+		 var("QMAKE_QMAKE")) << endl;
+	    writeMakeQmake(mkt);
+	    mkf.close();
+	}
+	TQString phase_key = keyFor("QMAKE_PBX_MAKEQMAKE_BUILDPHASE");
+	mkfile = fileFixify(mkfile, TQDir::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 = \"TQt Qmake\";" << "\n"
+	  << "\t\t\t" << "neededFileNames = (" << "\n"
+	  << "\t\t\t" << ");" << "\n"
+	  << "\t\t\t" << "shellPath = /bin/sh;" << "\n"
+	  << "\t\t\t" << "shellScript = \"make -C " << TQDir::currentDirPath() <<
+	    " -f " << mkfile << "\";" << "\n"
+	  << "\t\t" << "};" << "\n";
+    }
+
+    //DUMP SOURCES
+    TQMap<TQString, TQStringList> groups;
+    TQString srcs[] = { "HEADERS", "SOURCES", "SRCMOC", "UICIMPLS", "QMAKE_IMAGE_COLLECTION",
+		       "FORMS", "QMAKE_INTERNAL_INCLUDED_FILES", TQString::null };
+    for(i = 0; !srcs[i].isNull(); i++) {
+	tmp = project->variables()[srcs[i]];
+	if(srcs[i] == "QMAKE_INTERNAL_INCLUDED_FILES") {
+	    TQString pfile = project->projectFile();
+	    if(pfile != "(stdin)")
+		tmp.prepend(pfile);
+	}
+	TQStringList &src_list = project->variables()["QMAKE_PBX_" + srcs[i]];
+	TQStringList &root_group_list = project->variables()["QMAKE_PBX_GROUPS"];
+
+	//hard coded groups..
+	TQString 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(TQStringList::Iterator it = tmp.begin(); it != tmp.end(); ++it) {
+	    TQStringList files = (*it);
+	    bool buildable = TRUE;
+	    if(srcs[i] == "FORMS") {
+		TQString form_dot_h = (*it) + Option::h_ext.first();
+		if(TQFile::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(TQStringList::Iterator file_it = files.begin(); file_it != files.end(); ++file_it) {
+		TQString 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;
+		TQString src_key = keyFor(file), name = file;
+		if(project->isActiveConfig("flat")) {
+		    TQString flat_file = fileFixify(file, TQDir::currentDirPath(), Option::output_dir, TRUE);
+		    if(flat_file.find(Option::dir_sep) != -1) {
+			TQStringList dirs = TQStringList::split(Option::dir_sep, flat_file);
+			name = dirs.back();
+		    }
+		} else {
+		    TQString flat_file = fileFixify(file, TQDir::currentDirPath(), Option::output_dir, TRUE);
+		    if(TQDir::isRelativePath(flat_file) && flat_file.find(Option::dir_sep) != -1) {
+			TQString last_grp("QMAKE_PBX_" + src_group + "_HEIR_GROUP");
+			TQStringList dirs = TQStringList::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(TQStringList::Iterator dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) {
+			    TQString 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) {
+		    TQString filetype;
+		    for(TQStringList::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
+		    TQString 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
+		    TQString 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";
+		}
+	    }
+
+	    TQString src_group_key = keyFor(src_group);
+	    if(root_group_list.findIndex(src_group_key) == -1)
+		root_group_list += src_group_key;
+
+            TQStringList &group = groups[src_group];
+            for(TQStringList::Iterator src_it = src_list.begin(); src_it != src_list.end(); ++src_it) {
+                if(group.findIndex((*src_it)) == -1)
+                    group += (*src_it);
+            }
+	}
+    }
+    for(TQMap<TQString, TQStringList>::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")) {
+	TQString mkfile = pbx_dir + Option::dir_sep + "qt_preprocess.mak";
+	TQFile mkf(mkfile);
+	if(mkf.open(IO_WriteOnly | IO_Translate)) {
+	    did_preprocess = TRUE;
+	    debug_msg(1, "pbuilder: Creating file: %s", mkfile.latin1());
+	    TQTextStream 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")) {
+		TQStringList &yaccs = project->variables()["YACCSOURCES"];
+		for(TQStringList::Iterator yit = yaccs.begin(); yit != yaccs.end(); ++yit) {
+		    TQFileInfo fi((*yit));
+		    mkt << " " << fi.dirPath() << Option::dir_sep << fi.baseName(TRUE)
+			<< Option::yacc_mod << Option::cpp_ext.first();
+		}
+	    }
+	    if(!project->isEmpty("LEXSOURCES")) {
+		TQStringList &lexs = project->variables()["LEXSOURCES"];
+		for(TQStringList::Iterator lit = lexs.begin(); lit != lexs.end(); ++lit) {
+		    TQFileInfo 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, TQDir::currentDirPath());
+	TQString 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 = \"TQt 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 " << TQDir::currentDirPath() <<
+	    " -f " << mkfile << "\";" << "\n"
+	  << "\t\t" << "};" << "\n";
+   }
+
+    //SOURCE BUILDPHASE
+    if(!project->isEmpty("QMAKE_PBX_OBJ")) {
+	TQString 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
+	TQStringList &libdirs = project->variables()["QMAKE_PBX_LIBPATHS"];
+	TQString libs[] = { "QMAKE_LFLAGS", "QMAKE_LIBDIR_FLAGS", "QMAKE_LIBS", TQString::null };
+	for(i = 0; !libs[i].isNull(); i++) {
+	    tmp = project->variables()[libs[i]];
+	    for(TQStringList::Iterator it = tmp.begin(); it != tmp.end();) {
+		bool remove = FALSE;
+		TQString 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")) {
+		    TQString 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);
+		    TQString lib("lib" + name);
+		    for(TQStringList::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
+			    */
+			    TQString lib_file = (*lit) + Option::dir_sep + lib;
+			    if(TQMakeMetaInfo::libExists(lib_file)) {
+				TQMakeMetaInfo 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) {
+			    TQString extns[] = { ".dylib", ".so", ".a", TQString::null };
+			    for(int n = 0; !remove && !extns[n].isNull(); n++) {
+				TQString tmp =  (*lit) + Option::dir_sep + lib + extns[n];
+				if(TQFile::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;
+		    TQStringList &fdirs = project->variables()["QMAKE_FRAMEWORKDIR"];
+		    if(fdirs.isEmpty())
+			fdirs.append("/System/Library/Frameworks/");
+		    for(TQStringList::Iterator fit = fdirs.begin(); fit != fdirs.end(); ++fit) {
+			if(TQFile::exists((*fit) + TQDir::separator() + (*it) + ".framework")) {
+			    --it;
+			    it = tmp.remove(it);
+			    remove = TRUE;
+			    library = (*fit) + Option::dir_sep + (*it) + ".framework";
+			    break;
+			}
+		    }
+		} else if(opt.left(1) != "-") {
+                    if(TQFile::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);
+		    TQString 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);
+		    TQString 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")) {
+	TQString mkfile = pbx_dir + Option::dir_sep + "qt_sublibs.mak";
+	TQFile mkf(mkfile);
+	if(mkf.open(IO_WriteOnly | IO_Translate)) {
+	    debug_msg(1, "pbuilder: Creating file: %s", mkfile.latin1());
+	    TQTextStream mkt(&mkf);
+	    writeHeader(mkt);
+	    mkt << "SUBLIBS= ";
+	    tmp = project->variables()["SUBLIBS"];
+	    TQStringList::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(TQString("MAKELIB") + (*it)) << endl << endl;
+	    mkf.close();
+	}
+	TQString phase_key = keyFor("QMAKE_PBX_SUBLIBS_BUILDPHASE");
+	mkfile = fileFixify(mkfile, TQDir::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 = \"TQt Sublibs\";" << "\n"
+	  << "\t\t\t" << "neededFileNames = (" << "\n"
+	  << "\t\t\t" << ");" << "\n"
+	  << "\t\t\t" << "shellPath = /bin/sh;" << "\n"
+	  << "\t\t\t" << "shellScript = \"make -C " << TQDir::currentDirPath() <<
+	    " -f " << mkfile << "\";" << "\n"
+	  << "\t\t" << "};" << "\n";
+    }
+    //LIBRARY BUILDPHASE
+    if(!project->isEmpty("QMAKE_PBX_LIBRARIES")) {
+	tmp = project->variables()["QMAKE_PBX_LIBRARIES"];
+	if(!tmp.isEmpty()) {
+	    TQString 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";
+	}
+    }
+    {
+	TQString 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
+	TQString 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") : TQString(""))
+	  << "\t\t\t" << ");" << "\n"
+	  << "\t\t\t" << "isa = PBXResourcesBuildPhase;" << "\n"
+	  << "\t\t\t" << "name = \"" << grp << "\";" << "\n"
+	  << "\t\t" << "};" << "\n";
+    }
+    { //INSTALL BUILDPHASE (sh script)
+        TQString phase_key = keyFor("QMAKE_PBX_TARGET_COPY_PHASE");
+        TQString destDir = Option::output_dir;
+        if (!project->isEmpty("QMAKE_ORIG_DESTDIR"))
+            destDir = project->first("QMAKE_ORIG_DESTDIR");
+        fixEnvs(destDir);
+        destDir = TQFileInfo(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
+        TQString 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 = \"TQt Preprocessor Steps\";" << "\n"
+	  << "\t\t\t" << "productName = \"TQt 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") {
+	TQString 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";
+	}
+	TQString app = (!project->isEmpty("DESTDIR") ? project->first("DESTDIR") + project->first("QMAKE_ORIG_TARGET") :
+		       TQDir::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 {
+	TQString 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
+	TQString 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
+    TQString 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") {
+        TQString plist = fileFixify(project->first("QMAKE_INFO_PLIST"));
+        if(plist.isEmpty())
+            plist = specdir() + TQDir::separator() + "Info.plist." + project->first("TEMPLATE");
+	if(TQFile::exists(plist)) {
+	    TQFile plist_in_file(plist);
+	    if(plist_in_file.open(IO_ReadOnly)) {
+		TQTextStream plist_in(&plist_in_file);
+		TQString plist_in_text = plist_in.read();
+                plist_in_text = plist_in_text.replace("@ICON@", (project->isEmpty("RC_FILE") ? TQString("") : project->first("RC_FILE").section(Option::dir_sep, -1)));
+                plist_in_text = plist_in_text.replace("@EXECUTABLE@", project->first("QMAKE_ORIG_TARGET"));
+		TQFile plist_out_file("Info.plist");
+		if(plist_out_file.open(IO_WriteOnly | IO_Translate)) {
+		    TQTextStream 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 = \"" << TQDir::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")) {
+	TQString dir = project->first("DESTDIR");
+	if (TQDir::isRelativePath(dir))
+	    dir.prepend(TQDir::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 = \"" << TQDir::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";
+	}
+	TQString 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(TQStringList::Iterator it = tmp.begin(); it != tmp.end(); ++it) {
+	TQString 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(TQFile::exists("Info.plist")) {
+                TQFile plist("Info.plist");
+                if(plist.open(IO_ReadOnly)) {
+                    read_plist = true;
+                    TQTextStream 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 {
+        TQString 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
+    TQString active_buildstyle;
+#if 0
+    for(int as_release = 0; as_release < 2; as_release++)
+#else
+	bool as_release = !project->isActiveConfig("debug");
+#endif
+    {
+        TQMap<TQString, TQString> settings;
+        settings.insert("COPY_PHASE_STRIP", (as_release ? "YES" : "NO"));
+        if(as_release)
+            settings.insert("GCC_GENERATE_DEBUGGING_SYMBOLS", "NO");
+        TQString name;
+        if(pbVersion >= 42)
+            name = (as_release ? "Release" : "Debug");
+        else
+            name = (as_release ? "Deployment" : "Development");
+
+        if(pbVersion >= 42) {
+            TQString 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(TQMap<TQString, TQString>::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";
+        }
+
+        TQString 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(TQMap<TQString, TQString>::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")) {
+	TQString mkwrap = fileFixify(pbx_dir + Option::dir_sep + ".." + Option::dir_sep + project->first("MAKEFILE"),
+				    TQDir::currentDirPath());
+	TQFile mkwrapf(mkwrap);
+	if(mkwrapf.open(IO_WriteOnly | IO_Translate)) {
+	    debug_msg(1, "pbuilder: Creating file: %s", mkwrap.latin1());
+	    TQTextStream 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;
+}
+
+TQString
+ProjectBuilderMakefileGenerator::fixQuotes(const TQString &val)
+{
+    TQString ret(val);
+    ret = ret.replace(TQRegExp("('|\\\\|\")"), "\\\\1");
+    return ret;
+}
+
+TQString
+ProjectBuilderMakefileGenerator::fixEnvs(const TQString &file)
+{
+    TQRegExp 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;
+}
+
+TQString
+ProjectBuilderMakefileGenerator::fixEnvsList(const TQString &where)
+{
+    TQString ret;
+    const TQStringList &l = project->variables()[where];
+    for(TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
+	fixEnvs((*it));
+	if(!ret.isEmpty())
+	    ret += " ";
+	ret += fixQuotes((*it));
+    }
+    return ret;
+}
+
+TQString
+ProjectBuilderMakefileGenerator::keyFor(const TQString &block)
+{
+#if 1 //This make this code much easier to debug..
+    if(project->isActiveConfig("no_pb_munge_key"))
+       return block;
+#endif
+    TQString 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(TQFile &file) const
+{
+    if(TQDir::isRelativePath(file.name()))
+	file.setName(Option::output_dir + file.name()); //pwd when qmake was run
+    TQFileInfo fi(file);
+    if(fi.extension() != "pbxproj" || file.name().isEmpty()) {
+	TQString output = file.name();
+	if(fi.isDir())
+	    output += TQDir::separator();
+	if(!output.endsWith(projectSuffix())) {
+	    if(file.name().isEmpty() || fi.isDir())
+		output += project->first("TARGET");
+	    output += projectSuffix() + TQDir::separator();
+	} else if(output[(int)output.length() - 1] != TQDir::separator()) {
+	    output += TQDir::separator();
+	}
+	output += TQString("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
+{
+    TQString ret;
+    if(project->isEmpty("QMAKE_PBUILDER_VERSION")) {
+        TQString version, version_plist = project->first("QMAKE_PBUILDER_VERSION_PLIST");
+        if(version_plist.isEmpty()) {
+            if(TQFile::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(TQRegExp("\""), "");
+        }
+        TQFile version_file(version_plist);
+        if (version_file.open(IO_ReadOnly)) {
+            debug_msg(1, "pbuilder: version.plist: Reading file: %s", version_plist.latin1());
+            TQTextStream plist(&version_file);
+
+            bool in_dict = false;
+            TQString current_key;
+            TQRegExp keyreg("^<key>(.*)</key>$"), stringreg("^<string>(.*)</string>$");
+            while(!plist.atEnd()) {
+                TQString 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 TQString &where)
+{
+    int ret = 0; //absolute is the default..
+    if(TQDir::isRelativePath(where))
+	ret = 4; //relative
+    return ret;
+}
+
+TQString
+ProjectBuilderMakefileGenerator::projectSuffix() const
+{
+    const int pbVersion = pbuilderVersion();
+    if(pbVersion >= 42)
+        return ".xcodeproj";
+    else if(pbVersion >= 38)
+        return ".xcode";
+    return ".pbproj";
+}
+
+TQString
+ProjectBuilderMakefileGenerator::pbxbuild()
+{
+    if(TQFile::exists("/usr/bin/pbbuild"))
+	return "pbbuild";
+    if(TQFile::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 000000000..df314060e
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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
+{
+    TQString pbx_dir;
+    int pbuilderVersion() const;
+    bool writeSubdirs(TQTextStream &, bool);
+    bool writeMakeParts(TQTextStream &);
+    bool writeMakefile(TQTextStream &);
+
+    TQString pbxbuild();
+    TQMap<TQString, TQString> keys;
+    TQString keyFor(const TQString &file);
+    TQString fixQuotes(const TQString &val);
+    TQString fixEnvs(const TQString &file);
+    TQString fixEnvsList(const TQString &where);
+    int     reftypeForFile(const TQString &where);
+    TQString projectSuffix() const;
+
+public:
+    ProjectBuilderMakefileGenerator(TQMakeProject *p);
+    ~ProjectBuilderMakefileGenerator();
+
+    virtual bool openOutput(TQFile &) 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 000000000..18f42be79
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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')
+
+TQString mkdir_p_asstring(const TQString &dir)
+{
+    TQString 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 TQString& fullPath)
+{
+    if(TQFile::exists(fullPath))
+	return FALSE;
+    TQDir dirTmp;
+    bool ret = TRUE;
+    TQString pathComponent, tmpPath;
+    TQStringList hierarchy = TQStringList::split(TQString(Option::dir_sep), fullPath, TRUE);
+    for(TQStringList::Iterator it = hierarchy.begin(); it != hierarchy.end(); ++it) {
+	pathComponent = *it + TQDir::separator();
+	tmpPath += pathComponent;
+	if(!dirTmp.mkdir(tmpPath)) {
+	    ret = FALSE;
+//	    break;
+	}
+    }
+    return ret;
+}
+
+
+MakefileGenerator::MakefileGenerator(TQMakeProject *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 TQString &fn_target)
+{
+    if(!findMocDestination(fn_target).isEmpty())
+	return TRUE;
+
+    TQString fn_local = Option::fixPathToLocalOS(fileFixify(fn_target, TQDir::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);
+		TQString 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(TQStringList::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(TQStringList::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(TQPtrList<MakefileDependDir> &dirs, const TQString &f, bool recurse)
+{
+    if(processedDependencies(f))
+	return TRUE;
+    setProcessedDependencies(f, TRUE);
+
+    TQStringList &fndeps = findDependencies(f);
+    TQString fn = fileFixify(f, TQDir::currentDirPath(), Option::output_dir);
+    fn = Option::fixPathToLocalOS(fn, FALSE);
+    TQString 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
+
+    TQString 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++) {
+	TQStringList *outdeps=&fndeps;
+	TQString 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';
+		    TQString 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';
+			    TQString where = big_buffer + x;
+			    *(big_buffer + x + val_len) = saved;
+			    if(where == "in implementation") {
+				TQString 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;
+		TQStringList &nodeplist = project->values("SKIP_DEPENDS");
+		for(TQStringList::Iterator it = nodeplist.begin();
+		    it != nodeplist.end(); ++it) {
+		    TQRegExp regx((*it));
+		    if(regx.search(inc) != -1) {
+			found = TRUE;
+			break;
+		    }
+		}
+		if(found)
+		    continue;
+	    }
+	    TQString 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 + TQDir::separator() + inc, &fst) &&
+			   !S_ISDIR(fst.st_mode)) {
+			    fqn = mdd->real_dir + TQDir::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?
+		    TQString 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())) {
+			TQString uip = inc_file.left(extn) + Option::ui_ext;
+			TQStringList uil = project->variables()["FORMS"];
+			for(TQStringList::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, TQDir::currentDirPath(), Option::output_dir);
+				goto cache_fqn;
+			    }
+			}
+		    }
+		    if(project->isActiveConfig("lex_included")) { //is this the lex file?
+			TQString rhs = Option::lex_mod + Option::cpp_ext.first();
+			if(inc.endsWith(rhs)) {
+			    TQString lhs = inc.left(inc.length() - rhs.length()) + Option::lex_ext;
+			    TQStringList ll = project->variables()["LEXSOURCES"];
+			    for(TQStringList::Iterator it = ll.begin(); it != ll.end(); ++it) {
+				TQString 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, TQDir::currentDirPath(), Option::output_dir);
+				    goto cache_fqn;
+				}
+			    }
+			}
+		    }
+		    { //is it from a .y?
+			TQString rhs = Option::yacc_mod + Option::h_ext.first();
+			if(inc.endsWith(rhs)) {
+			    TQString lhs = inc.left(inc.length() - rhs.length()) + Option::yacc_ext;
+			    TQStringList yl = project->variables()["YACCSOURCES"];
+			    for(TQStringList::Iterator it = yl.begin(); it != yl.end(); ++it) {
+				TQString 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, TQDir::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) )) {
+			TQString mocs[] = { TQString("_HDRMOC"), TQString("_SRCMOC"), TQString::null };
+			for(int moc = 0; !mocs[moc].isNull(); moc++) {
+			    TQStringList &l = project->variables()[mocs[moc]];
+			    for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+				TQString 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(TQStringList::Iterator fnit = fndeps.begin(); fnit != fndeps.end(); ++fnit) {
+	    generateDependencies(dirs, (*fnit), recurse);
+	    TQStringList &deplist = findDependencies((*fnit));
+	    for(TQStringList::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;
+    TQMap<TQString, TQStringList> &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")) {
+		TQString root = v["QMAKE_ABSOLUTE_SOURCE_ROOT"].first();
+		root = Option::fixPathToTargetOS( root );
+		if(!root.isEmpty()) {
+		    TQFileInfo fi(Option::mkfile::cachefile);
+		    if(!fi.convertToAbs()) {
+			TQString 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(TQFile::exists(pwd))
+				v.insert("QMAKE_ABSOLUTE_SOURCE_PATH", pwd);
+			}
+		    }
+		}
+	    }
+	}
+	if(!v["QMAKE_ABSOLUTE_SOURCE_PATH"].isEmpty()) {
+	    TQString &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();
+	}
+	TQString currentDir = TQDir::currentDirPath();
+	TQString dirs[] = { TQString("OBJECTS_DIR"), TQString("MOC_DIR"), TQString("UI_HEADERS_DIR"),
+			   TQString("UI_SOURCES_DIR"), TQString("UI_DIR"), TQString("DESTDIR"),
+			   TQString("SUBLIBS_DIR"), TQString("DLLDESTDIR"), TQString::null };
+	for(int x = 0; dirs[x] != TQString::null; x++) {
+	    if ( !v[dirs[x]].isEmpty() ) {
+		TQString 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
+		{
+		    TQString &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;
+
+		TQString path = project->first(dirs[x]); //not to be changed any further
+		path = Option::fixPathToTargetOS(fileFixify(path, TQDir::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());
+
+		TQDir 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 ( !TQDir::isRelativePath( path ) ) {
+		    if ( TQFile::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
+		    TQStringList subs = TQStringList::split(Option::dir_sep, path);
+		    for(TQStringList::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() ) {
+	    TQDir d(v["DESTDIR"].first());
+	    if(Option::fixPathToLocalOS(d.absPath()) == Option::fixPathToLocalOS(Option::output_dir))
+		v.remove("DESTDIR");
+	}
+	TQDir::current().cd( currentDir );
+}
+
+void
+MakefileGenerator::init()
+{
+    initOutPaths();
+    if(init_already)
+	return;
+    init_already = TRUE;
+
+    TQMap<TQString, TQStringList> &v = project->variables();
+    TQString paths[] = { TQString("SOURCES"), TQString("FORMS"), TQString("YACCSOURCES"), TQString("INCLUDEPATH"),
+			TQString("HEADERS"), TQString("HEADERS_ORIG"), TQString("LEXSOURCES"),
+			TQString("QMAKE_INTERNAL_INCLUDED_FILES"),
+			TQString("PRECOMPILED_HEADER"), TQString::null };
+    for(int y = 0; paths[y] != TQString::null; y++) {
+	TQStringList &l = v[paths[y]];
+	for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	    if ((*it).isEmpty())
+		continue;
+	    if(TQFile::exists((*it)))
+		(*it) = fileFixify((*it));
+	}
+    }
+
+    /* get deps and mocables */
+    TQDict<void> cache_found_files;
+    TQString 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(TQDir::separator()) == -1) //guess they know what they are doing..
+	cache_file.prepend(Option::output_dir + TQDir::separator());
+    if((Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT ||
+	Option::mkfile::do_deps || Option::mkfile::do_mocs) && !noIO()) {
+	TQPtrList<MakefileDependDir> deplist;
+	deplist.setAutoDelete(TRUE);
+	if((Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT || Option::mkfile::do_deps) &&
+	   doDepends()) {
+	    TQStringList incDirs = v["DEPENDPATH"] + v["QMAKE_ABSOLUTE_SOURCE_PATH"];
+	    if(project->isActiveConfig("depend_includepath"))
+		incDirs += v["INCLUDEPATH"];
+	    for(TQStringList::Iterator it = incDirs.begin(); it != incDirs.end(); ++it) {
+		TQString 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")) {
+		TQFile cachef(cache_file);
+		if(cachef.open(IO_ReadOnly | IO_Translate)) {
+		    TQFileInfo cachefi(cache_file);
+		    debug_msg(2, "Trying internal cache information: %s", cache_file.latin1());
+		    TQTextStream cachet(&cachef);
+		    TQString 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 TQStringList &l = project->variables()[file];
+				    if(!l.isEmpty() && !line.isEmpty() && l.join(" ") != line)
+					break;
+				}
+			    } else if(state == CacheDepend) {
+				bool found = (bool)cache_found_files[file];
+				TQStringList files = TQStringList::split(" ", line);
+				if(!found) {
+				    TQFileInfo fi(fileFixify(file, TQDir::currentDirPath(), Option::output_dir));
+				    if(fi.exists() && fi.lastModified() < cachefi.lastModified()) {
+					cache_found_files.insert(file, (void *)1);
+					found = TRUE;
+				    }
+				}
+				if(found) {
+				    for(TQStringList::Iterator dep_it = files.begin();
+					dep_it != files.end(); ++dep_it) {
+					if(!cache_found_files[(*dep_it)]) {
+					    TQFileInfo fi(fileFixify((*dep_it), TQDir::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 {
+					TQFileInfo fi(fileFixify(file, TQDir::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(TQStringList::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(TQStringList::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()) {
+	    TQString sources[] = { TQString("OBJECTS"), TQString("LEXSOURCES"), TQString("YACCSOURCES"),
+				  TQString("HEADERS"), TQString("SOURCES"), TQString("FORMS"), 
+				  TQString("PRECOMPILED_HEADER"), TQString::null };
+	    depHeuristics.clear();
+	    bool write_cache = FALSE, read_cache = TQFile::exists(cache_file);
+	    int x;
+	    for(x = 0; sources[x] != TQString::null; x++) {
+		TQStringList vpath, &l = v[sources[x]];
+		for(TQStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) {
+		    if(!(*val_it).isEmpty()) {
+			TQString file = fileFixify((*val_it), TQDir::currentDirPath(), Option::output_dir);
+			if(!TQFile::exists(file)) {
+			    bool found = FALSE;
+			    if(TQDir::isRelativePath((*val_it))) {
+				if(vpath.isEmpty())
+				    vpath = v["VPATH_" + sources[x]] + v["VPATH"] +
+					    v["QMAKE_ABSOLUTE_SOURCE_PATH"] + v["DEPENDPATH"];
+
+				for(TQStringList::Iterator vpath_it = vpath.begin();
+				    vpath_it != vpath.end(); ++vpath_it) {
+				    TQString real_dir = Option::fixPathToLocalOS((*vpath_it));
+				    if(TQFile::exists(real_dir + TQDir::separator() + (*val_it))) {
+					TQString 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) {
+				TQString 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),
+							  TQDir::currentDirPath(), Option::output_dir);
+				    regex = regex.right(regex.length() - dir.length());
+				}
+				if(real_dir.isEmpty() || TQFile::exists(real_dir)) {
+				    TQDir 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++) {
+					    TQString 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(), TQDir::separator(), regex.latin1(),
+					      real_dir.latin1());
+				    warn_msg(WarnLogic, "Failure to find: %s", (*val_it).latin1());
+				}
+			    }
+			}
+		    }
+		}
+	    }
+	    for(x = 0; sources[x] != TQString::null; x++) {
+	        TQStringList &l = v[sources[x]];
+	        for(TQStringList::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) {
+			TQString fixed_file(fileFixify((*val_it), TQDir::currentDirPath(), Option::output_dir));
+			TQString moc = findMocDestination(fixed_file);
+			if(!moc.isEmpty()) {
+			    for(TQStringList::Iterator cppit = Option::cpp_ext.begin();
+				    cppit != Option::cpp_ext.end(); ++cppit) {
+				if(fixed_file.endsWith((*cppit))) {
+				    TQStringList &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)) {
+		TQFile cachef(cache_file);
+		if(cachef.open(IO_WriteOnly | IO_Translate)) {
+		    debug_msg(2, "Writing internal cache information: %s", cache_file.latin1());
+		    TQTextStream 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(TQMap<TQString, TQStringList>::Iterator it = depends.begin();
+			it != depends.end(); ++it)
+			cachet << dependencyKey(it.key()) << " = " << it.data().join(" ") << endl;
+		    cachet << "[mocable]" << endl;
+		    TQString mc, moc_sources[] = { TQString("HEADERS"), TQString("SOURCES"), TQString::null };
+		    for(int x = 0; moc_sources[x] != TQString::null; x++) {
+			TQStringList &l = v[moc_sources[x]];
+			for(TQStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) {
+			    TQString 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
+    {
+	TQStringList &impls = v["LEXIMPLS"];
+	TQStringList &l = v["LEXSOURCES"];
+	for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	    TQString dir;
+	    TQFileInfo fi((*it));
+	    if(fi.dirPath() != ".")
+		dir = fi.dirPath() + Option::dir_sep;
+	    dir = fileFixify(dir, TQDir::currentDirPath(), Option::output_dir);
+	    if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep)
+		dir += Option::dir_sep;
+	    TQString 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
+		TQStringList &lexdeps = findDependencies((*it));
+		TQStringList &impldeps = findDependencies(impl);
+		for(TQStringList::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
+    {
+	TQStringList &decls = v["YACCCDECLS"], &impls = v["YACCIMPLS"];
+	TQStringList &l = v["YACCSOURCES"];
+	for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	    TQString dir;
+	    TQFileInfo fi((*it));
+	    if(fi.dirPath() != ".")
+		dir = fi.dirPath() + Option::dir_sep;
+	    dir = fileFixify(dir, TQDir::currentDirPath(), Option::output_dir);
+	    if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep)
+		dir += Option::dir_sep;
+	    TQString impl = dir + fi.baseName(TRUE) + Option::yacc_mod + Option::cpp_ext.first();
+	    logicWarn(impl, "SOURCES");
+	    TQString 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);
+	    TQStringList &impldeps = findDependencies(impl);
+	    impldeps.append(decl);
+	    // attribute deps of yacc file to impl file
+	    TQStringList &yaccdeps = findDependencies((*it));
+	    for(TQStringList::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.
+		TQString lexsrc = fi.baseName(TRUE) + Option::lex_ext;
+		if(fi.dirPath() != ".")
+		    lexsrc.prepend(fi.dirPath() + Option::dir_sep);
+		if(v["LEXSOURCES"].findIndex(lexsrc) != -1) {
+		    TQString 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
+    {
+	TQStringList &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"));
+	TQStringList &decls = v["UICDECLS"], &impls = v["UICIMPLS"];
+	TQStringList &l = v["FORMS"];
+	for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	    TQString impl, decl;
+	    TQFileInfo fi(Option::fixPathToLocalOS((*it)));
+	    if ( !project->isEmpty("UI_DIR") ) {
+		impl = decl = project->first("UI_DIR");
+		TQString d = fi.dirPath();
+		if( d == ".")
+		    d = TQDir::currentDirPath();
+		d = fileFixify(d, TQDir::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")) ) {
+		    TQString d = fi.dirPath();
+		    if( d == ".")
+			d = TQDir::currentDirPath();
+		    d = fileFixify(d, TQDir::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, TQDir::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 != TQDir::currentDirPath() &&
+	       project->isEmpty("UI_DIR") && project->isEmpty("UI_HEADERS_DIR")) {
+		TQString decl_fixed = fileFixify(decl, TQDir::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, TQDir::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);
+
+	    TQString 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")) {
+	TQStringList &trf = project->variables()["TRANSLATIONS"];
+	for(TQStringList::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());
+	TQString 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"] = TQStringList(imgfile);
+	}
+	logicWarn(imgfile, "SOURCES");
+	if(!noIO()) {
+	    TQStringList &l = v["IMAGES"];
+	    for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+		if(!TQFile::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 != TQDir::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");
+
+	TQStringList &l = v["SRCMOC"];
+	l = v["_HDRMOC"] + v["_UIMOC"] + v["_SRCMOC"];
+	for(TQStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) {
+	    if(!(*val_it).isEmpty())
+		(*val_it) = Option::fixPathToTargetOS((*val_it), FALSE);
+	}
+    }
+
+    TQString fixpaths[] = { TQString("PRE_TARGETDEPS"), TQString("POST_TARGETDEPS"), TQString::null };
+    for(int path = 0; !fixpaths[path].isNull(); path++) {
+	TQStringList &l = v[fixpaths[path]];
+	for(TQStringList::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
+    TQStringList &ipl = project->variables()["INCLUDEPATH"];
+    for(TQStringList::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(TQString &file)
+{
+    bool ret = FALSE, try_replace_file=FALSE;
+    TQString meta_file, orig_file = file;
+    if(TQMakeMetaInfo::libExists(file)) {
+	try_replace_file = TRUE;
+	meta_file = file;
+	file = "";
+    } else {
+	TQString tmp = file;
+	int ext = tmp.findRev('.');
+	if(ext != -1)
+	    tmp = tmp.left(ext);
+	meta_file = tmp;
+    }
+    meta_file = fileFixify(meta_file);
+    if(!TQMakeMetaInfo::libExists(fileFixify(meta_file, TQDir::currentDirPath(), Option::output_dir)) &&
+       project->isActiveConfig("qt")) {
+	TQString 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 == "tqt-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;
+	}
+    }
+    TQString real_meta_file = Option::fixPathToLocalOS(meta_file);
+    if(project->variables()["QMAKE_PRL_INTERNAL_FILES"].findIndex(TQMakeMetaInfo::findLib(meta_file)) != -1) {
+	ret = TRUE;
+    } else if(!meta_file.isEmpty()) {
+	TQString f = fileFixify(real_meta_file, TQDir::currentDirPath(), Option::output_dir);
+	if(TQMakeMetaInfo::libExists(f)) {
+	    TQMakeMetaInfo 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;
+		TQMap<TQString, TQStringList> &vars = libinfo.variables();
+		for( TQMap<TQString, TQStringList>::Iterator it = vars.begin(); it != vars.end(); ++it)
+		    processPrlVariable(it.key(), it.data());
+		if(try_replace_file && !libinfo.isEmpty("QMAKE_PRL_TARGET")) {
+		    TQString 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(TQDir::isRelativePath(file))
+			file.prepend(dir);
+		}
+	    }
+	}
+	if(ret) {
+	    TQString mf = TQMakeMetaInfo::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 TQString &var, const TQStringList &l)
+{
+    if(var == "QMAKE_PRL_LIBS") {
+	TQString where = "QMAKE_LIBS";
+	if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
+	    where = project->first("QMAKE_INTERNAL_PRL_LIBS");
+	TQStringList &out = project->variables()[where];
+	for(TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
+	    if( out.findIndex((*it)) == -1)
+		out.append((*it));
+	}
+    } else if(var == "QMAKE_PRL_DEFINES") {
+	TQStringList &out = project->variables()["DEFINES"];
+	for(TQStringList::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()
+{
+    TQDict<void> processed;
+    for(bool ret = FALSE; TRUE; ret = FALSE) {
+	//read in any prl files included..
+	TQStringList l_out;
+	TQString where = "QMAKE_LIBS";
+	if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
+	    where = project->first("QMAKE_INTERNAL_PRL_LIBS");
+	TQStringList &l = project->variables()[where];
+	for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	    TQString 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(TQTextStream &t)
+{
+    TQString target = project->first("TARGET");
+    int slsh = target.findRev(Option::dir_sep);
+    if(slsh != -1)
+	target = target.right(target.length() - slsh - 1);
+    TQString bdir = Option::output_dir;
+    if(bdir.isEmpty())
+	bdir = TQDir::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")) {
+	TQStringList 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(TQStringList::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_RETQUIREMENTS"].isEmpty() &&
+       project->isActiveConfig("create_prl") && project->first("TEMPLATE") == "lib" &&
+       !project->isActiveConfig("plugin")) {
+	TQString 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"));
+	TQString local_prl = Option::fixPathToLocalOS(fileFixify(prl, TQDir::currentDirPath(), Option::output_dir));
+	TQFile ft(local_prl);
+	if(ft.open(IO_WriteOnly)) {
+	    project->variables()["ALL_DEPS"].append(prl);
+	    project->variables()["QMAKE_INTERNAL_PRL_FILE"].append(prl);
+	    TQTextStream 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) {
+	TQTextStream t(&Option::output);
+	writeMakefile(t);
+    }
+    return TRUE;
+}
+
+// Manipulate directories, so it's possible to build
+// several cross-platform targets concurrently
+void
+MakefileGenerator::usePlatformDir()
+{
+    TQString pltDir(project->first("QMAKE_PLATFORM_DIR"));
+    if(pltDir.isEmpty())
+	return;
+    char sep = TQDir::separator();
+    TQString slashPltDir = sep + pltDir;
+
+    TQString 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(TQTextStream &t, const TQString &obj, const TQString &src)
+{
+    TQStringList &objl = project->variables()[obj];
+    TQStringList &srcl = project->variables()[src];
+
+    TQStringList::Iterator oit = objl.begin();
+    TQStringList::Iterator sit = srcl.begin();
+    TQString stringSrc("$src");
+    TQString stringObj("$obj");
+    for( ;sit != srcl.end() && oit != objl.end(); oit++, sit++) {
+	if((*sit).isEmpty())
+	    continue;
+
+	if(!doDepends()) {
+	    TQString sdep, odep = (*sit) + " ";
+	    TQStringList deps = findDependencies((*sit));
+	    for(TQStringList::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");
+	}
+
+	TQString comp, cimp;
+	for(TQStringList::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)) {
+	    TQString p = var(comp), srcf(*sit);
+	    p.replace(stringSrc, srcf);
+	    p.replace(stringObj, (*oit));
+	    t << "\n\t" << p;
+	}
+	t << endl << endl;
+    }
+}
+
+
+void
+MakefileGenerator::writeUicSrc(TQTextStream &t, const TQString &ui)
+{
+    TQStringList &uil = project->variables()[ui];
+    for(TQStringList::Iterator it = uil.begin(); it != uil.end(); it++) {
+	TQString decl, impl;
+	{
+	    TQString tmp = (*it), impl_dir, decl_dir;
+	    decl = tmp.replace(TQRegExp("\\" + Option::ui_ext + "$"), Option::h_ext.first());
+	    int dlen = decl.findRev(Option::dir_sep) + 1;
+	    tmp = (*it);
+	    impl = tmp.replace(TQRegExp("\\" + 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, TQDir::currentDirPath(), Option::output_dir);
+	    decl = fileFixify(decl, TQDir::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 (TQDir::isRelativePath(impl_dir))
+		impl_dir.prepend(Option::output_dir + Option::dir_sep);
+	    if (TQDir::isRelativePath(decl_dir))
+		decl_dir.prepend(Option::output_dir + Option::dir_sep);
+	    createDir(impl_dir);
+	    createDir(decl_dir);
+	}
+	TQStringList 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;
+
+	TQString mildDecl = decl;
+	int k = mildDecl.findRev(Option::dir_sep);
+	if ( k != -1 )
+	    mildDecl = mildDecl.mid( k + 1 );
+	t << impl << ": " << decl << " " << (*it) << " ";
+        if(TQFile::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(TQTextStream &t, const TQString &obj, const TQString &src)
+{
+    TQStringList &objl = project->variables()[obj],
+		&srcl = project->variables()[src];
+    TQStringList::Iterator oit = objl.begin(), sit = srcl.begin();
+    TQString stringSrc("$src"), stringObj("$obj");
+    for( ;sit != srcl.end() && oit != objl.end(); oit++, sit++) {
+	TQString 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")) {
+	    TQString 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(TQTextStream &t, const TQString &src)
+{
+    TQStringList &l = project->variables()[src];
+    for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	TQString m = Option::fixPathToTargetOS(findMocDestination(*it));
+	if ( !m.isEmpty()) {
+	    TQString 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(TQTextStream &t, const TQString &src)
+{
+    TQStringList &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");
+    TQString 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");
+    TQString stringBase("$base");
+    for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	TQFileInfo fi((*it));
+	TQString dir;
+	if(fi.dirPath() != ".")
+	    dir = fi.dirPath() + Option::dir_sep;
+	dir = fileFixify(dir, TQDir::currentDirPath(), Option::output_dir);
+	if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep)
+	    dir += Option::dir_sep;
+
+	TQString impl = dir + fi.baseName(TRUE) + Option::yacc_mod + Option::cpp_ext.first();
+	TQString decl = dir + fi.baseName(TRUE) + Option::yacc_mod + Option::h_ext.first();
+
+	TQString 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;
+	}
+	TQString 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(TQTextStream &t, const TQString &src)
+{
+    TQStringList &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");
+    TQString default_out_c = "lex.$base.c";
+    if(!project->isEmpty("QMAKE_LEX_SOURCE"))
+	default_out_c = project->first("QMAKE_LEX_SOURCE");
+    TQString stringBase("$base");
+    for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	TQFileInfo fi((*it));
+	TQString dir;
+	if(fi.dirPath() != ".")
+	    dir = fi.dirPath() + Option::dir_sep;
+	dir = fileFixify(dir, TQDir::currentDirPath(), Option::output_dir);
+	if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep)
+	    dir += Option::dir_sep;
+	TQString impl = dir + fi.baseName(TRUE) + Option::lex_mod + Option::cpp_ext.first();
+
+	TQString lexflags = "$(LEXFLAGS)", stub="yy";
+	if(!project->isActiveConfig("yacc_no_name_mangle")) {
+	    stub = fi.baseName(TRUE);
+	    lexflags += " -P" + stub;
+	}
+	TQString 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(TQTextStream &t, const TQString &obj)
+{
+    TQStringList &objl = project->variables()[obj];
+    TQString stringSrc("$src");
+    TQString stringObj("$obj");
+
+    TQString uidir;
+    for(TQStringList::Iterator oit = objl.begin(); oit != objl.end(); oit++) {
+        TQString 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")) {
+	    TQString 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(TQTextStream &t, const TQString &src)
+{
+    TQStringList &l = project->variables()[src];
+    for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	TQString 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(TQTextStream &t, const TQString &installs)
+{
+    TQString all_installs, all_uninstalls;
+    TQStringList &l = project->variables()[installs];
+    for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	TQString 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 TQString root = "$(INSTALL_ROOT)";
+	TQString target, dst= fileFixify(project->variables()[pvar].first());
+	if(dst.right(1) != Option::dir_sep)
+	    dst += Option::dir_sep;
+	TQStringList 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(TQStringList::Iterator wild_it = tmp.begin(); wild_it != tmp.end(); ++wild_it) {
+		TQString wild = Option::fixPathToLocalOS((*wild_it), FALSE), wild_var = fileFixify(wild);
+		TQString dirstr = TQDir::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(TQFile::exists(wild)) { //real file
+		    TQString file = wild;
+		    TQFileInfo fi(wild);
+		    if(!target.isEmpty())
+			target += "\t";
+		    TQString cmd =  TQString(fi.isDir() ? "-$(INSTALL_DIR)" : "-$(INSTALL_FILE)") + " \"" +
+				   Option::fixPathToTargetOS(fileFixify(wild, TQString::null,
+									TQString::null, FALSE, FALSE), FALSE) +
+				   "\" \"" + root + dst + "\"\n";
+		    target += cmd;
+		    if(!project->isActiveConfig("debug") &&
+		       !fi.isDir() && fi.isExecutable() && !project->isEmpty("QMAKE_STRIP"))
+			target += TQString("\t-") + var("QMAKE_STRIP") + " \"" +
+				  root + fileFixify(dst + filestr, TQString::null, TQString::null, FALSE, FALSE) +
+				  "\"\n";
+		    if(!uninst.isEmpty())
+			uninst.append("\n\t");
+		    uninst.append(
+#ifdef Q_WS_WIN
+		    TQString("-$(DEL_FILE)")
+#else
+		    TQString("-$(DEL_FILE) -r")
+#endif
+		    + " \"" + root + fileFixify(dst + filestr, TQString::null, TQString::null, FALSE, FALSE) + "\"");
+		    continue;
+		}
+		fixEnvVariables(dirstr);
+		TQDir dir(dirstr, filestr);		    //wild
+		for(uint x = 0; x < dir.count(); x++) {
+		    TQString file = dir[x];
+		    if(file == "." || file == "..") //blah
+			continue;
+		    if(!uninst.isEmpty())
+			uninst.append("\n\t");
+		    uninst.append(
+#ifdef Q_WS_WIN
+			TQString("-$(DEL_FILE)")
+#else
+			TQString("-$(DEL_FILE) -r")
+#endif
+			+ " \"" + root + fileFixify(dst + file, TQString::null, TQString::null, FALSE, FALSE) +
+			"\"");
+		    TQFileInfo fi(Option::fixPathToTargetOS(fileFixify(dirstr + file), TRUE));
+		    if(!target.isEmpty())
+			target += "\t";
+		    TQString cmd = TQString(fi.isDir() ? "-$(INSTALL_DIR)" : "-$(INSTALL_FILE)") + " \"" +
+				  Option::fixPathToTargetOS(fileFixify(dirstr + file, TQString::null,
+								       TQString::null, FALSE, FALSE), FALSE) +
+				  "\" \"" + root + dst + "\"\n";
+		    target += cmd;
+		    if(!project->isActiveConfig("debug") &&
+		       !fi.isDir() && fi.isExecutable() && !project->isEmpty("QMAKE_STRIP"))
+			target += TQString("\t-") + var("QMAKE_STRIP") + " \"" +
+				  root + fileFixify(dst + file, TQString::null, TQString::null, FALSE, FALSE) +
+				  "\"\n";
+		}
+	    }
+	}
+	//default?
+	if(do_default) {
+	    target = defaultInstall((*it));
+	    uninst = project->variables()[(*it) + ".uninstall"];
+	}
+
+	if(!target.isEmpty()) {
+	    t << "install_" << (*it) << ": all ";
+	    const TQStringList &deps = project->variables()[(*it) + ".depends"];
+	    if(!deps.isEmpty()) {
+		for(TQStringList::ConstIterator dep_it = deps.begin(); dep_it != deps.end(); ++dep_it) {
+		    TQString targ = var((*dep_it) + ".target");
+		    if(targ.isEmpty())
+			targ = (*dep_it);
+		    t << targ;
+		}
+	    }
+	    t << "\n\t";
+	    const TQStringList &dirs = project->variables()[pvar];
+	    for(TQStringList::ConstIterator pit = dirs.begin(); pit != dirs.end(); ++pit) {
+		TQString 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 += TQString("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";
+}
+
+TQString
+MakefileGenerator::var(const TQString &var)
+{
+    return val(project->variables()[var]);
+}
+
+TQString
+MakefileGenerator::val(const TQStringList &varList)
+{
+    return valGlue(varList, "", " ", "");
+}
+
+TQString
+MakefileGenerator::varGlue(const TQString &var, const TQString &before, const TQString &glue, const TQString &after)
+{
+    return valGlue(project->variables()[var], before, glue, after);
+}
+
+TQString
+MakefileGenerator::valGlue(const TQStringList &varList, const TQString &before, const TQString &glue, const TQString &after)
+{
+    TQString ret;
+    for(TQStringList::ConstIterator it = varList.begin(); it != varList.end(); ++it) {
+	if(!(*it).isEmpty()) {
+	    if(!ret.isEmpty())
+		ret += glue;
+	    ret += (*it);
+	}
+    }
+    return ret.isEmpty() ? TQString("") : before + ret + after;
+}
+
+
+TQString
+MakefileGenerator::varList(const TQString &var)
+{
+    return valList(project->variables()[var]);
+}
+
+TQString
+MakefileGenerator::valList(const TQStringList &varList)
+{
+    return valGlue(varList, "", " \\\n\t\t", "");
+}
+
+
+TQStringList
+MakefileGenerator::createObjectList(const TQString &var)
+{
+    TQStringList &l = project->variables()[var], ret;
+    TQString objdir, dir;
+    if(!project->variables()["OBJECTS_DIR"].isEmpty())
+	objdir = project->first("OBJECTS_DIR");
+    for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	TQFileInfo fi(Option::fixPathToLocalOS((*it)));
+	if(objdir.isEmpty() && project->isActiveConfig("object_with_source")) {
+	    TQString 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(TQTextStream &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;
+}
+
+TQString MakefileGenerator::buildArgs()
+{
+    static TQString 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(TQStringList::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(TQStringList::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..
+TQString MakefileGenerator::build_args()
+{
+    static TQString ret;
+    if(ret.isEmpty()) {
+	ret = "$(QMAKE)";
+
+	// general options and arguments
+	ret += buildArgs();
+
+	//output
+	TQString ofile = Option::fixPathToTargetOS(fileFixify(Option::output.name()));
+	if (!ofile.isEmpty() && ofile != project->first("QMAKE_MAKEFILE"))
+	    ret += " -o " + ofile;
+
+	//inputs
+	TQStringList files = fileFixify(Option::mkfile::project_files);
+	ret += " " + files.join(" ");
+    }
+    return ret;
+}
+
+bool
+MakefileGenerator::writeHeader(TQTextStream &t)
+{
+    time_t foo = time(NULL);
+    t << "#############################################################################" << endl;
+    t << "# Makefile for building: " << var("TARGET") << endl;
+    t << "# Generated by qmake (" << qmake_version() << ") (TQt " << 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(TQTextStream &t)
+{
+    TQString ofile = Option::fixPathToTargetOS(fileFixify(Option::output.name()));
+    if(project->isEmpty("QMAKE_FAILED_RETQUIREMENTS") && !project->isActiveConfig("no_autoqmake") &&
+       !project->isEmpty("QMAKE_INTERNAL_PRL_FILE")) {
+	TQStringList files = fileFixify(Option::mkfile::project_files);
+	t << project->first("QMAKE_INTERNAL_PRL_FILE") << ": " << "\n\t"
+	  << "@$(QMAKE) -prl " << buildArgs() << " " << files.join(" ") << endl;
+    }
+
+    TQString pfile = project->projectFile();
+    if(pfile != "(stdin)") {
+	TQString 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 (TQFile::exists(Option::fixPathToLocalOS(specdir()+TQDir::separator()+"qmake.conf")))
+		    t << specdir() << Option::dir_sep << "qmake.conf" << " ";
+		else if (TQFile::exists(Option::fixPathToLocalOS(specdir()+TQDir::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;
+}
+
+TQStringList
+MakefileGenerator::fileFixify(const TQStringList& files, const TQString &out_dir, const TQString &in_dir,
+			      bool force_fix, bool canon) const
+{
+    if(files.isEmpty())
+	return files;
+    TQStringList ret;
+    for(TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it) {
+	if(!(*it).isEmpty())
+	    ret << fileFixify((*it), out_dir, in_dir, force_fix, canon);
+    }
+    return ret;
+}
+
+TQString
+MakefileGenerator::fileFixify(const TQString& file0, const TQString &out_d,
+			      const TQString &in_d, bool force_fix, bool canon) const
+{
+    if(file0.isEmpty())
+	return file0;
+    TQString key = file0;
+    if(TQDir::isRelativePath(file0))
+	key.prepend(TQDir::currentDirPath() + "--");
+    if(!in_d.isEmpty() || !out_d.isEmpty() || force_fix || !canon)
+	key.prepend(in_d + "--" + out_d + "--" + TQString::number((int)force_fix) + "--" +
+		    TQString::number((int)canon) + "-");
+    if(fileFixed.contains(key))
+	return fileFixed[key];
+
+    TQString 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;
+    }
+
+    TQChar quote;
+    if((file.startsWith("'") || file.startsWith("\"")) && file.startsWith(file.right(1))) {
+	quote = file.at(0);
+	file = file.mid(1, file.length() - 2);
+    }
+    TQString orig_file = file;
+    if(!force_fix && project->isActiveConfig("no_fixpath")) {
+	if(!project->isEmpty("QMAKE_ABSOLUTE_SOURCE_PATH")) { //absoluteify it
+	    TQString qfile = Option::fixPathToLocalOS(file, TRUE, canon);
+	    if(TQDir::isRelativePath(file)) { //already absolute
+		TQFileInfo fi(qfile);
+		if(!fi.convertToAbs()) //strange
+		    file = fi.filePath();
+	    }
+	}
+    } else { //fix it..
+	TQString qfile(Option::fixPathToLocalOS(file, TRUE, canon)), in_dir(in_d), out_dir(out_d);
+	{
+	    if(out_dir.isNull() || TQDir::isRelativePath(out_dir))
+		out_dir.prepend(Option::output_dir + TQDir::separator());
+	    if(out_dir == ".")
+		out_dir = TQDir::currentDirPath();
+	    if(in_dir.isEmpty() || TQDir::isRelativePath(in_dir))
+		in_dir.prepend(TQDir::currentDirPath() + TQDir::separator());
+	    if(in_dir == ".")
+		in_dir = TQDir::currentDirPath();
+
+	    if(!TQDir::isRelativePath(in_dir) || !TQDir::isRelativePath(out_dir)) {
+		TQFileInfo in_fi(in_dir);
+		if(!in_fi.convertToAbs())
+		    in_dir = in_fi.filePath();
+		TQFileInfo out_fi(out_dir);
+		if(!out_fi.convertToAbs())
+		    out_dir = out_fi.filePath();
+	    }
+	    TQString in_canonical_dir = TQDir(in_dir).canonicalPath(),
+		   out_canonical_dir = TQDir(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 || !TQDir::isRelativePath(qfile)) {
+	    if(TQDir::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 && TQFile::exists(file) && file == Option::fixPathToTargetOS(file, TRUE, canon)) {
+		TQString real_file = TQDir(file).canonicalPath();
+		if(!real_file.isEmpty())
+                    file = Option::fixPathToTargetOS(real_file, false, canon);
+	    }
+	    TQString 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;
+}
+
+TQString
+MakefileGenerator::cleanFilePath(const TQString &file) const
+{
+    return fileFixify(Option::fixPathToTargetOS(file));
+}
+
+void MakefileGenerator::logicWarn(const TQString &f, const TQString &w)
+{
+    if(!(Option::warn_level & WarnLogic))
+	return;
+    TQString file = f;
+    int slsh = f.findRev(Option::dir_sep);
+    if(slsh != -1)
+	file = file.right(file.length() - slsh - 1);
+    TQStringList &l = project->variables()[w];
+    for(TQStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) {
+	TQString 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;
+	}
+    }
+}
+
+TQString 
+MakefileGenerator::dependencyKey(const TQString &file) const
+{
+     TQString 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 TQString &file, bool b)
+{
+    depProcessed[dependencyKey(file)] = b;
+}
+
+bool 
+MakefileGenerator::processedDependencies(const TQString &file)
+{
+    TQString key = dependencyKey(file);
+    if(!depProcessed.contains(key))
+	return FALSE;
+    return depProcessed[key];
+}
+
+TQStringList
+&MakefileGenerator::findDependencies(const TQString &file)
+{
+    return depends[dependencyKey(file)];
+}
+
+
+TQString
+MakefileGenerator::specdir()
+{
+    if(!spec.isEmpty())
+	return spec;
+    spec = Option::mkfile::qmakespec;
+#if 0
+    if(const char *d = getenv("QTDIR")) {
+	TQString qdir = Option::fixPathToTargetOS(TQString(d));
+	if(qdir.endsWith(TQString(TQChar(TQDir::separator()))))
+	    qdir.truncate(qdir.length()-1);
+	//fix path
+	TQFileInfo fi(spec);
+	TQString 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(TQFile &file) const
+{
+    {
+	TQString outdir;
+	if(!file.name().isEmpty()) {
+	    if(TQDir::isRelativePath(file.name()))
+		file.setName(Option::output_dir + file.name()); //pwd when qmake was run
+	    TQFileInfo fi(file);
+	    if(fi.isDir())
+		outdir = file.name() + TQDir::separator();
+	}
+	if(!outdir.isEmpty() || file.name().isEmpty()) {
+	    TQString fname = "Makefile";
+	    if(!project->isEmpty("MAKEFILE"))
+	       fname = project->first("MAKEFILE");
+	    file.setName(outdir + fname);
+	}
+    }
+    if(TQDir::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)) {
+	TQFileInfo fi(Option::output);
+	TQString od = Option::fixPathToTargetOS((fi.isSymLink() ? fi.readLink() : fi.dirPath()) );
+	if(TQDir::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(TQMakeProject *proj)
+{
+    if(Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT)
+	return new ProjectGenerator(proj);
+
+    MakefileGenerator *mkfile = NULL;
+    TQString 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(TQRegExp("^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(TQRegExp("^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 000000000..3acbb0237
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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
+{
+    TQString spec;
+    bool init_opath_already, init_already, moc_aware, no_io;
+    TQStringList createObjectList(const TQString &var);
+    TQString build_args();
+    TQString dependencyKey(const TQString &file) const;
+    TQMap<TQString, bool> depProcessed;
+    TQMap<TQString, TQString> depHeuristics, fileFixed;
+    TQMap<TQString, TQString> mocablesToMOC, mocablesFromMOC;
+    TQMap<TQString, TQStringList> depends;
+
+protected:
+    void writeObj(TQTextStream &, const TQString &obj, const TQString &src);
+    void writeUicSrc(TQTextStream &, const TQString &ui);
+    void writeMocObj(TQTextStream &, const TQString &obj, const TQString &src);
+    void writeMocSrc(TQTextStream &, const TQString &src);
+    void writeLexSrc(TQTextStream &, const TQString &lex);
+    void writeYaccSrc(TQTextStream &, const TQString &yac);
+    void writeInstalls(TQTextStream &t, const TQString &installs);
+    void writeImageObj(TQTextStream &t, const TQString &obj);
+    void writeImageSrc(TQTextStream &t, const TQString &images);
+
+protected:
+
+    TQMakeProject *project;
+
+    class MakefileDependDir {
+    public:
+	MakefileDependDir(const TQString &r, const TQString &l) : real_dir(r), local_dir(l) { }
+	TQString real_dir, local_dir;
+    };
+    bool generateDependencies(TQPtrList<MakefileDependDir> &dirs, const TQString &x, bool recurse);
+
+    TQString buildArgs();
+
+    TQString specdir();
+    TQString cleanFilePath(const TQString &file) const;
+    bool generateMocList(const TQString &fn);
+
+    TQString findMocSource(const TQString &moc_file) const;
+    TQString findMocDestination(const TQString &src_file) const;
+    virtual TQStringList &findDependencies(const TQString &file);
+
+    void setNoIO(bool o);
+    bool noIO() const;
+
+    void setMocAware(bool o);
+    bool mocAware() const;
+    void logicWarn(const TQString &, const TQString &);
+
+    virtual bool doDepends() const { return Option::mkfile::do_deps; }
+    bool writeHeader(TQTextStream &);
+    virtual bool writeMakefile(TQTextStream &);
+    virtual bool writeMakeQmake(TQTextStream &);
+    void initOutPaths();
+    virtual void init();
+
+    //for cross-platform dependent directories
+    virtual void usePlatformDir();
+
+    //for installs
+    virtual TQString defaultInstall(const TQString &);
+
+    //for prl
+    bool processPrlFile(TQString &);
+    virtual void processPrlVariable(const TQString &, const TQStringList &);
+    virtual void processPrlFiles();
+    virtual void writePrlFile(TQTextStream &);
+
+    //make sure libraries are found
+    virtual bool findLibraries();
+    virtual TQString findDependency(const TQString &);
+
+    void setProcessedDependencies(const TQString &file, bool b);
+    bool processedDependencies(const TQString &file);
+
+    virtual TQString var(const TQString &var);
+    TQString varGlue(const TQString &var, const TQString &before, const TQString &glue, const TQString &after);
+    TQString varList(const TQString &var);
+    TQString val(const TQStringList &varList);
+    TQString valGlue(const TQStringList &varList, const TQString &before, const TQString &glue, const TQString &after);
+    TQString valList(const TQStringList &varList);
+
+
+    TQString fileFixify(const TQString& file, const TQString &out_dir=TQString::null, 
+		       const TQString &in_dir=TQString::null, bool force_fix=FALSE, bool canon=TRUE) const;
+    TQStringList fileFixify(const TQStringList& files, const TQString &out_dir=TQString::null, 
+			   const TQString &in_dir=TQString::null, bool force_fix=FALSE, bool canon=TRUE) const;
+public:
+    MakefileGenerator(TQMakeProject *p);
+    virtual ~MakefileGenerator();
+
+    static MakefileGenerator *create(TQMakeProject *);
+    virtual bool write();
+    virtual bool openOutput(TQFile &) const;
+};
+
+inline TQString MakefileGenerator::findMocSource(const TQString &moc_file) const
+{
+    TQString tmp = cleanFilePath(moc_file);
+    if (mocablesFromMOC.contains(tmp))
+	return mocablesFromMOC[tmp];
+    else
+	return TQString("");
+}
+
+inline TQString MakefileGenerator::findMocDestination(const TQString &src_file) const
+{
+    TQString tmp = cleanFilePath(src_file);
+    if (mocablesToMOC.contains(tmp))
+	return mocablesToMOC[tmp];
+    else
+	return TQString("");
+}
+
+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 TQString MakefileGenerator::defaultInstall(const TQString &)
+{ return TQString(""); }
+
+inline bool MakefileGenerator::findLibraries()
+{ return TRUE; }
+
+inline TQString MakefileGenerator::findDependency(const TQString &)
+{ return TQString(""); }
+
+inline MakefileGenerator::~MakefileGenerator()
+{ }
+
+TQString mkdir_p_asstring(const TQString &dir);
+
+#endif /* __MAKEFILE_H__ */
diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp
new file mode 100644
index 000000000..4decf2a90
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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>
+
+TQString project_builtin_regx() //calculate the builtin regular expression..
+{ 
+    TQString ret;
+    TQStringList builtin_exts(".c");
+    builtin_exts << Option::ui_ext << Option::yacc_ext << Option::lex_ext << ".ts";
+    builtin_exts += Option::h_ext + Option::cpp_ext;
+    for(TQStringList::Iterator ext_it = builtin_exts.begin(); 
+	ext_it != builtin_exts.end(); ++ext_it) {
+	if(!ret.isEmpty())
+	    ret += "; ";
+	ret += TQString("*") + (*ext_it);
+    }
+    return ret;
+}
+
+
+
+ProjectGenerator::ProjectGenerator(TQMakeProject *p) : MakefileGenerator(p), init_flag(FALSE)
+{
+}
+
+void
+ProjectGenerator::init()
+{
+    if(init_flag)
+	return;
+    int file_count = 0;
+    init_flag = TRUE;
+
+    TQMap<TQString, TQStringList> &v = project->variables();
+    TQString templ = Option::user_template.isEmpty() ? TQString("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"] = TQStringList("unknown");
+
+    //the scary stuff
+    if(project->first("TEMPLATE_ASSIGN") != "subdirs") {
+	TQString builtin_regex = project_builtin_regx();
+	TQStringList dirs = Option::projfile::project_dirs;
+	if(Option::projfile::do_pwd) {
+	    if(!v["INCLUDEPATH"].contains("."))
+		v["INCLUDEPATH"] += ".";
+	    dirs.prepend(TQDir::currentDirPath());
+	}
+
+	for(TQStringList::Iterator pd = dirs.begin(); pd != dirs.end(); pd++) {
+	    TQString dir, regex;
+	    bool add_depend = FALSE;
+	    if(TQFile::exists((*pd))) {
+		TQFileInfo 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) {
+			TQDir d(dir);
+			d.setFilter(TQDir::Dirs);
+			for(int i = 0; i < (int)d.count(); i++) {
+			    if(d[i] != "." && d[i] != "..") 
+				dirs.append(dir + d[i] + TQDir::separator() + builtin_regex);
+			}
+		    }
+		    regex = builtin_regex;
+		} else {
+		    TQString 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) {
+		    TQDir d(dir);
+		    d.setFilter(TQDir::Dirs);
+		    for(int i = 0; i < (int)d.count(); i++) {
+			if(d[i] != "." && d[i] != "..") 
+			    dirs.append(dir + d[i] + TQDir::separator() + regex);
+		    }
+		}
+		TQDir d(dir, regex);
+		for(int i = 0; i < (int)d.count(); i++) {
+		    TQString file = dir + d[i];
+		    if (addFile(file)) {
+			add_depend = TRUE;
+			file_count++;
+		    }
+		}
+	    }
+	    if(add_depend && !dir.isEmpty() && !v["DEPENDPATH"].contains(dir)) {
+		TQFileInfo fi(dir);
+		if(fi.absFilePath() != TQDir::currentDirPath()) 
+		    v["DEPENDPATH"] += fileFixify(dir);
+	    }
+	}
+    }
+    if(!file_count) { //shall we try a subdir?
+	TQStringList dirs = Option::projfile::project_dirs;
+	if(Option::projfile::do_pwd)
+	    dirs.prepend(".");
+	const TQString out_file = fileFixify(Option::output.name());
+	for(TQStringList::Iterator pd = dirs.begin(); pd != dirs.end(); pd++) {
+	    if(TQFile::exists((*pd))) {
+		TQString newdir = (*pd);
+		TQFileInfo fi(newdir);
+		if(fi.isDir()) {
+		    newdir = fileFixify(newdir);
+		    TQStringList &subdirs = v["SUBDIRS"];
+		    if(TQFile::exists(fi.filePath() + TQDir::separator() + fi.fileName() + ".pro") &&
+		       !subdirs.contains(newdir)) {
+			subdirs.append(newdir);
+		    } else {
+			TQDir d(newdir, "*.pro");
+			d.setFilter(TQDir::Files);
+			for(int i = 0; i < (int)d.count(); i++) {
+			    TQString nd = newdir;
+			    if(nd == ".")
+				nd = "";
+			    else if(!nd.isEmpty() && !nd.endsWith(TQString(TQChar(TQDir::separator()))))
+				nd += TQDir::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) {
+			TQDir d(newdir);
+			d.setFilter(TQDir::Dirs);
+			for(int i = 0; i < (int)d.count(); i++) {
+			    TQString nd = fileFixify(newdir + TQDir::separator() + d[i]);
+			    if(d[i] != "." && d[i] != ".." && !dirs.contains(nd))
+				dirs.append(nd);
+			}
+		    }
+		}
+	    } else { //regexp
+		TQString 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));
+		}
+		TQDir d(dir, regx);
+		d.setFilter(TQDir::Dirs);
+		TQStringList &subdirs = v["SUBDIRS"];
+		for(int i = 0; i < (int)d.count(); i++) {
+		    TQString newdir(dir + d[i]);
+		    TQFileInfo fi(newdir);
+		    if(fi.fileName() != "." && fi.fileName() != "..") {
+			newdir = fileFixify(newdir);
+			if(TQFile::exists(fi.filePath() + TQDir::separator() + fi.fileName() + ".pro") &&
+			   !subdirs.contains(newdir)) {
+			   subdirs.append(newdir);
+			} else {
+			    TQDir d(newdir, "*.pro");
+			    d.setFilter(TQDir::Files);
+			    for(int i = 0; i < (int)d.count(); i++) {
+				TQString nd = newdir + TQDir::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;
+    }
+
+    TQPtrList<MakefileDependDir> deplist;
+    deplist.setAutoDelete(TRUE);
+    {
+	TQStringList &d = v["DEPENDPATH"];
+	for(TQStringList::Iterator it = d.begin(); it != d.end(); ++it) {
+	    TQString r = (*it), l = Option::fixPathToLocalOS((*it));
+	    deplist.append(new MakefileDependDir(r, l));
+	}
+    }
+    TQStringList &h = v["HEADERS"];
+    bool no_qt_files = TRUE;
+    TQString srcs[] = { "SOURCES", "YACCSOURCES", "LEXSOURCES", "INTERFACES", TQString::null };
+    for(int i = 0; !srcs[i].isNull(); i++) {
+	TQStringList &l = v[srcs[i]];
+	for(TQStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) {
+	    if(generateDependencies(deplist, (*val_it), TRUE)) {
+		TQStringList &tmp = findDependencies((*val_it));
+		if(!tmp.isEmpty()) {
+		    for(TQStringList::Iterator dep_it = tmp.begin(); dep_it != tmp.end(); ++dep_it) {
+			TQString 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(TQRegExp("^q[a-z_0-9].h$")) != -1)
+			    no_qt_files = FALSE;
+			TQString h_ext;
+			for(TQStringList::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") {
+				TQString qhdr = (*dep_it).lower();
+				if(file_no_path == "qthread.h")
+				    addConfig("thread");
+			    }
+			    for(TQStringList::Iterator cppit = Option::cpp_ext.begin();
+				cppit != Option::cpp_ext.end(); ++cppit) {
+				TQString src((*dep_it).left((*dep_it).length() - h_ext.length()) + 
+					    (*cppit));
+				if(TQFile::exists(src)) {
+				    bool exists = FALSE;
+				    TQStringList &srcl = v["SOURCES"];
+				    for(TQStringList::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
+    TQStringList &u = v["INTERFACES"];
+    TQString no_ui[] = { "SOURCES", "HEADERS", TQString::null };
+    {
+	for(int i = 0; !no_ui[i].isNull(); i++) {
+	    TQStringList &l = v[no_ui[i]];
+	    for(TQStringList::Iterator val_it = l.begin(); val_it != l.end(); ) {
+		bool found = FALSE;
+		for(TQStringList::Iterator ui_it = u.begin(); ui_it != u.end(); ++ui_it) {
+		    TQString 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;
+		    TQString 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(TQTextStream &t)
+{
+    t << "######################################################################" << endl;
+    t << "# Automatically generated by qmake (" << qmake_version() << ") " << TQDateTime::currentDateTime().toString() << endl;
+    t << "######################################################################" << endl << endl;
+    TQStringList::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 TQString &cfg, bool add)
+{
+    TQString where = "CONFIG";
+    if(!add)
+	where = "CONFIG_REMOVE";
+    if(!project->variables()[where].contains(cfg)) {
+	project->variables()[where] += cfg;
+	return TRUE;
+    }
+    return FALSE;
+}
+
+
+bool
+ProjectGenerator::addFile(TQString file)
+{
+    file = fileFixify(file, TQDir::currentDirPath());
+    TQString 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;
+
+    TQString where;
+    for(TQStringList::Iterator cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit) {
+	if(file.endsWith((*cppit))) {
+	    if(TQFile::exists(file.left(file.length() - (*cppit).length()) + Option::ui_ext))
+		return FALSE;
+	    else
+		where = "SOURCES";
+	    break;
+	}
+    }
+    if(where.isEmpty()) {
+	for(TQStringList::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";
+    }
+
+    TQString newfile = fileFixify(file);
+    if(!where.isEmpty() && !project->variables()[where].contains(file)) {
+	project->variables()[where] += newfile;
+	return TRUE;
+    }
+    return FALSE;
+}
+
+
+TQString
+ProjectGenerator::getWritableVar(const TQString &v, bool fixPath)
+{
+    TQStringList &vals = project->variables()[v];
+    if(vals.isEmpty())
+	return "";
+
+    TQString 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 + " += ";
+    TQString join = vals.join(" ");
+    if(ret.length() + join.length() > 80) {
+	TQString 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(TQFile &file) const
+{
+    TQString outdir;
+    if(!file.name().isEmpty()) {
+	TQFileInfo fi(file);
+	if(fi.isDir())
+	    outdir = fi.dirPath() + TQDir::separator();
+    }
+    if(!outdir.isEmpty() || file.name().isEmpty()) {
+	TQString dir = TQDir::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 000000000..0711ccefa
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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(TQString);
+    bool addConfig(const TQString &, bool add=TRUE);
+    TQString getWritableVar(const TQString &, bool fixPath=TRUE);
+protected:
+    virtual void init();
+    virtual bool writeMakefile(TQTextStream &);
+public:
+    ProjectGenerator(TQMakeProject *p);
+    ~ProjectGenerator();
+    virtual bool openOutput(TQFile &) 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 000000000..8a739a4df
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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_RETQUIREMENTS")) /* no point */
+	return;
+
+    TQStringList &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")) {
+	TQString targ = project->first("TARGET");
+	int slsh = TQMAX(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") == "tqt-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);
+    TQString compile_flag = var("QMAKE_COMPILE_FLAG");
+    if(compile_flag.isEmpty())
+	compile_flag = "-c";
+    if(doPrecompiledHeaders() && !project->isEmpty("PRECOMPILED_HEADER")) {
+	TQString 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)
+	TQString allmoc = fileFixify(project->first("MOC_DIR") + "/allmoc.cpp", TQDir::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"] += TQStringList::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");
+
+	    TQString plist = fileFixify(project->first("QMAKE_INFO_PLIST"));
+	    if(plist.isEmpty())
+		plist = specdir() + TQDir::separator() + "Info.plist." + project->first("TEMPLATE");
+	    if(TQFile::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);
+	TQStringList 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;
+	    TQString lib;
+	    for(TQStringList::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 TQString 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",
+				       TQString::null };
+	for(int i = 0; !libtoolify[i].isNull(); i++) {
+	    TQStringList &l = project->variables()[libtoolify[i]];
+	    if(!l.isEmpty()) {
+		TQString 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 " + TQString::number(10*maj + min) +
+					  ":" + TQString::number(pat) + ":0";
+			    if(libtoolify[i] != "QMAKE_AR_CMD") {
+				TQString rpath = Option::output_dir;
+				if(!project->isEmpty("DESTDIR")) {
+				    rpath = project->first("DESTDIR");
+				    if(TQDir::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;
+	    }
+	}
+    }
+}
+
+TQStringList
+UnixMakefileGenerator::combineSetLFlags(const TQStringList &list1, const TQStringList &list2)
+{
+    if(project->isActiveConfig("no_smart_library_merge"))
+	return list1 + list2;
+
+    TQStringList ret;
+    for(int i = 0; i < 2; i++) {
+	const TQStringList *lst = i ? &list2 : &list1;
+	for(TQStringList::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) {
+			TQStringList::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;
+		    TQString 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(TQStringList::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) {
+			TQStringList::Iterator idx = ret.find((*it));
+			if(idx == ret.end())
+			    break;
+			ret.remove(idx);
+		    }
+#endif
+		    ret.append((*it));
+		}
+	    } else /*if(TQFile::exists((*it)))*/ {
+		while(1) {
+		    TQStringList::Iterator idx = ret.find((*it));
+		    if(idx == ret.end())
+			break;
+		    ret.remove(idx);
+		}
+		ret.append((*it));
+	    }
+	}
+    }
+    return ret;
+}
+
+void
+UnixMakefileGenerator::processPrlVariable(const TQString &var, const TQStringList &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);
+}
+
+TQString
+UnixMakefileGenerator::findDependency(const TQString &dep)
+{
+    TQStringList::Iterator it;
+    {
+	TQStringList &qut = project->variables()["QMAKE_EXTRA_UNIX_TARGETS"];
+	for(it = qut.begin(); it != qut.end(); ++it) {
+	    TQString targ = var((*it) + ".target");
+	    if(targ.isEmpty())
+		targ = (*it);
+	    if(targ.endsWith(dep))
+		return targ;
+	}
+    }
+    {
+	TQStringList &quc = project->variables()["QMAKE_EXTRA_UNIX_COMPILERS"];
+	for(it = quc.begin(); it != quc.end(); ++it) {
+	    TQString tmp_out = project->variables()[(*it) + ".output"].first();
+	    TQString tmp_cmd = project->variables()[(*it) + ".commands"].join(" ");
+	    if(tmp_out.isEmpty() || tmp_cmd.isEmpty())
+		continue;
+	    TQStringList &tmp = project->variables()[(*it) + ".input"];
+	    for(TQStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
+		TQStringList &inputs = project->variables()[(*it2)];
+		for(TQStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
+		    TQString out = tmp_out;
+		    TQFileInfo 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);
+}
+
+TQStringList
+&UnixMakefileGenerator::findDependencies(const TQString &file)
+{
+    TQStringList &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")) {
+	TQString header_prefix = project->first("QMAKE_ORIG_TARGET") + ".gch" + Option::dir_sep;
+	header_prefix += project->first("QMAKE_PRECOMP_PREFIX");
+	if(file.endsWith(".c")) {
+	    TQString precomp_h = header_prefix + "c";
+	    if(!ret.contains(precomp_h))
+		ret += precomp_h;
+	} else {
+	    for(TQStringList::Iterator it = Option::cpp_ext.begin(); it != Option::cpp_ext.end(); ++it) {
+		if(file.endsWith(*it)) {
+		    TQString precomp_h = header_prefix + "c++";
+		    if(!ret.contains(precomp_h))
+			ret += precomp_h;
+		    break;
+		}
+	    }
+	}
+    }
+    return ret;
+}
+
+bool
+UnixMakefileGenerator::findLibraries()
+{
+    TQPtrList<MakefileDependDir> libdirs;
+    libdirs.setAutoDelete(TRUE);
+    const TQString lflags[] = { "QMAKE_LIBDIR_FLAGS", "QMAKE_LIBS", TQString::null };
+    for(int i = 0; !lflags[i].isNull(); i++) {
+	TQStringList &l = project->variables()[lflags[i]];
+	for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	    TQString stub, dir, extn, opt = (*it).stripWhiteSpace();
+	    if(opt.startsWith("-")) {
+		if(opt.startsWith("-L")) {
+		    TQString 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);
+		}
+		TQRegExp stub_reg("^.*lib(" + stub + "[^./=]*)\\.(.*)$");
+		if(stub_reg.exactMatch(stub)) {
+		    stub = stub_reg.cap(1);
+		    extn = stub_reg.cap(2);
+		}
+	    }
+	    if(!stub.isEmpty()) {
+		const TQString modifs[] = { "", "-mt", TQString::null };
+		for(int modif = 0; !modifs[modif].isNull(); modif++) {
+		    bool found = FALSE;
+		    TQStringList extens;
+		    if(!extn.isNull())
+			extens << extn;
+		    else
+			extens << project->variables()["QMAKE_EXTENSION_SHLIB"].first() << "a";
+		    for(TQStringList::Iterator extit = extens.begin(); extit != extens.end(); ++extit) {
+			if(dir.isNull()) {
+			    TQString lib_stub;
+			    for(MakefileDependDir *mdd = libdirs.first(); mdd; mdd = libdirs.next() ) {
+				if(TQFile::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(TQFile::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(TQFile::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;
+}
+
+TQString linkLib(const TQString &file, const TQString &libName) {
+  TQString ret;
+  TQRegExp reg("^.*lib(" + libName + "[^./=]*).*$");
+  if(reg.exactMatch(file))
+    ret = "-l" + reg.cap(1);
+  return ret;
+}
+
+void
+UnixMakefileGenerator::processPrlFiles()
+{
+    TQDict<void> processed;
+    TQPtrList<MakefileDependDir> libdirs;
+    libdirs.setAutoDelete(TRUE);
+    const TQString lflags[] = { "QMAKE_LIBDIR_FLAGS", "QMAKE_LIBS", TQString::null };
+    for(int i = 0; !lflags[i].isNull(); i++) {
+	for(bool ret = FALSE; TRUE; ret = FALSE) {
+	    TQStringList l_out;
+	    TQStringList &l = project->variables()[lflags[i]];
+	    for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+		project->variables()["QMAKE_CURRENT_PRL_LIBS"].clear();
+		TQString opt = (*it).stripWhiteSpace();
+		if(opt.startsWith("-")) {
+		    if(opt.startsWith("-L")) {
+			TQString 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]) {
+			TQString lib = opt.right(opt.length() - 2);
+			for(MakefileDependDir *mdd = libdirs.first(); mdd; mdd = libdirs.next() ) {
+ 			    if(!project->isActiveConfig("compile_libtool")) { //give them the .libs..
+ 				TQString la = mdd->local_dir + Option::dir_sep + "lib" + lib + Option::libtool_ext;
+ 				if(TQFile::exists(la) && TQFile::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"));
+ 				}
+ 			    }
+
+			    TQString 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);
+			}
+			TQString 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 {
+		    TQString 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;
+	}
+    }
+}
+
+TQString
+UnixMakefileGenerator::defaultInstall(const TQString &t)
+{
+    if(t != "target" || project->first("TEMPLATE") == "subdirs")
+	return TQString();
+
+    bool resource = FALSE;
+    const TQString root = "$(INSTALL_ROOT)";
+    TQStringList &uninst = project->variables()[t + ".uninstall"];
+    TQString ret, destdir=project->first("DESTDIR");
+    TQString 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;
+
+    TQStringList links;
+    TQString 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")) {
+	    TQString 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")) {
+	    TQString 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");
+	    TQString dst_lt = root + targetdir + src_lt;
+	    if(!project->isEmpty("DESTDIR")) {
+		src_lt.prepend(var("DESTDIR"));
+		src_lt = Option::fixPathToLocalOS(fileFixify(src_lt,
+							     TQDir::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")) {
+	    TQString 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";
+	    TQString d = root + targetdir + "pkgconfig" + Option::dir_sep;
+	    TQString dst_pc = d + src_pc;
+	    if(!project->isEmpty("DESTDIR")) {
+		src_pc.prepend(var("DESTDIR"));
+		src_pc = Option::fixPathToLocalOS(fileFixify(src_pc,
+							     TQDir::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")) {
+	TQString src_targ = target;
+	if(src_targ == "$(TARGET)")
+	    src_targ = "$(TARGETL)";
+	TQString dst_dir = fileFixify(targetdir);
+	if(TQDir::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 {
+	TQString src_targ = target;
+	if(!destdir.isEmpty())
+	    src_targ = Option::fixPathToTargetOS(destdir + target, FALSE);
+	TQString 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 += TQString(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(TQStringList::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) {
+		    TQString link = Option::fixPathToTargetOS(destdir + (*it), FALSE);
+		    int lslash = link.findRev(Option::dir_sep);
+		    if(lslash != -1)
+			link = link.right(link.length() - (lslash + 1));
+		    TQString 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 000000000..164a06879
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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(TQTextStream &);
+    void writeExtraVariables(TQTextStream &);
+    TQString libtoolFileName();
+    void writeLibtoolFile();     // for libtool
+    TQString pkgConfigPrefix() const;
+    TQString pkgConfigFileName();
+    TQString pkgConfigFixPath(TQString) const;
+    void writePkgConfigFile();   // for pkg-config
+    TQStringList combineSetLFlags(const TQStringList &list1, const TQStringList &list2);
+    void writePrlFile(TQTextStream &);
+
+public:
+    UnixMakefileGenerator(TQMakeProject *p);
+    ~UnixMakefileGenerator();
+
+protected:
+    virtual bool doPrecompiledHeaders() const { return project->isActiveConfig("precompile_header"); }
+    virtual bool doDepends() const { return !include_deps && MakefileGenerator::doDepends(); }
+    virtual TQString defaultInstall(const TQString &);
+    virtual void processPrlVariable(const TQString &, const TQStringList &);
+    virtual void processPrlFiles();
+
+    virtual bool findLibraries();
+    virtual TQString findDependency(const TQString &);
+    virtual TQStringList &findDependencies(const TQString &);
+    virtual void init();
+
+    void writeMakeParts(TQTextStream &);
+    void writeSubdirs(TQTextStream &, 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 000000000..8bb851b69
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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>
+
+TQString mkdir_p_asstring(const TQString &dir);
+
+UnixMakefileGenerator::UnixMakefileGenerator(TQMakeProject *p) : MakefileGenerator(p), init_flag(FALSE), include_deps(FALSE)
+{
+
+}
+
+void
+UnixMakefileGenerator::writePrlFile(TQTextStream &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(TQTextStream &t)
+{
+
+    writeHeader(t);
+    if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) {
+	t << "QMAKE    = "	<< (project->isEmpty("QMAKE_QMAKE") ? TQString("qmake") : var("QMAKE_QMAKE")) << endl;
+	{ //write the extra unix targets..
+	    TQStringList &qut = project->variables()["QMAKE_EXTRA_UNIX_TARGETS"];
+	    for(TQStringList::ConstIterator it = qut.begin(); it != qut.end(); ++it)
+		t << *it << " ";
+	}
+	t << "all clean install distclean mocables uninstall uicables:" << "\n\t"
+	  << "@echo \"Some of the retquired modules ("
+	  << var("QMAKE_FAILED_RETQUIREMENTS") << ") 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(TQTextStream &t)
+{
+    bool first = TRUE;
+    TQMap<TQString, TQStringList> &vars = project->variables();
+    TQStringList &exports = project->variables()["QMAKE_EXTRA_UNIX_VARIABLES"];
+    for(TQMap<TQString, TQStringList>::Iterator it = vars.begin(); it != vars.end(); ++it) {
+	for(TQStringList::Iterator exp_it = exports.begin(); exp_it != exports.end(); ++exp_it) {
+	    TQRegExp 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(TQTextStream &t)
+{
+    TQString 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")) {
+	TQString pwd = fileFixify(TQDir::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") ? TQString("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) {
+	TQStringList &objs = project->variables()["OBJECTS"], &incrs = project->variables()["QMAKE_INCREMENTAL"], incrs_out;
+	t << "OBJECTS = ";
+	for(TQStringList::Iterator objit = objs.begin(); objit != objs.end(); ++objit) {
+	    bool increment = FALSE;
+	    for(TQStringList::Iterator incrit = incrs.begin(); incrit != incrs.end(); ++incrit) {
+		if((*objit).find(TQRegExp((*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;
+    TQString srcMoc = varList("SRCMOC"), objMoc = varList("OBJMOC");
+    t << "SRCMOC   = " << srcMoc << endl;
+    if(do_incremental) {
+	TQStringList &objs = project->variables()["OBJMOC"],
+		   &incrs = project->variables()["QMAKE_INCREMENTAL"], incrs_out;
+	t << "OBJMOC = ";
+	for(TQStringList::Iterator objit = objs.begin(); objit != objs.end(); ++objit) {
+	    bool increment = FALSE;
+	    for(TQStringList::Iterator incrit = incrs.begin(); incrit != incrs.end(); ++incrit) {
+		if((*objit).find(TQRegExp((*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)";
+
+	TQStringList &comps = project->variables()["QMAKE_EXTRA_UNIX_COMPILERS"];
+	for(TQStringList::Iterator compit = comps.begin(); compit != comps.end(); ++compit) {
+	    TQStringList &vars = project->variables()[(*compit) + ".variables"];
+	    for(TQStringList::Iterator varit = vars.begin(); varit != vars.end(); ++varit) {
+		TQStringList 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
+    TQStringList &qeui = project->variables()["QMAKE_EXTRA_UNIX_INCLUDES"];
+    TQStringList::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;
+    TQStringList::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) {
+	TQString 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", "");
+	TQString 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;
+
+	TQString src[] = { "SOURCES", "UICIMPLS", "SRCMOC", TQString::null };
+	for(int x = 0; !src[x].isNull(); x++) {
+	    TQStringList &l = project->variables()[src[x]];
+	    for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+		if(!(*it).isEmpty()) {
+		    TQString d_file;
+		    if((*it).endsWith(".c")) {
+			d_file = (*it).left((*it).length() - 2);
+		    } else {
+			for(TQStringList::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";
+			TQStringList deps = findDependencies((*it)).grep(TQRegExp(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()) {
+	TQString libdir = "tmp/";
+	if(!project->isEmpty("SUBLIBS_DIR"))
+	    libdir = project->first("SUBLIBS_DIR");
+	t << "SUBLIBS= ";
+	TQStringList &l = project->variables()["SUBLIBS"];
+	for(TQStringList::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")) {
+	TQStringList &l = project->variables()["QMAKE_PRL_INTERNAL_FILES"];
+	TQStringList::Iterator it;
+	for(it = l.begin(); it != l.end(); ++it) {
+	    TQMakeMetaInfo libinfo;
+	    if(libinfo.readLib((*it)) && !libinfo.isEmpty("QMAKE_PRL_BUILD_DIR")) {
+		TQString dir;
+		int slsh = (*it).findRev(Option::dir_sep);
+		if(slsh != -1)
+		    dir = (*it).left(slsh + 1);
+		TQString 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()) {
+	TQString destdir = project->first("DESTDIR");
+	if(do_incremental) {
+	    //incremental target
+	    TQString 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));
+	    TQString incr_deps, incr_objs;
+	    if(project->first("QMAKE_INCREMENTAL_STYLE") == "ld") {
+		TQString 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
+		TQString incr_target_dir = var("DESTDIR") + "lib" + incr_target + "." +
+					  project->variables()["QMAKE_EXTENSION_SHLIB"].first();
+		TQString 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" + TQDir::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")) {
+	TQString destdir = project->first("DESTDIR"), incr_deps;
+	if(do_incremental) {
+	    TQString s_ext = project->variables()["QMAKE_EXTENSION_SHLIB"].first();
+	    TQString incr_target = var("QMAKE_ORIG_TARGET").replace(
+		TQRegExp("\\." + s_ext), "").replace(TQRegExp("^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") {
+		TQString incr_target_dir = var("OBJECTS_DIR") + incr_target + Option::obj_ext;
+		//actual target
+		const TQString link_deps = "$(UICDECLS) $(OBJECTS) $(OBJMOC)";
+		t << incr_target_dir << ": " << link_deps << "\n\t"
+		  << "ld -r  -o " << incr_target_dir << " " << link_deps << endl;
+		//communicated below
+		TQStringList &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
+		TQString incr_target_dir = var("DESTDIR") + "lib" + incr_target + "." + s_ext;
+		TQString 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
+		TQStringList &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")) {
+		TQString 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();
+	    TQStringList objs = project->variables()["OBJECTS"] + project->variables()["OBJMOC"] +
+			       project->variables()["OBJCOMP"],
+			libs = project->variables()["QMAKE_AR_SUBLIBS"];
+	    libs.prepend("$(TARGET)");
+	    for(TQStringList::Iterator libit = libs.begin(), objit = objs.begin();
+		libit != libs.end(); ++libit) {
+		TQStringList build;
+		for(int cnt = 0; cnt < max_files && objit != objs.end(); ++objit, cnt++)
+		    build << (*objit);
+		TQString 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")) {
+		    TQString 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.
+	TQString 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_RETQUIREMENTS") && !project->isActiveConfig("no_autoqmake")) {
+	TQString 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()) {
+	    TQStringList files = fileFixify(Option::mkfile::project_files);
+	    t << meta_files << ": " << "\n\t"
+	      << "@$(QMAKE) -prl " << buildArgs() << " " << files.join(" ") << endl;
+	}
+    }
+
+    if(!project->first("QMAKE_PKGINFO").isEmpty()) {
+	TQString pkginfo = project->first("QMAKE_PKGINFO");
+	TQString 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()) {
+	TQString info_plist = project->first("QMAKE_INFO_PLIST"),
+	    info_plist_out = project->first("QMAKE_INFO_PLIST_OUT");
+	TQString 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()) {
+	    TQString 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;
+	}
+    }
+
+    TQString ddir = project->isEmpty("QMAKE_DISTDIR") ? project->first("QMAKE_ORIG_TARGET") :
+		   project->first("QMAKE_DISTDIR");
+    TQString ddir_c = fileFixify((project->isEmpty("OBJECTS_DIR") ? TQString(".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")) {
+	TQStringList &forms = project->variables()["FORMS"], ui_headers;
+	for(TQStringList::Iterator formit = forms.begin(); formit != forms.end(); ++formit) {
+	    TQString ui_h = fileFixify((*formit) + Option::h_ext.first());
+	    if(TQFile::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;
+
+    TQString 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()) {
+	TQStringList clean, &l = project->variables()["YACCSOURCES"];
+	for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	    TQFileInfo fi((*it));
+	    TQString dir;
+	    if(fi.dirPath() != ".")
+		dir = fi.dirPath() + Option::dir_sep;
+	    dir = fileFixify(dir, TQDir::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()) {
+	TQStringList clean, &l = project->variables()["LEXSOURCES"];
+	for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	    TQFileInfo fi((*it));
+	    TQString dir;
+	    if(fi.dirPath() != ".")
+		dir = fi.dirPath() + Option::dir_sep;
+	    dir = fileFixify(dir, TQDir::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")) {
+	TQString header_prefix = project->first("QMAKE_PRECOMP_PREFIX");
+	TQString 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() ) {
+	TQString libdir = "tmp/";
+	if(!project->isEmpty("SUBLIBS_DIR"))
+	    libdir = project->first("SUBLIBS_DIR");
+	TQStringList &l = project->variables()["SUBLIBS"];
+	for(it = l.begin(); it != l.end(); ++it)
+	    t << libdir << "lib" << (*it) << ".a" << ":\n\t"
+	      << var(TQString("MAKELIB") + (*it)) << endl << endl;
+    }
+
+    TQString 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") ) {
+	TQString precomph = fileFixify(project->first("PRECOMPILED_HEADER"));
+	t << "###### Prefix headers" << endl;
+	TQString comps[] = { "C", "CXX", TQString::null };
+	for(int i = 0; !comps[i].isNull(); i++) {
+	    TQString flags = var("QMAKE_" + comps[i] + "FLAGS_PRECOMPILE");
+	    flags += " $(" + comps[i] + "FLAGS)";
+
+	    TQString header_prefix = project->first("QMAKE_PRECOMP_PREFIX");
+	    TQString outdir = project->first("QMAKE_ORIG_TARGET") + ".gch" + Option::dir_sep, outfile = outdir;
+	    TQString 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")) {
+	TQString outdir = project->first("MOC_DIR");
+	TQString 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
+    TQStringList &qut = project->variables()["QMAKE_EXTRA_UNIX_TARGETS"];
+    for(it = qut.begin(); it != qut.end(); ++it) {
+	TQString targ = var((*it) + ".target"),
+		 cmd = var((*it) + ".commands"), deps;
+	if(targ.isEmpty())
+	    targ = (*it);
+	TQStringList &deplist = project->variables()[(*it) + ".depends"];
+	for(TQStringList::Iterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) {
+	    TQString dep = var((*dep_it) + ".target");
+	    if(dep.isEmpty())
+		dep = (*dep_it);
+	    deps += " " + dep;
+	}
+	if(project->variables()[(*it) + ".CONFIG"].findIndex("phony") != -1)
+	    deps += TQString(" ") + "FORCE";
+	t << targ << ":" << deps << "\n\t"
+	  << cmd << endl << endl;
+    }
+    // user defined compilers
+    TQStringList &quc = project->variables()["QMAKE_EXTRA_UNIX_COMPILERS"];
+    for(it = quc.begin(); it != quc.end(); ++it) {
+	TQString tmp_out = project->variables()[(*it) + ".output"].first();
+	TQString tmp_cmd = project->variables()[(*it) + ".commands"].join(" ");
+	TQString tmp_dep = project->variables()[(*it) + ".depends"].join(" ");
+	TQStringList &vars = project->variables()[(*it) + ".variables"];
+	if(tmp_out.isEmpty() || tmp_cmd.isEmpty())
+	    continue;
+	TQStringList &tmp = project->variables()[(*it) + ".input"];
+	for(TQStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
+	    TQStringList &inputs = project->variables()[(*it2)];
+	    for(TQStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
+		TQFileInfo fi(Option::fixPathToLocalOS((*input)));
+		TQString 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(TQStringList::Iterator it3 = vars.begin(); it3 != vars.end(); ++it3)
+		    cmd.replace("$(" + (*it3) + ")", "$(QMAKE_COMP_" + (*it3)+")");
+		if(!tmp_dep.isEmpty()) {
+		    char buff[256];
+		    TQString 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 += " " + TQCString(buff+l, (i - l) + 1);
+				    l = i;
+				}
+			    }
+			}
+			fclose(proc);
+		    }
+		}
+		t << out << ": " << in << deps << "\n\t"
+		  << cmd << endl << endl;
+	    }
+	}
+    }
+    t <<"FORCE:" << endl << endl;
+}
+
+struct SubDir
+{
+    TQString directory, profile, target, makefile;
+};
+
+void
+UnixMakefileGenerator::writeSubdirs(TQTextStream &t, bool direct)
+{
+    // blasted includes
+    TQStringList &qeui = project->variables()["QMAKE_EXTRA_UNIX_INCLUDES"];
+    for(TQStringList::Iterator qeui_it = qeui.begin(); qeui_it != qeui.end(); ++qeui_it)
+	t << "include " << (*qeui_it) << endl;
+    writeExtraVariables(t);
+
+    TQPtrList<SubDir> subdirs;
+    {
+	TQStringList subdirs_in = project->variables()["SUBDIRS"];
+	for(TQStringList::Iterator it = subdirs_in.begin(); it != subdirs_in.end(); ++it) {
+	    TQString 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()) {
+		TQString 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('.', '_');
+	}
+    }
+    TQPtrListIterator<SubDir> it(subdirs);
+
+    TQString 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();
+	TQString 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 << " && ";
+	TQString 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(); ) {
+	    TQString 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
+    TQStringList &qut = project->variables()["QMAKE_EXTRA_UNIX_TARGETS"];
+    for(TQStringList::Iterator qut_it = qut.begin(); qut_it != qut.end(); ++qut_it) {
+	TQString targ = var((*qut_it) + ".target"),
+		 cmd = var((*qut_it) + ".commands"), deps;
+	if(targ.isEmpty())
+	    targ = (*qut_it);
+	TQStringList &deplist = project->variables()[(*qut_it) + ".depends"];
+	for(TQStringList::Iterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) {
+	    TQString dep = var((*dep_it) + ".target");
+	    if(dep.isEmpty())
+		dep = (*dep_it);
+	    deps += " " + dep;
+	}
+	if(project->variables()[(*qut_it) + ".CONFIG"].findIndex("phony") != -1)
+	    deps += TQString(" ") + "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") ? TQString("0") :
+						project->first("VER_PAT")) );
+    TQStringList l = TQStringList::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"] += TQString(project->first("QMAKE_LFLAGS_COMPAT_VERSION") +
+								    project->first("VER_MAJ") + "." +
+								    project->first("VER_MIN"));
+		else
+		    project->variables()["QMAKE_LFLAGS"] += TQString(project->first("QMAKE_LFLAGS_COMPAT_VERSION") +
+								    project->first("COMPATIBILITY_VERSION"));
+	    }
+	    if(!project->isEmpty("QMAKE_LFLAGS_VERSION")) {
+		project->variables()["QMAKE_LFLAGS"] += TQString(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"];
+	}
+	TQString destdir = project->first("DESTDIR");
+	if ( !destdir.isEmpty() && !project->variables()["QMAKE_RPATH"].isEmpty() ) {
+	    TQString rpath_destdir = destdir;
+	    if(TQDir::isRelativePath(rpath_destdir)) {
+		TQFileInfo 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;
+	}
+    }
+    TQStringList &quc = project->variables()["QMAKE_EXTRA_UNIX_COMPILERS"];
+    for(TQStringList::Iterator it = quc.begin(); it != quc.end(); ++it) {
+	TQString tmp_out = project->variables()[(*it) + ".output"].first();
+	if(tmp_out.isEmpty())
+	    continue;
+	TQStringList &tmp = project->variables()[(*it) + ".input"];
+	for(TQStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
+	    TQStringList &inputs = project->variables()[(*it2)];
+	    for(TQStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
+		TQFileInfo fi(Option::fixPathToLocalOS((*input)));
+		TQString 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;
+	    }
+	}
+    }
+}
+
+TQString
+UnixMakefileGenerator::libtoolFileName()
+{
+    TQString 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()
+{
+    TQString fname = libtoolFileName(), lname = fname;
+    int slsh = lname.findRev(Option::dir_sep);
+    if(slsh != -1)
+	lname = lname.right(lname.length() - slsh - 1);
+    TQFile ft(fname);
+    if(!ft.open(IO_WriteOnly))
+	return;
+    project->variables()["ALL_DEPS"].append(fname);
+
+    TQTextStream t(&ft);
+    t << "# " << lname << " - a libtool library file\n";
+    time_t now = time(NULL);
+    t << "# Generated by qmake/libtool (" << qmake_version() << ") (TQt "
+      << 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";
+    TQStringList 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(TQStringList::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";
+
+    TQString 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";
+}
+
+TQString
+UnixMakefileGenerator::pkgConfigFileName()
+{
+    TQString 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,TQDir::currentDirPath(), Option::output_dir));
+    }
+    return ret;
+}
+
+TQString
+UnixMakefileGenerator::pkgConfigPrefix() const
+{
+    if(!project->isEmpty("QMAKE_PKGCONFIG_PREFIX"))
+	return project->first("QMAKE_PKGCONFIG_PREFIX");
+    return qInstallPath();
+}
+
+TQString
+UnixMakefileGenerator::pkgConfigFixPath(TQString path) const
+{
+    TQString prefix = pkgConfigPrefix();
+    if(path.startsWith(prefix))
+	path = path.replace(prefix, "${prefix}");
+    return path;
+}
+
+void
+UnixMakefileGenerator::writePkgConfigFile()     // ### does make sense only for libqt so far
+{
+    TQString fname = pkgConfigFileName(), lname = fname;
+    int slsh = lname.findRev(Option::dir_sep);
+    if(slsh != -1)
+	lname = lname.right(lname.length() - slsh - 1);
+    TQFile ft(fname);
+    if(!ft.open(IO_WriteOnly))
+	return;
+    project->variables()["ALL_DEPS"].append(fname);
+    TQTextStream t(&ft);
+
+    TQString prefix = pkgConfigPrefix();
+    TQString libDir = project->first("QMAKE_PKGCONFIG_LIBDIR");
+    if(libDir.isEmpty())
+	libDir = prefix + "/lib";
+    TQString 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: TQt" << endl;
+    TQString 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
+    TQStringList 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(TQStringList::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 000000000..218014b0c
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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(TQMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE)
+{
+
+}
+
+bool
+BorlandMakefileGenerator::writeMakefile(TQTextStream &t)
+{
+    writeHeader(t);
+    if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) {
+	t << "all clean:" << "\n\t"
+	  << "@echo \"Some of the retquired modules ("
+	  << var("QMAKE_FAILED_RETQUIREMENTS") << ") 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(TQTextStream &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	=	";
+    TQStringList &incs = project->variables()["INCLUDEPATH"];
+    for(TQStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) {
+	TQString inc = (*incit);
+	inc.replace(TQRegExp("\\\\*$"), "");
+	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") ? TQString("moc") :
+			      Option::fixPathToTargetOS(var("QMAKE_MOC"), FALSE)) << endl;
+    t << "UIC	=	" << (project->isEmpty("QMAKE_UIC") ? TQString("uic") :
+			      Option::fixPathToTargetOS(var("QMAKE_UIC"), FALSE)) << endl;
+    t << "QMAKE =       " << (project->isEmpty("QMAKE_QMAKE") ? TQString("qmake") :
+			      Option::fixPathToTargetOS(var("QMAKE_QMAKE"), FALSE)) << endl;
+    t << "IDC		=	" << (project->isEmpty("QMAKE_IDC") ? TQString("idc") :
+			      Option::fixPathToTargetOS(var("QMAKE_IDC"), FALSE)) << endl;
+    t << "IDL		=	" << (project->isEmpty("QMAKE_IDL") ? TQString("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;
+
+    TQString extraCompilerDeps;
+    if(!project->isEmpty("QMAKE_EXTRA_WIN_COMPILERS")) {
+	t << "OBJCOMP = " << varList("OBJCOMP") << endl;
+	extraCompilerDeps += " $(OBJCOMP) ";
+
+	TQStringList &comps = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"];
+	for(TQStringList::Iterator compit = comps.begin(); compit != comps.end(); ++compit) {
+	    TQStringList &vars = project->variables()[(*compit) + ".variables"];
+	    for(TQStringList::Iterator varit = vars.begin(); varit != vars.end(); ++varit) {
+		TQStringList 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";
+    TQStringList::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()) {
+	TQStringList dlldirs = project->variables()["DLLDESTDIR"];
+	for ( TQStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) {
+	    t << "\n\t" << "-$(COPY_FILE) \"$(TARGET)\" " << *dlldir;
+	}
+    }
+    TQString targetfilename = project->variables()["TARGET"].first();
+    if(project->isActiveConfig("activeqt")) {
+	TQString 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);
+
+    TQStringList 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")) {
+	TQStringList &forms = project->variables()["FORMS"];
+	for(TQStringList::Iterator formit = forms.begin(); formit != forms.end(); ++formit) {
+	    TQString ui_h = fileFixify((*formit) + Option::h_ext.first());
+	    if(TQFile::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:";
+    TQString 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:";
+    TQString 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
+    TQStringList::Iterator it;
+    TQStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"];
+    for(it = qut.begin(); it != qut.end(); ++it) {
+	TQString targ = var((*it) + ".target"),
+		 cmd = var((*it) + ".commands"), deps;
+	if(targ.isEmpty())
+	    targ = (*it);
+	TQStringList &deplist = project->variables()[(*it) + ".depends"];
+	for(TQStringList::Iterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) {
+	    TQString 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 += TQString(" ") + "FORCE";
+	t << "\n\n" << targ << ":" << deps << "\n\t"
+	  << cmd;
+    }
+
+    t << endl << endl;
+
+    TQStringList &quc = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"];
+    for(it = quc.begin(); it != quc.end(); ++it) {
+	TQString tmp_out = project->variables()[(*it) + ".output"].first();
+	TQString tmp_cmd = project->variables()[(*it) + ".commands"].join(" ");
+	TQString tmp_dep = project->variables()[(*it) + ".depends"].join(" ");
+	TQStringList &vars = project->variables()[(*it) + ".variables"];
+	if(tmp_out.isEmpty() || tmp_cmd.isEmpty())
+	    continue;
+	TQStringList &tmp = project->variables()[(*it) + ".input"];
+	for(TQStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
+	    TQStringList &inputs = project->variables()[(*it2)];
+	    for(TQStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
+		TQFileInfo fi(Option::fixPathToLocalOS((*input)));
+		TQString 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(TQStringList::Iterator it3 = vars.begin(); it3 != vars.end(); ++it3)
+		    cmd.replace("$(" + (*it3) + ")", "$(QMAKE_COMP_" + (*it3)+")");
+		if(!tmp_dep.isEmpty()) {
+		    char buff[256];
+		    TQString 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 += " " + TQCString(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"TQTDLL_POSTFIX || project->first("TARGET") == "qtmt"TQTDLL_POSTFIX);
+    TQStringList &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) {
+		    TQString ver;
+		    ver.sprintf("qt%s" TQTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "mt" : ""), hver);
+		    TQStringList &libs = project->variables()["QMAKE_LIBS"];
+		    for(TQStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit)
+			(*libit).replace(TQRegExp("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(
+		TQStringList::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
+    TQStringList &libList = project->variables()["QMAKE_LIBS"];
+    for( TQStringList::Iterator stIt = libList.begin(); stIt != libList.end(); ) {
+	TQString 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(TQDir::convertSeparators(s.mid( 2 )));
+	} else {
+	    stIt++;
+	}
+    }
+    project->variables()["QMAKE_FILETAGS"] += TQStringList::split(' ',
+	"HEADERS SOURCES DEF_FILE RC_FILE TARGET QMAKE_LIBS DESTDIR DLLDESTDIR INCLUDEPATH");
+    TQStringList &l = project->variables()["QMAKE_FILETAGS"];
+    TQStringList::Iterator it;
+    for(it = l.begin(); it != l.end(); ++it) {
+	TQStringList &gdmf = project->variables()[(*it)];
+	for(TQStringList::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()) {
+	TQStringList l = TQStringList::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
+	TQString tdsPostfix;
+	if ( !project->variables()["VERSION"].isEmpty() ) {
+	    tdsPostfix = TQStringList::split( '.', project->first("VERSION") ).join("")
+		+ ".tds";
+	} else {
+	    tdsPostfix = ".tds";
+	}
+	project->variables()["QMAKE_CLEAN"].append(
+		project->first("DESTDIR") + project->first("TARGET") + tdsPostfix );
+    }
+
+    TQStringList &quc = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"];
+    for(it = quc.begin(); it != quc.end(); ++it) {
+	TQString tmp_out = project->variables()[(*it) + ".output"].first();
+	if(tmp_out.isEmpty())
+	    continue;
+	TQStringList &tmp = project->variables()[(*it) + ".input"];
+	for(TQStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
+	    TQStringList &inputs = project->variables()[(*it2)];
+	    for(TQStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
+		TQFileInfo fi(Option::fixPathToLocalOS((*input)));
+		TQString 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 000000000..bae9752fa
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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(TQTextStream &);
+
+    bool writeMakefile(TQTextStream &);
+    void init();
+
+public:
+    BorlandMakefileGenerator(TQMakeProject *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 000000000..5afb16d37
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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(TQMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE)
+{
+    Option::obj_ext = ".o";
+}
+
+bool
+MingwMakefileGenerator::findLibraries() // todo - pascal
+{
+    return TRUE;
+}
+
+bool
+MingwMakefileGenerator::writeMakefile(TQTextStream &t)
+{
+    writeHeader(t);
+    if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) {
+	t << "all clean:" << "\n\t"
+	  << "@echo \"Some of the retquired modules ("
+	  << var("QMAKE_FAILED_RETQUIREMENTS") << ") 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 TQString & fileName, TQStringList & objList)
+{
+    TQString filePath = Option::output_dir + TQDir::separator() + fileName;
+    TQFile file(filePath);
+    if (file.open(IO_WriteOnly | IO_Translate )) {
+	TQTextStream t(&file);
+	t << "INPUT(" << endl;
+	for (TQStringList::Iterator it = objList.begin(); it != objList.end(); ++it ) {
+	    if (TQDir::isRelativePath(*it))
+		t << "./" << *it << endl;
+	    else
+		t << *it << endl;
+	}
+	t << ");" << endl;
+	file.close();
+    }
+}
+
+void
+MingwMakefileGenerator::writeMingwParts(TQTextStream &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	=	";
+    TQStringList &incs = project->variables()["INCLUDEPATH"];
+    for(TQStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) {
+	TQString inc = (*incit);
+	inc.replace(TQRegExp("\\\\$"), "");
+	inc.replace(TQRegExp("\""), "");
+	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(TQRegExp("(\\slib|^lib)")," -l") << endl;
+    }
+    else {
+	t << "LIB	=	" << var("QMAKE_LIB") << endl;
+    }
+    t << "MOC		=	" << (project->isEmpty("QMAKE_MOC") ? TQString("moc") :
+			      Option::fixPathToTargetOS(var("QMAKE_MOC"), FALSE)) << endl;
+    t << "UIC		=	" << (project->isEmpty("QMAKE_UIC") ? TQString("uic") :
+			      Option::fixPathToTargetOS(var("QMAKE_UIC"), FALSE)) << endl;
+    t << "QMAKE		=	" << (project->isEmpty("QMAKE_QMAKE") ? TQString("qmake") :
+			      Option::fixPathToTargetOS(var("QMAKE_QMAKE"), FALSE)) << endl;
+    t << "IDC		=	" << (project->isEmpty("QMAKE_IDC") ? TQString("idc") :
+			      Option::fixPathToTargetOS(var("QMAKE_IDC"), FALSE)) << endl;
+    t << "IDL		=	" << (project->isEmpty("QMAKE_IDL") ? TQString("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(TQRegExp("\\\\$"),"") << endl;
+    else
+	t << "OBJECTS_DIR = . " << endl;
+    if (! project->variables()["MOC_DIR"].isEmpty())
+	t << "MOC_DIR = " << var("MOC_DIR").replace(TQRegExp("\\\\$"),"") << endl;
+    else
+	t << "MOC_DIR = . " << endl;
+    t << endl;
+
+    t << "####### Files" << endl << endl;
+    t << "HEADERS =	" << varList("HEADERS") << endl;
+    t << "SOURCES =	" << varList("SOURCES") << endl;
+    TQString 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;
+    TQString 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;
+    TQString extraCompilerDeps;
+    if(!project->isEmpty("QMAKE_EXTRA_WIN_COMPILERS")) {
+	t << "OBJCOMP = " << varList("OBJCOMP") << endl;
+	extraCompilerDeps += " $(OBJCOMP) ";
+
+	TQStringList &comps = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"];
+	for(TQStringList::Iterator compit = comps.begin(); compit != comps.end(); ++compit) {
+	    TQStringList &vars = project->variables()[(*compit) + ".variables"];
+	    for(TQStringList::Iterator varit = vars.begin(); varit != vars.end(); ++varit) {
+		TQStringList 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()) {
+	TQStringList dlldirs = project->variables()["DLLDESTDIR"];
+	for ( TQStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) {
+	    t << "\n\t" << "$(COPY_FILE) \"$(TARGET)\" " << *dlldir;
+	}
+    }
+    TQString targetfilename = project->variables()["TARGET"].first();
+    if(project->isActiveConfig("activeqt")) {
+	TQString 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(TQRegExp("\\.rc"),".o") << " --include-dir=" << TQFileInfo(var("RC_FILE")).dirPath() << endl << endl;
+    }
+	project->variables()["RES_FILE"].first().replace(TQRegExp("\\.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(TQRegExp("\\.obj"),".o")
+      << varGlue("SRCMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","")
+      << varGlue("OBJMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","").replace(TQRegExp("\\.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
+    TQStringList::Iterator it;
+    TQStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"];
+
+    for(it = qut.begin(); it != qut.end(); ++it) {
+	TQString targ = var((*it) + ".target"),
+		 cmd = var((*it) + ".commands"), deps;
+	if(targ.isEmpty())
+	    targ = (*it);
+	TQStringList &deplist = project->variables()[(*it) + ".depends"];
+	for(TQStringList::Iterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) {
+	    TQString dep = var((*dep_it) + ".target");
+	    if(dep.isEmpty())
+		dep = (*dep_it);
+	    deps += " " + dep;
+	}
+	t << "\n\n" << targ << ":" << deps << "\n\t"
+	  << cmd;
+    }
+
+    t << endl << endl;
+
+    TQStringList &quc = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"];
+    for(it = quc.begin(); it != quc.end(); ++it) {
+	TQString tmp_out = project->variables()[(*it) + ".output"].first();
+	TQString tmp_cmd = project->variables()[(*it) + ".commands"].join(" ");
+	TQString tmp_dep = project->variables()[(*it) + ".depends"].join(" ");
+	TQStringList &vars = project->variables()[(*it) + ".variables"];
+	if(tmp_out.isEmpty() || tmp_cmd.isEmpty())
+	    continue;
+	TQStringList &tmp = project->variables()[(*it) + ".input"];
+	for(TQStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
+	    TQStringList &inputs = project->variables()[(*it2)];
+	    for(TQStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
+		TQFileInfo fi(Option::fixPathToLocalOS((*input)));
+		TQString 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(TQStringList::Iterator it3 = vars.begin(); it3 != vars.end(); ++it3)
+		    cmd.replace("$(" + (*it3) + ")", "$(QMAKE_COMP_" + (*it3)+")");
+		if(!tmp_dep.isEmpty()) {
+		    char buff[256];
+		    TQString 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 += " " + TQCString(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"TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX);
+    project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
+
+    // LIBS defined in Profile comes first for gcc
+    project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
+
+    TQString targetfilename = project->variables()["TARGET"].first();
+    TQStringList &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"), "tqt-mt");
+		if(hver != -1) {
+		    TQString ver;
+		    ver.sprintf("-lqt%s" TQTDLL_POSTFIX "%d", (project->isActiveConfig("thread") ? "-mt" : ""), hver);
+		    TQStringList &libs = project->variables()["QMAKE_LIBS"];
+// @@@HGTODO maybe we must change the replace regexp if we understand what's going on
+		    for(TQStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit)
+			(*libit).replace(TQRegExp("-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(
+		TQStringList::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
+    TQStringList &libs = project->variables()["QMAKE_LIBS"];
+    for ( TQStringList::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"] += TQStringList::split(' ',
+	"HEADERS SOURCES DEF_FILE RC_FILE TARGET QMAKE_LIBS DESTDIR DLLDESTDIR INCLUDEPATH");
+    TQStringList &l = project->variables()["QMAKE_FILETAGS"];
+    TQStringList::Iterator it;
+    for(it = l.begin(); it != l.end(); ++it) {
+	TQStringList &gdmf = project->variables()[(*it)];
+	for(TQStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner)
+	    (*inner) = Option::fixPathToTargetOS((*inner), FALSE);
+    }
+
+    if ( project->isActiveConfig("dll") ) {
+		TQString destDir = "";
+		if (!project->first("DESTDIR").isEmpty())
+			destDir = project->first("DESTDIR") + Option::dir_sep;
+		project->variables()["QMAKE_LFLAGS"].append(TQString("-Wl,--out-implib,") +
+					  destDir + "lib" + project->first("TARGET") + ".a");
+    }
+
+    if ( !project->variables()["DEF_FILE"].isEmpty() )
+	project->variables()["QMAKE_LFLAGS"].append(TQString("-Wl,") + project->first("DEF_FILE"));
+//    if(!project->isActiveConfig("incremental"))
+//	project->variables()["QMAKE_LFLAGS"].append(TQString("/incremental:no"));
+
+#if 0
+    if ( !project->variables()["VERSION"].isEmpty() ) {
+	TQString version = project->variables()["VERSION"][0];
+	int firstDot = version.find( "." );
+	TQString major = version.left( firstDot );
+	TQString 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()) {
+	TQStringList l = TQStringList::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");
+    }
+
+    TQStringList &quc = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"];
+    for(it = quc.begin(); it != quc.end(); ++it) {
+	TQString tmp_out = project->variables()[(*it) + ".output"].first();
+	if(tmp_out.isEmpty())
+	    continue;
+	TQStringList &tmp = project->variables()[(*it) + ".input"];
+	for(TQStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
+	    TQStringList &inputs = project->variables()[(*it2)];
+	    for(TQStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
+		TQFileInfo fi(Option::fixPathToLocalOS((*input)));
+		TQString 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(TQTextStream &t)
+{
+    TQString qs ;
+    TQTextStream ts (&qs, IO_WriteOnly) ;
+    Win32MakefileGenerator::writeSubDirs( ts ) ;
+    TQRegExp rx("(\\n\\tcd [^\\n\\t]+)(\\n\\t.+)\\n\\t@cd ..") ;
+    rx.setMinimal(TRUE);
+    int pos = 0 ;
+    while ( -1 != (pos = rx.search( qs, pos)))
+    {
+	TQString 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 000000000..6058d7d13
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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(TQTextStream &);
+    void writeSubDirs(TQTextStream &t) ;
+
+    bool writeMakefile(TQTextStream &);
+    void init();
+    
+    virtual bool findLibraries();
+
+public:
+    MingwMakefileGenerator(TQMakeProject *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 000000000..8534d6908
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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(TQMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE)
+{
+
+}
+
+bool
+DspMakefileGenerator::writeMakefile(TQTextStream &t)
+{
+    if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) {
+	/* for now just dump, I need to generated an empty dsp or something.. */
+	fprintf(stderr, "Project file not generated because all retquirements not met:\n\t%s\n",
+		var("QMAKE_FAILED_RETQUIREMENTS").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(TQTextStream &t)
+{
+    TQString 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);
+    TQString dspfile_loc = findTemplate(dspfile);
+
+    TQFile file(dspfile_loc);
+    if(!file.open(IO_ReadOnly)) {
+	fprintf(stderr, "Cannot open dsp file: %s\n", dspfile.latin1());
+	return FALSE;
+    }
+    TQTextStream dsp(&file);
+
+    TQString platform = "Win32";
+    if ( !project->variables()["QMAKE_PLATFORM"].isEmpty() )
+	platform = varGlue("QMAKE_PLATFORM", "", " ", "");
+
+    // Setup PCH variables
+    precompH = project->first("PRECOMPILED_HEADER");
+    TQString namePCH = TQFileInfo(precompH).fileName();
+    usePCH = !precompH.isEmpty() && project->isActiveConfig("precompile_header");
+    if (usePCH) {
+	// Created files
+	TQString origTarget = project->first("QMAKE_ORIG_TARGET");
+	origTarget.replace(TQRegExp("-"), "_");
+	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;
+    TQString line;
+    while ( !dsp.eof() ) {
+	line = dsp.readLine();
+	while((rep = line.find(TQRegExp("\\$\\$[a-zA-Z0-9_-]*"))) != -1) {
+	    TQString torep = line.mid(rep, line.find(TQRegExp("[^\\$a-zA-Z0-9_-]"), rep) - rep);
+	    TQString 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;
+
+		TQString mocpath = var( "QMAKE_MOC" );
+		mocpath = mocpath.replace( TQRegExp( "\\..*$" ), "" ) + " ";
+
+		TQStringList list = project->variables()["SOURCES"] + project->variables()["DEF_FILE"];
+		if(!project->isActiveConfig("flat"))
+		    list.sort();
+		TQStringList::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)) {
+			TQString base = (*it);
+			base.replace(TQRegExp("\\..*$"), "").upper();
+			base.replace(TQRegExp("[^a-zA-Z]"), "_");
+
+			TQString 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;
+
+		TQStringList list = project->variables()["HEADERS"];
+		if(!project->isActiveConfig("flat"))
+		    list.sort();
+		for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+//		    beginGroupForFile((*it), t);
+		    t << "# Begin Source File\n\nSOURCE=" << (*it) << endl << endl;
+		    TQString compilePCH;
+		    TQStringList customDependencies;
+		    TQString createMOC;
+		    TQString buildCmdsR, buildCmdsD;
+		    TQString buildCmds = "\nBuildCmds= \\\n";
+		    // Create unique baseID
+		    TQString base = (*it);
+		    {
+			base.replace(TQRegExp("\\..*$"), "").upper();
+			base.replace(TQRegExp("[^a-zA-Z]"), "_");
+		    }
+		    if (usePCH && precompH.endsWith(*it)) {
+			TQString basicBuildCmd = TQString("\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";
+
+			TQStringList &tmp = findDependencies(precompH);
+			if(!tmp.isEmpty()) // Got Deps for PCH
+			    customDependencies += tmp;
+		    }
+		    if (project->isActiveConfig("moc") && !findMocDestination((*it)).isEmpty()) {
+			TQString mocpath = var( "QMAKE_MOC" );
+			mocpath = mocpath.replace( TQRegExp( "\\..*$" ), "" ) + " ";
+			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();
+			TQString build = "\n\n# Begin Custom Build - "+ 
+					TQString(doMOC?"Moc'ing ":"") +
+					TQString((doMOC&&doPCH)?" and ":"") +
+					TQString(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;
+
+		TQString uiSourcesDir;
+		TQString 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 = "";
+		}
+
+		TQStringList list = project->variables()["FORMS"];
+		if(!project->isActiveConfig("flat"))
+		    list.sort();
+		TQString ext = variable == "MSVCDSP_FORMSOURCES" ? ".cpp" : ".h";
+		for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+		    TQString base = (*it);
+		    int dot = base.findRev(".");
+  		    base.replace( dot, base.length() - dot, ext );
+		    TQString fname = base;
+
+		    int lbs = fname.findRev( "\\" );
+		    TQString 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";
+
+		TQStringList list = project->variables()["TRANSLATIONS"];
+		if(!project->isActiveConfig("flat"))
+		    list.sort();
+		for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+		    TQString sify = *it;
+		    sify.replace('/', '\\' );
+		    TQString base = (*it);
+		    base.replace(TQRegExp("\\..*$"), "").upper();
+		    base.replace(TQRegExp("[^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;
+
+		TQString mocpath = var( "QMAKE_MOC" );
+		mocpath = mocpath.replace( TQRegExp( "\\..*$" ), "" ) + " ";
+
+		TQStringList list = project->variables()["SRCMOC"];
+		if(!project->isActiveConfig("flat"))
+		    list.sort();
+		for(TQStringList::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)) {
+			TQString base = (*it);
+			base.replace(TQRegExp("\\..*$"), "").upper();
+			base.replace(TQRegExp("[^a-zA-Z]"), "_");
+
+			TQString 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";
+
+		TQStringList list = project->variables()["IMAGES"];
+		if(!project->isActiveConfig("flat"))
+		    list.sort();
+		TQStringList::Iterator it;
+
+		// dump the image list to a file UIC can read.
+		TQFile f( "images.tmp" );
+		f.open( IO_WriteOnly );
+		TQTextStream 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;
+
+		    TQString base = (*it);
+		    TQString uicpath = var("QMAKE_UIC");
+		    uicpath = uicpath.replace(TQRegExp("\\..*$"), "") + " ";
+
+		    if ( !imagesBuildDone ) {
+			imagesBuildDone = TRUE;
+			TQString 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 << "=";
+			TQStringList::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";
+
+		TQString uicpath = var("QMAKE_UIC");
+		uicpath = uicpath.replace(TQRegExp("\\..*$"), "") + " ";
+		TQString mocpath = var( "QMAKE_MOC" );
+		mocpath = mocpath.replace( TQRegExp( "\\..*$" ), "" ) + " ";
+
+		TQStringList list = project->variables()["FORMS"];
+		if(!project->isActiveConfig("flat"))
+		    list.sort();
+		for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+		    TQString base = (*it);
+//		    beginGroupForFile(base, t);
+		    t <<  "# Begin Source File\n\nSOURCE=" << base << endl;
+
+		    TQString fname = base;
+		    fname.replace(".ui", "");
+		    int lbs = fname.findRev( "\\" );
+		    TQString fpath;
+		    if ( lbs != -1 )
+			fpath = fname.left( lbs + 1 );
+		    fname = fname.right( fname.length() - lbs - 1 );
+
+		    TQString mocFile;
+		    if(!project->variables()["MOC_DIR"].isEmpty())
+			mocFile = project->first("MOC_DIR");
+		    else
+			mocFile = fpath;
+
+		    TQString uiSourcesDir;
+		    TQString 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;
+
+		    TQString 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";
+
+		TQString lexpath = var("QMAKE_LEX") + varGlue("QMAKE_LEXFLAGS", " ", " ", "") + " ";
+
+		TQStringList list = project->variables()["LEXSOURCES"];
+		if(!project->isActiveConfig("flat"))
+		    list.sort();
+		for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+		    TQString fname = (*it);
+//		    beginGroupForFile(fname, t);
+		    t <<  "# Begin Source File\n\nSOURCE=" << fname << endl;
+		    fname.replace(".l", Option::lex_mod + Option::cpp_ext.first());
+
+		    TQString 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";
+
+		TQString yaccpath = var("QMAKE_YACC") + varGlue("QMAKE_YACCFLAGS", " ", " ", "") + " ";
+
+		TQStringList list = project->variables()["YACCSOURCES"];
+		if(!project->isActiveConfig("flat"))
+		    list.sort();
+		for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+		    TQString fname = (*it);
+//		    beginGroupForFile(fname, t);
+		    t <<  "# Begin Source File\n\nSOURCE=" << fname << endl;
+		    fname.replace(".y", Option::yacc_mod);
+
+		    TQString 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" ) {
+		TQStringList list = project->variables()["MSVCDSP_IDLSOURCES"];
+		if(!project->isActiveConfig("flat"))
+		    list.sort();
+		for(TQStringList::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;
+    TQStringList::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"TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX);
+    project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
+
+    TQStringList &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() ) {
+	TQString version = project->variables()["VERSION"][0];
+	int firstDot = version.find( "." );
+	TQString major = version.left( firstDot );
+	TQString 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"), "tqt-mt");
+		if(hver != -1) {
+		    TQString ver;
+		    ver.sprintf("qt%s" TQTDLL_POSTFIX "%d.lib", (thread ? "-mt" : ""), hver);
+		    TQStringList &libs = project->variables()["QMAKE_LIBS"];
+		    for(TQStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit)
+			(*libit).replace(TQRegExp("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() ) {
+	    TQString 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(TQString("/incremental:no"));
+        if ( is_qt )
+	    project->variables()["MSVCDSP_DEBUG_OPT"] = "/GZ /Zi";
+    }
+
+    TQString msvcdsp_project;
+    if ( project->variables()["TARGET"].count() )
+	msvcdsp_project = project->variables()["TARGET"].first();
+
+    TQString 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"] += TQStringList::split(' ',
+								 "HEADERS SOURCES DEF_FILE RC_FILE TARGET QMAKE_LIBS DESTDIR DLLDESTDIR INCLUDEPATH");
+    TQStringList &l = project->variables()["QMAKE_FILETAGS"];
+    for(it = l.begin(); it != l.end(); ++it) {
+	TQStringList &gdmf = project->variables()[(*it)];
+	for(TQStringList::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);
+    TQStringList &proj = project->variables()["MSVCDSP_PROJECT"];
+
+    for(it = proj.begin(); it != proj.end(); ++it)
+	(*it).replace(TQRegExp("\\.[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,
+    TQStringList &libList = project->variables()["QMAKE_LIBS"];
+    for( TQStringList::Iterator stIt = libList.begin(); stIt != libList.end(); ) {
+	TQString 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(TQDir::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"];
+
+    TQStringList &libs = project->variables()["QMAKE_LIBS"];
+    for(TQStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) {
+	TQString lib = (*libit);
+	lib.replace(TQRegExp("\""), "");
+	project->variables()["MSVCDSP_LIBS"].append(" \"" + lib + "\"");
+    }
+
+    TQStringList &incs = project->variables()["INCLUDEPATH"];
+    for(TQStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) {
+	TQString 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();
+    }
+
+    TQString dest;
+    TQString postLinkStep;
+    TQString copyDllStep;
+    TQString activeTQtStepPreCopyDll;
+    TQString activeTQtStepPostCopyDll;
+    TQString activeTQtStepPreCopyDllDebug;
+    TQString activeTQtStepPostCopyDllDebug;
+    TQString activeTQtStepPreCopyDllRelease;
+    TQString activeTQtStepPostCopyDllRelease;
+
+    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(
+	    TQString("/out:\"") + dest + "\"");
+	if ( project->isActiveConfig("dll") ) {
+	    TQString imp = dest;
+	    imp.replace(".dll", ".lib");
+	    project->variables()["MSVCDSP_TARGET"].append(TQString(" /implib:\"") + imp + "\"");
+	}
+    }
+    if ( project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty() ) {
+	TQStringList dlldirs = project->variables()["DLLDESTDIR"];
+	if ( dlldirs.count() )
+	    copyDllStep += "\t";
+	for ( TQStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) {
+	    copyDllStep += "copy \"$(TargetPath)\" \"" + *dlldir + "\"\t";
+	}
+    }
+
+    if ( project->isActiveConfig("activeqt") ) {
+	TQString idl = project->variables()["QMAKE_IDL"].first();
+	TQString idc = project->variables()["QMAKE_IDC"].first();
+	TQString 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" ) ) {
+	    activeTQtStepPreCopyDll += 
+			     "\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";
+	    activeTQtStepPostCopyDll +=
+			     "\t" + idc + " %1 /regserver\n";
+
+	    TQString executable = project->variables()["MSVCDSP_TARGETDIRREL"].first() + "\\" + targetfilename + ".dll";
+	    activeTQtStepPreCopyDllRelease = activeTQtStepPreCopyDll.arg(executable).arg(executable);
+	    activeTQtStepPostCopyDllRelease = activeTQtStepPostCopyDll.arg(executable);
+
+	    executable = project->variables()["MSVCDSP_TARGETDIRDEB"].first() + "\\" + targetfilename + ".dll";
+	    activeTQtStepPreCopyDllDebug = activeTQtStepPreCopyDll.arg(executable).arg(executable);
+	    activeTQtStepPostCopyDllDebug = activeTQtStepPostCopyDll.arg(executable);
+	} else {
+	    activeTQtStepPreCopyDll += 
+			     "\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";
+	    activeTQtStepPostCopyDll +=
+			     "\t%1 -regserver\n";
+	    TQString executable = project->variables()["MSVCDSP_TARGETDIRREL"].first() + "\\" + targetfilename + ".exe";
+	    activeTQtStepPreCopyDllRelease = activeTQtStepPreCopyDll.arg(executable).arg(executable);
+	    activeTQtStepPostCopyDllRelease = activeTQtStepPostCopyDll.arg(executable);
+
+	    executable = project->variables()["MSVCDSP_TARGETDIRDEB"].first() + "\\" + targetfilename + ".exe";
+	    activeTQtStepPreCopyDllDebug = activeTQtStepPreCopyDll.arg(executable).arg(executable);
+	    activeTQtStepPostCopyDllDebug = activeTQtStepPostCopyDll.arg(executable);
+	}
+
+    }
+
+    
+    if ( !postLinkStep.isEmpty() || !copyDllStep.isEmpty() || !activeTQtStepPreCopyDllDebug.isEmpty() || !activeTQtStepPreCopyDllRelease.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 + activeTQtStepPreCopyDllDebug + copyDllStep + activeTQtStepPostCopyDllDebug + "\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 + activeTQtStepPreCopyDllRelease + copyDllStep + activeTQtStepPostCopyDllRelease + "\n"
+	    "# End Special Build Tool\n" );
+    }
+
+    if ( !project->variables()["SOURCES"].isEmpty() || !project->variables()["RC_FILE"].isEmpty() ) {
+	project->variables()["SOURCES"] += project->variables()["RC_FILE"];
+    }
+    TQStringList &list = project->variables()["FORMS"];
+    for( it = list.begin(); it != list.end(); ++it ) {
+	if ( TQFile::exists( *it + ".h" ) )
+	    project->variables()["SOURCES"].append( *it + ".h" );
+    }
+    project->variables()["QMAKE_INTERNAL_PRL_LIBS"] << "MSVCDSP_LIBS"; 
+}
+
+
+TQString
+DspMakefileGenerator::findTemplate(const TQString &file)
+{
+    TQString ret;
+    if(!TQFile::exists((ret = file)) &&
+       !TQFile::exists((ret = TQString(Option::mkfile::qmakespec + "/" + file))) &&
+       !TQFile::exists((ret = TQString(getenv("QTDIR")) + "/mkspecs/win32-msvc/" + file)) &&
+       !TQFile::exists((ret = (TQString(getenv("HOME")) + "/.tmake/" + file))))
+	return "";
+    return ret;
+}
+
+
+void
+DspMakefileGenerator::processPrlVariable(const TQString &var, const TQStringList &l)
+{
+    if(var == "QMAKE_PRL_DEFINES") {
+	TQStringList &out = project->variables()["MSVCDSP_DEFINES"];
+	for(TQStringList::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(TQString file, TQTextStream &t,
+					const TQString& filter)
+{
+    if(project->isActiveConfig("flat"))
+	return;
+    fileFixify(file, TQDir::currentDirPath(), TQDir::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() || !TQDir::isRelativePath(file)) {
+	endGroups(t);
+	return;
+    }
+    
+    TQString 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 = "";
+    }
+
+    TQStringList dirs = TQStringList::split(Option::dir_sep, file.right( file.length() - currentGroup.length() ) );
+    for(TQStringList::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(TQTextStream &t)
+{
+    if(project->isActiveConfig("flat"))
+	return;
+    else if(currentGroup.isEmpty())
+	return;
+
+    TQStringList dirs = TQStringList::split(Option::dir_sep, currentGroup);
+    for(TQStringList::Iterator dir_it = dirs.end(); dir_it != dirs.begin(); --dir_it) {
+	t << "\n# End Group\n";
+    }
+    currentGroup = "";
+}
+
+bool
+DspMakefileGenerator::openOutput(TQFile &file) const
+{
+    TQString outdir;
+    if(!file.name().isEmpty()) {
+	if(TQDir::isRelativePath(file.name()))
+	    file.setName(Option::output_dir + file.name()); //pwd when qmake was run
+	TQFileInfo fi(file);
+	if(fi.isDir())
+	    outdir = file.name() + TQDir::separator();
+    }
+    if(!outdir.isEmpty() || file.name().isEmpty())
+	file.setName(outdir + project->first("TARGET") + project->first("DSP_EXTENSION"));
+    if(TQDir::isRelativePath(file.name())) {
+	TQString ofile;
+	ofile = file.name();
+	int slashfind = ofile.findRev('\\');
+	if (slashfind == -1) {
+	    ofile = ofile.replace(TQRegExp("-"), "_");
+	} 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(TQDir::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 000000000..99c6a1051
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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
+{
+    TQString currentGroup;
+    void beginGroupForFile(TQString file, TQTextStream &, const TQString& filter="");
+    void endGroups(TQTextStream &);
+
+    bool init_flag;
+    bool writeDspParts(TQTextStream &);
+
+    bool writeMakefile(TQTextStream &);
+    TQString findTemplate(const TQString &file);
+    void init();
+
+public:
+    DspMakefileGenerator(TQMakeProject *p);
+    ~DspMakefileGenerator();
+
+    bool openOutput(TQFile &file) const;
+
+protected:
+    virtual void processPrlVariable(const TQString &, const TQStringList &);
+    virtual bool findLibraries();
+
+    TQString 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 000000000..d82977f0b
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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(TQMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE)
+{
+
+}
+
+bool
+NmakeMakefileGenerator::writeMakefile(TQTextStream &t)
+{
+    writeHeader(t);
+    if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) {
+	{ //write the extra unix targets..
+	    TQStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"];
+	    for(TQStringList::ConstIterator it = qut.begin(); it != qut.end(); ++it)
+		t << *it << " ";
+	}
+	t << "all clean:" << "\n\t"
+	  << "@echo \"Some of the retquired modules ("
+	  << var("QMAKE_FAILED_RETQUIREMENTS") << ") 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;
+}
+
+TQStringList
+&NmakeMakefileGenerator::findDependencies(const TQString &file)
+{
+    TQStringList &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(TQStringList::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(TQTextStream &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	=	";
+    TQStringList &incs = project->variables()["INCLUDEPATH"];
+    for(TQStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) {
+	TQString 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	=	";
+	TQStringList &libs = project->variables()["QMAKE_LIBS"];
+	for(TQStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) {
+	    TQString 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") ? TQString("moc") :
+			      Option::fixPathToTargetOS(var("QMAKE_MOC"), FALSE)) << endl;
+    t << "UIC		=	" << (project->isEmpty("QMAKE_UIC") ? TQString("uic") :
+			      Option::fixPathToTargetOS(var("QMAKE_UIC"), FALSE)) << endl;
+    t << "QMAKE		=	" << (project->isEmpty("QMAKE_QMAKE") ? TQString("qmake") :
+			      Option::fixPathToTargetOS(var("QMAKE_QMAKE"), FALSE)) << endl;
+    t << "IDC		=	" << (project->isEmpty("QMAKE_IDC") ? TQString("idc") :
+			      Option::fixPathToTargetOS(var("QMAKE_IDC"), FALSE)) << endl;
+    t << "IDL		=	" << (project->isEmpty("QMAKE_IDL") ? TQString("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;
+
+    TQString extraCompilerDeps;
+    if(!project->isEmpty("QMAKE_EXTRA_WIN_COMPILERS")) {
+	t << "OBJCOMP = " << varList("OBJCOMP") << endl;
+	extraCompilerDeps += " $(OBJCOMP) ";
+
+	TQStringList &comps = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"];
+	for(TQStringList::Iterator compit = comps.begin(); compit != comps.end(); ++compit) {
+	    TQStringList &vars = project->variables()[(*compit) + ".variables"];
+	    for(TQStringList::Iterator varit = vars.begin(); varit != vars.end(); ++varit) {
+		TQStringList 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";
+    TQStringList::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");
+
+	TQDict<void> source_directories;
+	source_directories.insert(".", (void*)1);
+	TQString directories[] = { TQString("MOC_DIR"), TQString("UI_SOURCES_DIR"), TQString("UI_DIR"), TQString::null };
+	for(int y = 0; !directories[y].isNull(); y++) {
+	    TQString dirTemp = project->first(directories[y]);
+	    if (dirTemp.endsWith("\\"))
+		dirTemp.truncate(dirTemp.length()-1);
+	    if(!dirTemp.isEmpty())
+		source_directories.insert(dirTemp, (void*)1);
+	}
+	TQString srcs[] = { TQString("SOURCES"), TQString("UICIMPLS"), TQString("SRCMOC"), TQString::null };
+	for(int x = 0; !srcs[x].isNull(); x++) {
+	    TQStringList &l = project->variables()[srcs[x]];
+	    for(TQStringList::Iterator sit = l.begin(); sit != l.end(); ++sit) {
+		TQString sep = "\\";
+		if((*sit).find(sep) == -1)
+		    sep = "/";
+		TQString dir = (*sit).section(sep, 0, -2);
+		if(!dir.isEmpty() && !source_directories[dir])
+		    source_directories.insert(dir, (void*)1);
+	    }
+	}
+
+	for(TQDictIterator<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( TQRegExp( "\\$@" ), 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( TQRegExp( "\\$@" ), 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()) {
+	TQStringList dlldirs = project->variables()["DLLDESTDIR"];
+	for ( TQStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) {
+	    t << "\n\t" << "-$(COPY_FILE) \"$(TARGET)\" " << *dlldir;
+	}
+    }
+    TQString targetfilename = project->variables()["TARGET"].first();
+    if(project->isActiveConfig("activeqt")) {
+	TQString 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);
+
+    TQStringList 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")) {
+	TQStringList &forms = project->variables()["FORMS"];
+	for(TQStringList::Iterator formit = forms.begin(); formit != forms.end(); ++formit) {
+	    TQString ui_h = fileFixify((*formit) + Option::h_ext.first());
+	    if(TQFile::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
+
+    TQStringList::Iterator it;
+    TQStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"];
+    for(it = qut.begin(); it != qut.end(); ++it) {
+	TQString targ = var((*it) + ".target"),
+		 cmd = var((*it) + ".commands"), deps;
+	if(targ.isEmpty())
+	    targ = (*it);
+	TQStringList &deplist = project->variables()[(*it) + ".depends"];
+	for(TQStringList::Iterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) {
+	    TQString 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 += TQString(" ") + "FORCE";
+	t << "\n\n" << targ << ":" << deps << "\n\t"
+	  << cmd;
+    }
+    t << endl << endl;
+
+    TQStringList &quc = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"];
+    for(it = quc.begin(); it != quc.end(); ++it) {
+	TQString tmp_out = project->variables()[(*it) + ".output"].first();
+	TQString tmp_cmd = project->variables()[(*it) + ".commands"].join(" ");
+	TQString tmp_dep = project->variables()[(*it) + ".depends"].join(" ");
+	TQStringList &vars = project->variables()[(*it) + ".variables"];
+	if(tmp_out.isEmpty() || tmp_cmd.isEmpty())
+	    continue;
+	TQStringList &tmp = project->variables()[(*it) + ".input"];
+	for(TQStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
+	    TQStringList &inputs = project->variables()[(*it2)];
+	    for(TQStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
+		TQFileInfo fi(Option::fixPathToLocalOS((*input)));
+		TQString 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(TQStringList::Iterator it3 = vars.begin(); it3 != vars.end(); ++it3)
+		    cmd.replace("$(" + (*it3) + ")", "$(QMAKE_COMP_" + (*it3)+")");
+		if(!tmp_dep.isEmpty()) {
+		    char buff[256];
+		    TQString 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 += " " + TQCString(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) {
+	TQString precompRule = TQString("-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;
+    }
+}
+
+TQString
+NmakeMakefileGenerator::var(const TQString &value)
+{
+    if (usePCH) {
+    	if ((value == "QMAKE_RUN_CXX_IMP_BATCH"
+	    || value == "QMAKE_RUN_CXX_IMP"
+	    || value == "QMAKE_RUN_CXX")) {
+	    TQFileInfo precompHInfo(precompH);
+	    TQString precompRule = TQString("-c -FI%1 -Yu%2 -Fp%3")
+		.arg(precompHInfo.fileName())
+		.arg(precompHInfo.fileName())
+		.arg(precompPch);
+	    TQString 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"TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX);
+    project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
+
+    TQString targetfilename = project->variables()["TARGET"].first();
+    TQStringList &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"), "tqt-mt");
+		if(hver != -1) {
+		    TQString ver;
+		    ver.sprintf("qt%s" TQTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "-mt" : ""), hver);
+		    TQStringList &libs = project->variables()["QMAKE_LIBS"];
+		    for(TQStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit)
+			(*libit).replace(TQRegExp("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(
+		TQStringList::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"];
+
+    TQStringList &libList = project->variables()["QMAKE_LIBS"];
+    for( TQStringList::Iterator stIt = libList.begin(); stIt != libList.end(); ) {
+	TQString 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(TQDir::convertSeparators(s.mid( 2 )));
+	} else {
+	    stIt++;
+	}
+    }
+
+    project->variables()["QMAKE_FILETAGS"] += TQStringList::split(' ',
+	"HEADERS SOURCES DEF_FILE RC_FILE TARGET QMAKE_LIBS DESTDIR DLLDESTDIR INCLUDEPATH");
+    TQStringList &l = project->variables()["QMAKE_FILETAGS"];
+    TQStringList::Iterator it;
+    for(it = l.begin(); it != l.end(); ++it) {
+	TQStringList &gdmf = project->variables()[(*it)];
+	for(TQStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner)
+	    (*inner) = Option::fixPathToTargetOS((*inner), FALSE);
+    }
+
+    if ( !project->variables()["DEF_FILE"].isEmpty() )
+	project->variables()["QMAKE_LFLAGS"].append(TQString("/DEF:") + project->first("DEF_FILE"));
+    if(!project->isActiveConfig("incremental"))
+	project->variables()["QMAKE_LFLAGS"].append(TQString("/incremental:no"));
+
+    if ( !project->variables()["VERSION"].isEmpty() ) {
+	TQString version = project->variables()["VERSION"][0];
+	int firstDot = version.find( "." );
+	TQString major = version.left( firstDot );
+	TQString 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 (retquired 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()) {
+	TQStringList l = TQStringList::split('.', project->first("VERSION"));
+	project->variables()["VER_MAJ"].append(l[0]);
+	project->variables()["VER_MIN"].append(l[1]);
+    }
+
+    TQString version = TQStringList::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");
+    }
+
+    TQStringList &quc = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"];
+    for(it = quc.begin(); it != quc.end(); ++it) {
+	TQString tmp_out = project->variables()[(*it) + ".output"].first();
+	if(tmp_out.isEmpty())
+	    continue;
+	TQStringList &tmp = project->variables()[(*it) + ".input"];
+	for(TQStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
+	    TQStringList &inputs = project->variables()[(*it2)];
+	    for(TQStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
+		TQFileInfo fi(Option::fixPathToLocalOS((*input)));
+		TQString 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 000000000..22d3c1aa7
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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(TQTextStream &);
+
+    bool writeMakefile(TQTextStream &);
+    void init();
+
+protected:
+    TQStringList &findDependencies(const TQString &file);
+    TQString var(const TQString &value);
+    TQString precompH, precompObj, precompPch;
+    bool usePCH;
+
+public:
+    NmakeMakefileGenerator(TQMakeProject *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 000000000..7b89932e4
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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 TQString& v ) : name(n), value(v) {};
+    const char* name;
+    const TQString& value;
+};
+struct XPair {
+    XPair( const char* n, const TQStringList& v, const char* s = "," ) : name(n), value(v), sep(s) {};
+    const char* name;
+    const TQStringList& value;
+    const char* sep;
+};
+
+// void streamSPair( TQTextStream &strm, const char *n, const TQString &s )
+
+// Streaming operators for property Pairs ---------------------------
+TQTextStream &operator<<( TQTextStream &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.
+*/
+TQTextStream &operator<<( TQTextStream &strm, const EPair &prop )
+{
+    strm << prop.name << prop.value << "\"";
+    return strm;
+}
+
+TQTextStream &operator<<( TQTextStream &strm, const LPair &prop )
+{
+    strm << prop.name << prop.value << "\"";
+    return strm;
+}
+
+TQTextStream &operator<<( TQTextStream &strm, const SPair &prop )
+{
+    if ( !prop.value.isEmpty() )
+	strm << prop.name << TQString(prop.value).remove("\"") << "\"";
+    return strm;
+}
+
+TQTextStream &operator<<( TQTextStream &strm, const XPair &prop )
+{
+    if ( !prop.value.isEmpty() ) {
+        TQString 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;
+}
+
+TQTextStream &operator<<( TQTextStream &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 )
+{
+}
+
+TQTextStream &operator<<( TQTextStream &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 TQt, 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]
+	{
+	    TQStringList both = TQStringList::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]
+	{
+	    TQStringList both = TQStringList::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
+	    TQStringList both = TQStringList::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 = TQString( 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 )
+{
+}
+
+TQTextStream &operator<<( TQTextStream &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 )
+{
+}
+
+TQTextStream &operator<<( TQTextStream &strm, const VCLibrarianTool &tool )
+{
+    strm << _begTool3;
+    strm << SPair( _ToolName, TQString( "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";
+}
+
+TQTextStream &operator<<( TQTextStream &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";
+}
+
+TQTextStream &operator<<( TQTextStream &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 -------------------------------------------------
+TQTextStream &operator<<( TQTextStream &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;
+}
+
+TQTextStream &operator<<( TQTextStream &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( TQTextStream & /*strm*/, TQString filename )
+{
+    TQString mocOutput = Project->findMocDestination( filename );
+    TQString 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( TQTextStream & /*strm*/, TQString str )
+{
+    CustomBuildTool = VCCustomBuildTool();
+    useCustomBuildTool = TRUE;
+
+    TQString uicApp = Project->var("QMAKE_UIC");
+    TQString mocApp = Project->var( "QMAKE_MOC" );
+    TQString fname = str.section( '\\', -1 );
+    TQString mocDir = Project->var( "MOC_DIR" );
+    TQString uiDir = Project->var( "UI_DIR" );
+    TQString uiHeaders;
+    TQString uiSources;
+
+    // Determining the paths for the output files.
+    int slash = str.findRev( '\\' );
+    TQString pname = ( slash != -1 ) ? str.left( slash+1 ) : TQString( ".\\" );
+    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( TQTextStream &/*strm*/, TQString 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 = TQString::null;
+    CompilerTool.RuntimeLibrary = rtUnknown;
+    CompilerTool.WarningLevel = warningLevelUnknown;
+
+    // Setup PCH options
+    CompilerTool.UsePrecompiledHeader     = (isCFile ? pchNone : pchCreateUsingSpecific);
+    CompilerTool.PrecompiledHeaderThrough = "$(NOINHERIT)";
+    CompilerTool.ForcedIncludeFiles       = "$(NOINHERIT)";
+}
+
+bool VCFilter::addIMGstage( TQTextStream &/*strm*/, TQString str )
+{
+    bool isCorH = FALSE;
+    if (str.endsWith(".c") || str.endsWith(".rc"))
+	isCorH = TRUE;
+    TQStringList::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;
+
+    TQString 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.
+    TQString tmpFileCmd = "echo ";
+    TQString tmpImageFilename = ".imgcol";
+    TQStringList& 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;
+	}
+    }
+
+    TQString uicApp = Project->var("QMAKE_UIC");
+    TQString 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( TQTextStream &/*strm*/, TQString str )
+{
+    bool doLex = str.endsWith(".l");
+    if (!doLex && !str.endsWith(".y"))
+        return FALSE;
+
+    TQString fname = "$(InputName)";
+    if (doLex) {
+        fname += Option::lex_mod + Option::cpp_ext.first();
+	TQString 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;
+	TQString 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;
+}
+
+TQTextStream &operator<<( TQTextStream &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;
+    TQStringList currentDirs;
+    for ( TQStringList::ConstIterator it = tool.Files.begin(); it != tool.Files.end(); ++it ) {
+	if ( !tool.flat_files ) {
+	    TQStringList newDirs = TQStringList::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
+}
+
+TQTextStream &operator<<( TQTextStream &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 000000000..759242345
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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( TQStringList& options ) {
+	for ( TQStringList::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
+    TQStringList		    AdditionalIncludeDirectories;
+    TQStringList		    AdditionalOptions;
+    TQStringList		    AdditionalUsingDirectories;
+    TQString		    AssemblerListingLocation;
+    asmListingOption	    AssemblerOutput;
+    basicRuntimeCheckOption BasicRuntimeChecks;
+    browseInfoOption	    BrowseInformation;
+    TQString		    BrowseInformationFile;
+    triState		    BufferSecurityCheck;
+    callingConventionOption CallingConvention;
+    CompileAsOptions	    CompileAs;
+    compileAsManagedOptions CompileAsManaged;
+    triState		    CompileOnly;
+    debugOption		    DebugInformationFormat;
+    triState		    DefaultCharIsUnsigned;
+    triState		    Detect64BitPortabilityProblems;
+    triState		    DisableLanguageExtensions;
+    TQStringList		    DisableSpecificWarnings;
+    triState		    EnableFiberSafeOptimizations;
+    triState		    EnableFunctionLevelLinking;
+    triState		    EnableIntrinsicFunctions;
+    triState		    ExceptionHandling;
+    triState		    ExpandAttributedSource;
+    favorSizeOrSpeedOption  FavorSizeOrSpeed;
+    triState		    ForceConformanceInForLoopScope;
+    TQStringList		    ForcedIncludeFiles;
+    TQStringList		    ForcedUsingFiles;
+    preprocessOption	    GeneratePreprocessedFile;
+    triState		    GlobalOptimizations;
+    triState		    IgnoreStandardIncludePath;
+    triState		    ImproveFloatingPointConsistency;
+    inlineExpansionOption   InlineFunctionExpansion;
+    triState		    KeepComments;
+    triState		    MinimalRebuild;
+    TQString		    ObjectFile;
+    triState		    OmitFramePointers;
+    triState                OpenMP;
+    optimizeOption	    Optimization;
+    ProcessorOptimizeOption OptimizeForProcessor;
+    triState		    OptimizeForWindowsApplication;
+    TQString		    OutputFile;
+    TQString		    PrecompiledHeaderFile;
+    TQString		    PrecompiledHeaderThrough;
+    TQStringList		    PreprocessorDefinitions;
+    TQString		    ProgramDataBaseFileName;
+    runtimeLibraryOption    RuntimeLibrary;
+    triState		    RuntimeTypeInfo;
+    triState		    ShowIncludes;
+    triState		    SmallerTypeCheck;
+    triState		    StringPooling;
+    structMemberAlignOption StructMemberAlignment;
+    triState		    SuppressStartupBanner;
+    triState		    TreatWChar_tAsBuiltInType;
+    triState		    TurnOffAssemblyGeneration;
+    triState		    UndefineAllPreprocessorDefinitions;
+    TQStringList		    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
+    TQStringList		    AdditionalDependencies;
+    TQStringList		    AdditionalLibraryDirectories;
+    TQStringList		    AdditionalOptions;
+    TQStringList		    AddModuleNamesToAssembly;
+    TQString		    BaseAddress;
+    TQStringList		    DelayLoadDLLs;
+    optFoldingType	    EnableCOMDATFolding;
+    TQString		    EntryPointSymbol;
+    TQStringList		    ForceSymbolReferences;
+    TQString		    FunctionOrder;
+    triState		    GenerateDebugInformation;
+    triState		    GenerateMapFile;
+    long		    HeapCommitSize;
+    long		    HeapReserveSize;
+    triState		    IgnoreAllDefaultLibraries;
+    TQStringList		    IgnoreDefaultLibraryNames;
+    triState		    IgnoreEmbeddedIDL;
+    triState		    IgnoreImportLibrary;
+    TQString		    ImportLibrary;
+    addressAwarenessType    LargeAddressAware;
+    triState		    LinkDLL;
+    linkIncrementalType     LinkIncremental;
+    triState		    LinkTimeCodeGeneration;
+    TQString		    LinkToManagedResourceFile;
+    triState		    MapExports;
+    TQString		    MapFileName;
+    triState		    MapLines;
+    TQString		    MergedIDLBaseFileName;
+    TQString		    MergeSections;	    // Should be list?
+    TQString		    MidlCommandFile;
+    TQString		    ModuleDefinitionFile;   // Should be list?
+    optWin98Type	    OptimizeForWindows98;
+    optRefType		    OptimizeReferences;
+    TQString		    OutputFile;
+    TQString		    ProgramDatabaseFile;
+    triState		    RegisterOutput;
+    triState		    ResourceOnlyDLL;
+    triState		    SetChecksum;
+    linkProgressOption	    ShowProgress;
+    long		    StackCommitSize;
+    long		    StackReserveSize;
+    TQString		    StripPrivateSymbols;    // Should be list?
+    subSystemOption	    SubSystem;
+    triState		    SupportUnloadOfDelayLoadedDLL;
+    triState		    SuppressStartupBanner;
+    triState		    SwapRunFromCD;
+    triState		    SwapRunFromNet;
+    machineTypeOption       TargetMachine;
+    termSvrAwarenessType    TerminalServerAware;
+    triState		    TurnOffAssemblyGeneration;
+    TQString		    TypeLibraryFile;
+    long		    TypeLibraryResourceID;
+    TQString		    Version;
+    VCConfiguration*	    config;
+};
+
+class VCMIDLTool : public VCToolBase
+{
+public:
+    // Functions
+    VCMIDLTool();
+    virtual ~VCMIDLTool(){}
+    bool parseOption( const char* option );
+
+    // Variables
+    TQStringList		    AdditionalIncludeDirectories;
+    TQStringList		    AdditionalOptions;
+    TQStringList		    CPreprocessOptions;
+    midlCharOption	    DefaultCharType;
+    TQString		    DLLDataFileName;    // Should be list?
+    midlErrorCheckOption    EnableErrorChecks;
+    triState		    ErrorCheckAllocations;
+    triState		    ErrorCheckBounds;
+    triState		    ErrorCheckEnumRange;
+    triState		    ErrorCheckRefPointers;
+    triState		    ErrorCheckStubData;
+    TQStringList		    FullIncludePath;
+    triState		    GenerateStublessProxies;
+    triState		    GenerateTypeLibrary;
+    TQString		    HeaderFileName;
+    triState		    IgnoreStandardIncludePath;
+    TQString		    InterfaceIdentifierFileName;
+    triState		    MkTypLibCompatible;
+    TQString		    OutputDirectory;
+    TQStringList		    PreprocessorDefinitions;
+    TQString		    ProxyFileName;
+    TQString		    RedirectOutputAndErrors;
+    midlStructMemberAlignOption StructMemberAlignment;
+    triState		    SuppressStartupBanner;
+    midlTargetEnvironment   TargetEnvironment;
+    TQString		    TypeLibraryName;
+    TQStringList		    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
+    TQStringList		    AdditionalDependencies;
+    TQStringList		    AdditionalLibraryDirectories;
+    TQStringList		    AdditionalOptions;
+    TQStringList		    ExportNamedFunctions;
+    TQStringList		    ForceSymbolReferences;
+    triState		    IgnoreAllDefaultLibraries;
+    TQStringList		    IgnoreDefaultLibraryNames;
+    TQString		    ModuleDefinitionFile;
+    TQString		    OutputFile;
+    triState		    SuppressStartupBanner;
+};
+
+class VCCustomBuildTool : public VCToolBase
+{
+public:
+    // Functions
+    VCCustomBuildTool();
+    virtual ~VCCustomBuildTool(){}
+    bool parseOption( const char* ){ return FALSE; };
+
+    // Variables
+    TQStringList		    AdditionalDependencies;
+    TQStringList		    CommandLine;
+    TQString		    Description;
+    TQStringList		    Outputs;
+    TQString		    ToolName;
+    TQString		    ToolPath;
+};
+
+class VCResourceCompilerTool : public VCToolBase
+{
+public:
+    // Functions
+    VCResourceCompilerTool();
+    virtual ~VCResourceCompilerTool(){}
+    bool parseOption( const char* ){ return FALSE; };
+
+    // Variables
+    TQStringList		    AdditionalIncludeDirectories;
+    TQStringList		    AdditionalOptions;
+    enumResourceLangID	    Culture;
+    TQStringList		    FullIncludePath;
+    triState		    IgnoreStandardIncludePath;
+    TQStringList		    PreprocessorDefinitions;
+    TQString		    ResourceOutputFileName;
+    linkProgressOption	    ShowProgress;
+    TQString		    ToolPath;
+};
+
+class VCEventTool : public VCToolBase
+{
+protected:
+    // Functions
+    VCEventTool() : ExcludedFromBuild( unset ){};
+    virtual ~VCEventTool(){}
+    bool parseOption( const char* ){ return FALSE; };
+
+public:
+    // Variables
+    TQString		    CommandLine;
+    TQString		    Description;
+    triState		    ExcludedFromBuild;
+    TQString		    ToolName;
+    TQString		    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;
+    TQString		DeleteExtensionsOnClean;
+    TQString		ImportLibrary;
+    TQString		IntermediateDirectory;
+    TQString		Name;
+    TQString		OutputDirectory;
+    TQString		PrimaryOutput;
+    TQString		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( TQTextStream &strm, TQString str );
+    void addUICstage( TQTextStream &strm, TQString str );
+    bool addIMGstage( TQTextStream &strm, TQString str );
+    void modifyPCHstage( TQTextStream &strm, TQString str );
+    bool addLexYaccStage( TQTextStream &strm, TQString str );
+
+    // Variables
+    TQString		Name;
+    TQString		Filter;
+    triState		ParseFiles;
+    TQStringList		Files;
+    VcprojGenerator*	Project;
+    TQValueList<VCConfiguration> *Config;
+    customBuildCheck	CustomBuild;
+    bool		useCustomBuildTool;
+    VCCustomBuildTool   CustomBuildTool;
+    bool		useCompilerTool;
+    VCCLCompilerTool    CompilerTool;
+    bool		flat_files;
+};
+
+class VCProject
+{
+public:
+    // Functions
+    VCProject();
+    ~VCProject(){}
+
+    // Variables
+    TQString		Name;
+    TQString		Version;
+    TQString		ProjectGUID;
+    TQString		SccProjectName;
+    TQString		SccLocalPath;
+    TQString		PlatformName;
+
+    // XML sub-parts
+    TQValueList<VCConfiguration> Configuration;
+    VCFilter		SourceFiles;
+    VCFilter		HeaderFiles;
+    VCFilter		MOCFiles;
+    VCFilter		UICFiles;
+    VCFilter		FormFiles;
+    VCFilter		TranslationFiles;
+    VCFilter		LexYaccFiles;
+    VCFilter		ResourceFiles;
+};
+
+TQTextStream &operator<<( TQTextStream &, const VCCLCompilerTool & );
+TQTextStream &operator<<( TQTextStream &, const VCLinkerTool & );
+TQTextStream &operator<<( TQTextStream &, const VCMIDLTool & );
+TQTextStream &operator<<( TQTextStream &, const VCCustomBuildTool & );
+TQTextStream &operator<<( TQTextStream &, const VCLibrarianTool & );
+TQTextStream &operator<<( TQTextStream &, const VCResourceCompilerTool & );
+TQTextStream &operator<<( TQTextStream &, const VCEventTool & );
+TQTextStream &operator<<( TQTextStream &, const VCConfiguration & );
+TQTextStream &operator<<( TQTextStream &, VCFilter & );
+TQTextStream &operator<<( TQTextStream &, 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 000000000..f22901b14
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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;
+
+    TQSettings setting;
+    TQStringList warnPath;
+    int installed = 0;
+    int i = 0;
+    for(; dotNetCombo[i].version; ++i) {
+        TQString path = setting.readEntry(dotNetCombo[i].regKey);
+        if(!path.isNull()) {
+            ++installed;
+            current_version = dotNetCombo[i].version;
+	    warnPath += TQString("%1").arg(dotNetCombo[i].versionStr);
+        }
+    }
+
+    if (installed < 2)
+        return current_version;
+
+    // More than one version installed, search directory path
+    TQString paths = getenv("PATH");
+    TQStringList pathlist = TQStringList::split(";", paths.lower());
+
+    i = installed = 0;
+    for(; dotNetCombo[i].version; ++i) {
+        TQString productPath = setting.readEntry(dotNetCombo[i].regKey).lower();
+        if (productPath.isNull())
+	        continue;
+        TQStringList::iterator it;
+        for(it = pathlist.begin(); it != pathlist.end(); ++it) {
+            if((*it).contains(productPath)) {
+                ++installed;
+                current_version = dotNetCombo[i].version;
+                warnPath += TQString("%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(TQMakeProject *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(TQTextStream &t)
+{
+    // Check if all retquirements are fullfilled
+    if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) {
+	fprintf(stderr, "Project file not generated because all retquirements not met:\n\t%s\n",
+		var("QMAKE_FAILED_RETQUIREMENTS").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 {
+    TQString uuid;
+    TQString vcprojFile, orig_target, target;
+    ::target targetType;
+    bool debugBuild;
+    TQStringList dependencies;
+};
+
+TQUuid VcprojGenerator::getProjectUUID(const TQString &filename)
+{
+    bool validUUID = TRUE;
+
+    // Read GUID from variable-space
+    TQUuid uuid = project->first("GUID");
+
+    // If none, create one based on the MD5 of absolute project path
+    if (uuid.isNull() || !filename.isNull()) {
+	TQString 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) | (TQUuid::Name<<12);
+    }
+
+    // If still not valid, generate new one, and suggest adding to .pro
+    if (uuid.isNull() || !validUUID) {
+	uuid = TQUuid::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;
+}
+
+TQUuid VcprojGenerator::increaseUUID( const TQUuid &id )
+{
+    TQUuid 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(TQTextStream &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;
+    }
+
+    TQDict<VcsolutionDepend> solution_depends;
+
+    TQPtrList<VcsolutionDepend> solution_cleanup;
+    solution_cleanup.setAutoDelete(TRUE);
+
+
+    TQStringList subdirs = project->variables()["SUBDIRS"];
+    TQString oldpwd = TQDir::currentDirPath();
+
+    for(TQStringList::Iterator it = subdirs.begin(); it != subdirs.end(); ++it) {
+	TQFileInfo fi(Option::fixPathToLocalOS((*it), TRUE));
+	if(fi.exists()) {
+	    if(fi.isDir()) {
+		TQString profile = (*it);
+		if(!profile.endsWith(Option::dir_sep))
+		    profile += Option::dir_sep;
+		profile += fi.baseName() + ".pro";
+		subdirs.append(profile);
+	    } else {
+		TQMakeProject tmp_proj;
+		TQString dir = fi.dirPath(), fn = fi.fileName();
+		if(!dir.isEmpty()) {
+		    if(!TQDir::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) {
+			    TQMap<TQString, TQStringList> &vars = tmp_proj.variables();
+			    for(TQMap<TQString, TQStringList>::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
+			TQString 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(!TQFile::exists(TQDir::currentDirPath() + Option::dir_sep + vcproj)) {
+			    warn_msg(WarnLogic, "Ignored (not found) '%s'", TQString(TQDir::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(TQDir::currentDirPath() + TQDir::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
+			TQStringList where("QMAKE_LIBS");
+			if(!tmp_proj.isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
+			    where = tmp_proj.variables()["QMAKE_INTERNAL_PRL_LIBS"];
+			for(TQStringList::iterator wit = where.begin();
+			    wit != where.end(); ++wit) {
+			    TQStringList &l = tmp_proj.variables()[(*wit)];
+			    for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+				TQString 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:
+		TQDir::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(TQStringList::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 TQt?
+    bool is_qt =
+	( project->first("TARGET") == "qt"TQTDLL_POSTFIX ||
+	  project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX );
+
+    // Are we using TQt?
+    bool isTQtActive = project->isActiveConfig("qt");
+
+    if ( isTQtActive ) {
+	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 = TQFileInfo(precompH).fileName();
+	// Created files
+	TQString 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 TQt, 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 -----------------------------
+    TQString 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 TQt 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()
+{
+    TQString 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"];
+    TQStringList::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" ) ) {
+	TQString name = project->first( "QMAKE_ORIG_TARGET" );
+	TQString nameext = project->first( "TARGET" );
+	TQString objdir = project->first( "OBJECTS_DIR" );
+	TQString idc = project->first( "QMAKE_IDC" );
+
+	RConf.postBuild.Description = "Finalizing ActiveTQt 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( TQString &x, TQString &y, bool flat_mode )
+{
+    if ( flat_mode ) {
+	TQString subX = x.mid( x.findRev('\\')+1 );
+	TQString subY = y.mid( y.findRev('\\')+1 );
+	return TQString::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 */) {
+	    TQString subX = x.mid(xPos);
+	    TQString subY = y.mid(yPos);
+	    return TQString::compare(subX, subY) < 0;
+	} else {
+	    TQString subX = x.mid(xPos, xSlashPos - xPos);
+	    TQString subY = y.mid(yPos, ySlashPos - yPos);
+	    int cmp = TQString::compare(subX, subY);
+	    if (cmp != 0)
+		return cmp < 0;
+	}
+	xPos = xSlashPos + 1;
+	yPos = ySlashPos + 1;
+    }
+    return FALSE;
+}
+void nonflatDir_BubbleSort( TQStringList& list, bool flat_mode )
+{
+    TQStringList::Iterator b = list.begin();
+    TQStringList::Iterator e = list.end();
+    TQStringList::Iterator last = e;
+    --last;		// goto last
+    if ( last == b )	// shortcut
+	return;
+    while( b != last ) {// sort them
+	bool swapped = FALSE;
+	TQStringList::Iterator swap_pos = b;
+	TQStringList::Iterator x = e;
+	TQStringList::Iterator y = x;
+	--y;
+	TQString 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;
+    TQStringList::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"TQTDLL_POSTFIX ||
+	  project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX );
+
+   TQStringList &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() ) {
+	TQString version = project->variables()["VERSION"][0];
+	int firstDot = version.find( "." );
+	TQString major = version.left( firstDot );
+	TQString minor = version.right( version.length() - firstDot - 1 );
+	minor.replace( TQRegExp( "\\." ), "" );
+	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"), "tqt-mt" );
+		}
+
+		if(hver != -1) {
+		    TQString ver;
+		    ver.sprintf("qt%s" TQTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "-mt" : ""), hver);
+		    TQStringList &libs = project->variables()["QMAKE_LIBS"];
+		    for(TQStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit)
+			(*libit).replace(TQRegExp("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() ) {
+	    TQString ver_xyz(project->first("VERSION"));
+	    ver_xyz.replace(TQRegExp("\\."), "");
+	    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(TQString("/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() ) {
+	TQString version = project->variables()["VERSION"][0];
+	int firstDot = version.find( "." );
+	TQString major = version.left( firstDot );
+	TQString 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
+    TQStringList &libList = project->variables()["QMAKE_LIBS"];
+    for( it = libList.begin(); it != libList.end(); ) {
+	TQString 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"] += TQStringList::split(' ', "HEADERS SOURCES DEF_FILE RC_FILE TARGET QMAKE_LIBS DESTDIR DLLDESTDIR INCLUDEPATH");
+    TQStringList &l = project->variables()["QMAKE_FILETAGS"];
+    for(it = l.begin(); it != l.end(); ++it) {
+	TQStringList &gdmf = project->variables()[(*it)];
+	for(TQStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner)
+	    (*inner) = Option::fixPathToTargetOS((*inner), FALSE);
+    }
+
+     // Get filename w/o extention -----------------------------------
+    TQString msvcproj_project = "";
+    TQString 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(TQRegExp("-"), "");
+
+    project->variables()["MSVCPROJ_PROJECT"].append(msvcproj_project);
+    TQStringList &proj = project->variables()["MSVCPROJ_PROJECT"];
+
+    for(it = proj.begin(); it != proj.end(); ++it)
+	(*it).replace(TQRegExp("\\.[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() ) {
+	TQStringList strl = project->variables()["QMAKE_LIBDIR"];
+	TQStringList::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 ",""));
+    TQStringList &incs = project->variables()["INCLUDEPATH"];
+    for(TQStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) {
+	TQString inc = (*incit);
+	inc.replace("&", "&amp;");
+	inc.replace(TQRegExp("\""), "");
+	project->variables()["MSVCPROJ_INCPATH"].append("/I" + inc );
+    }
+    project->variables()["MSVCPROJ_INCPATH"].append("/I" + specdir());
+
+    TQString 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( TQRegExp("\\$\\(QTDIR\\)"), getenv("QTDIR") );
+    project->variables()["MSVCPROJ_TARGET"] = dest;
+
+    // DLL COPY ------------------------------------------------------
+    if ( project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty() ) {
+	TQStringList dlldirs = project->variables()["DLLDESTDIR"].gres("&", "&amp;");
+	TQString copydll("");
+	TQStringList::Iterator dlldir;
+	for ( dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) {
+	    if ( !copydll.isEmpty() )
+		copydll += " &amp;&amp; ";
+	    copydll += "copy  &quot;$(TargetPath)&quot; &quot;" + *dlldir + "&quot;";
+	}
+
+	TQString 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") ) {
+	TQString idl = project->variables()["QMAKE_IDL"].first();
+	TQString idc = project->variables()["QMAKE_IDC"].first();
+	TQString version = project->variables()["VERSION"].first();
+	if ( version.isEmpty() )
+	    version = "1.0";
+
+	TQString objdir = project->first( "OBJECTS_DIR" );
+	project->variables()["MSVCPROJ_IDLSOURCES"].append( objdir + targetfilename + ".idl" );
+	if ( project->isActiveConfig( "dll" ) ) {
+	    TQString regcmd = "# Begin Special Build Tool\n"
+			    "TargetPath=" + targetfilename + "\n"
+			    "SOURCE=$(InputPath)\n"
+			    "PostBuild_Desc=Finalizing ActiveTQt 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";
+
+	    TQString 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 {
+	    TQString regcmd = "# Begin Special Build Tool\n"
+			    "TargetPath=" + targetfilename + "\n"
+			    "SOURCE=$(InputPath)\n"
+			    "PostBuild_Desc=Finalizing ActiveTQt 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";
+
+	    TQString 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 ---------------------------------------------------------
+    TQStringList &list = project->variables()["FORMS"];
+    for( it = list.begin(); it != list.end(); ++it ) {
+	if ( TQFile::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(TQFile &file) const
+{
+    TQString outdir;
+    if(!file.name().isEmpty()) {
+	TQFileInfo fi(file);
+	if(fi.isDir())
+	    outdir = file.name() + TQDir::separator();
+    }
+    if(!outdir.isEmpty() || file.name().isEmpty()) {
+	TQString ext = project->first("VCPROJ_EXTENSION");
+	if(project->first("TEMPLATE") == "vcsubdirs")
+	    ext = project->first("VCSOLUTION_EXTENSION");
+	file.setName(outdir + project->first("TARGET") + ext);
+    }
+    if(TQDir::isRelativePath(file.name())) {
+	file.setName( Option::fixPathToLocalOS(TQDir::currentDirPath() + Option::dir_sep + fixFilename(file.name())) );
+    }
+    return Win32MakefileGenerator::openOutput(file);
+}
+
+TQString VcprojGenerator::fixFilename(TQString 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;
+}
+
+TQString VcprojGenerator::findTemplate(TQString file)
+{
+    TQString ret;
+    if(!TQFile::exists((ret = file)) &&
+       !TQFile::exists((ret = TQString(Option::mkfile::qmakespec + "/" + file))) &&
+       !TQFile::exists((ret = TQString(getenv("QTDIR")) + "/mkspecs/win32-msvc.net/" + file)) &&
+       !TQFile::exists((ret = (TQString(getenv("HOME")) + "/.tmake/" + file))))
+	return "";
+    debug_msg(1, "Generator: MSVC.NET: Found template \'%s\'", ret.latin1() );
+    return ret;
+}
+
+
+void VcprojGenerator::processPrlVariable(const TQString &var, const TQStringList &l)
+{
+    if(var == "QMAKE_PRL_DEFINES") {
+	TQStringList &out = project->variables()["MSVCPROJ_DEFINES"];
+	for(TQStringList::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 ( TQMap<TQString, TQStringList>::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 000000000..c6ec5cb11
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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 TQUuid;
+class VcprojGenerator : public Win32MakefileGenerator
+{
+    bool init_flag;
+    bool writeVcprojParts(TQTextStream &);
+
+    bool writeMakefile(TQTextStream &);
+    virtual void writeSubDirs(TQTextStream &t);
+    TQString findTemplate(TQString file);
+    void init();
+
+public:
+    VcprojGenerator(TQMakeProject *p);
+    ~VcprojGenerator();
+
+    TQString defaultMakefile() const;
+    virtual bool doDepends() const { return FALSE; } //never necesary
+    TQString precompH, precompHFilename,
+	    precompObj, precompPch;
+    bool usePCH;
+
+protected:
+    virtual bool openOutput(TQFile &file) const;
+    virtual void processPrlVariable(const TQString &, const TQStringList &);
+    virtual bool findLibraries();
+    virtual void outputVariables();
+    TQString fixFilename(TQString 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:
+    TQUuid getProjectUUID(const TQString &filename=TQString::null);
+    TQUuid increaseUUID(const TQUuid &id);
+    friend class VCFilter;
+};
+
+inline VcprojGenerator::~VcprojGenerator()
+{ }
+
+inline TQString 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 000000000..6c92cb747
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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(TQMakeProject *p) : MakefileGenerator(p)
+{
+
+}
+
+
+struct SubDir
+{
+    TQString directory, profile, target, makefile;
+};
+
+void
+Win32MakefileGenerator::writeSubDirs(TQTextStream &t)
+{
+    TQPtrList<SubDir> subdirs;
+    {
+	TQStringList subdirs_in = project->variables()["SUBDIRS"];
+	for(TQStringList::Iterator it = subdirs_in.begin(); it != subdirs_in.end(); ++it) {
+	    TQString 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()) {
+		TQString 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('.', '_');
+	}
+    }
+    TQPtrListIterator<SubDir> it(subdirs);
+
+    t << "MAKEFILE = " << (project->isEmpty("MAKEFILE") ? TQString("Makefile") : var("MAKEFILE")) << endl;
+    t << "QMAKE =	" << (project->isEmpty("QMAKE_QMAKE") ? TQString("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
+	TQString 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(); ) {
+            TQString 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();
+	    TQString subdir = (*it)->directory;
+	    TQString 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;
+
+    TQStringList targs;
+    targs << "clean" << "install_subdirs" << "mocables" << "uicables" << "uiclean" << "mocclean";
+    targs += project->values("SUBDIR_TARGETS");
+    for(TQStringList::Iterator targ_it = targs.begin(); targ_it != targs.end(); ++targ_it) {
+        t << (*targ_it) << ": qmake_all";
+	TQString 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;
+		TQString 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
+    TQStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"];
+    for(TQStringList::Iterator sit = qut.begin(); sit != qut.end(); ++sit) {
+	TQString targ = var((*sit) + ".target"),
+		 cmd = var((*sit) + ".commands"), deps;
+	if(targ.isEmpty())
+	    targ = (*sit);
+	TQStringList &deplist = project->variables()[(*sit) + ".depends"];
+	for(TQStringList::Iterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) {
+	    TQString 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 += TQString(" ") + "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 TQString &d, const TQString &stem)
+{
+    TQString bd = Option::fixPathToLocalOS(d, TRUE);
+    if(!TQFile::exists(bd))
+	return -1;
+    if(!project->variables()["QMAKE_" + stem.upper() + "_VERSION_OVERRIDE"].isEmpty())
+	return project->variables()["QMAKE_" + stem.upper() + "_VERSION_OVERRIDE"].first().toInt();
+
+    TQDir dir(bd);
+    int biggest=-1;
+    TQStringList entries = dir.entryList();
+    TQString dllStem = stem + TQTDLL_POSTFIX;
+    TQRegExp regx( "(" + dllStem + "([0-9]*)).lib", FALSE );
+    for(TQStringList::Iterator it = entries.begin(); it != entries.end(); ++it) {
+	if(regx.exactMatch((*it)))
+	    biggest = TQMAX(biggest, (regx.cap(1) == dllStem ||
+				     regx.cap(2).isEmpty()) ? -1 : regx.cap(2).toInt());
+    }
+    TQMakeMetaInfo libinfo;
+    if(libinfo.readLib(bd + dllStem)) {
+	if(!libinfo.isEmpty("QMAKE_PRL_VERSION"))
+	    biggest = TQMAX(biggest, libinfo.first("QMAKE_PRL_VERSION").replace(".", "").toInt());
+    }
+    return biggest;
+}
+
+TQString
+Win32MakefileGenerator::findDependency(const TQString &dep)
+{
+    {
+	TQStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"];
+	for(TQStringList::Iterator it = qut.begin(); it != qut.end(); ++it) {
+	    TQString targ = var((*it) + ".target");
+	    if(targ.isEmpty())
+		targ = (*it);
+	    if(targ.endsWith(dep))
+		return targ;
+	}
+    }
+    {
+	TQStringList &quc = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"];
+	for(TQStringList::Iterator it = quc.begin(); it != quc.end(); ++it) {
+	    TQString tmp_out = project->variables()[(*it) + ".output"].first();
+	    TQString tmp_cmd = project->variables()[(*it) + ".commands"].join(" ");
+	    if(tmp_out.isEmpty() || tmp_cmd.isEmpty())
+		continue;
+	    TQStringList &tmp = project->variables()[(*it) + ".input"];
+	    for(TQStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
+		TQStringList &inputs = project->variables()[(*it2)];
+		for(TQStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
+		    TQString out = tmp_out;
+		    TQFileInfo 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 TQString &where)
+{
+
+    TQStringList &l = project->variables()[where];
+    TQPtrList<MakefileDependDir> dirs;
+    {
+	TQStringList &libpaths = project->variables()["QMAKE_LIBDIR"];
+	for(TQStringList::Iterator libpathit = libpaths.begin(); libpathit != libpaths.end(); ++libpathit) {
+	    TQString r = (*libpathit), l = r;
+	    fixEnvVariables(l);
+	    dirs.append(new MakefileDependDir(r.replace("\"",""), l.replace("\"","")));
+	}
+    }
+    dirs.setAutoDelete(TRUE);
+    for(TQStringList::Iterator it = l.begin(); it != l.end(); ) {
+	TQChar quote;
+	bool modified_opt = FALSE, remove = FALSE;
+	TQString 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:")) {
+            TQString r = opt.mid(9), l = Option::fixPathToLocalOS(r);
+            dirs.append(new MakefileDependDir(r.replace("\"",""),
+                                              l.replace("\"","")));
+        } else if(opt.startsWith("-L") || opt.startsWith("/L")) {
+            TQString 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")) {
+            TQString lib = opt.right(opt.length() - 2), out;
+            if(!lib.isEmpty()) {
+                for(MakefileDependDir *mdd = dirs.first(); mdd; mdd = dirs.next() ) {
+		    TQString extension;
+                    int ver = findHighestVersion(mdd->local_dir, lib);
+		    if(ver > 0)
+			extension += TQString::number(ver);
+		    extension += ".lib";
+		    if(TQMakeMetaInfo::libExists(mdd->local_dir + Option::dir_sep + lib) ||
+		       TQFile::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(!TQFile::exists(Option::fixPathToLocalOS(opt))) {
+	    TQPtrList<MakefileDependDir> lib_dirs;
+	    TQString file = opt;
+            int slsh = file.findRev(Option::dir_sep);
+            if(slsh != -1) {
+                TQString 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() ) {
+			    TQString 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) {
+				    TQString 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()
+{
+    TQDict<void> processed;
+    TQPtrList<MakefileDependDir> libdirs;
+    libdirs.setAutoDelete(TRUE);
+    {
+	TQStringList &libpaths = project->variables()["QMAKE_LIBDIR"];
+	for(TQStringList::Iterator libpathit = libpaths.begin(); libpathit != libpaths.end(); ++libpathit) {
+	    TQString 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..
+	TQStringList l_out;
+	TQString where = "QMAKE_LIBS";
+	if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
+	    where = project->first("QMAKE_INTERNAL_PRL_LIBS");
+	TQStringList &l = project->variables()[where];
+	for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	    TQString opt = (*it);
+	    if(opt.startsWith("/")) {
+		if(opt.startsWith("/LIBPATH:")) {
+		    TQString 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() ) {
+			    TQString 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 000000000..395638025
--- /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 TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements 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 [email protected].
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
+** included in the packaging of this file.  Licensees holding valid TQt
+** Commercial licenses may use this file in accordance with the TQt
+** 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 TQt evaluation and educational version, we have a postfix in the
+// library name (e.g. qtmteval301.dll). TQTDLL_POSTFIX is used for this.
+// A script modifies these lines when building eval/edu version, so be careful
+// when changing them.
+#ifndef TQTDLL_POSTFIX
+#define TQTDLL_POSTFIX ""
+#endif
+
+class Win32MakefileGenerator : public MakefileGenerator
+{
+protected:
+    virtual void writeSubDirs(TQTextStream &t);
+    int findHighestVersion(const TQString &dir, const TQString &stem);
+    bool findLibraries(const TQString &);
+    TQString findDependency(const TQString &);
+    virtual bool findLibraries();
+    virtual void processPrlFiles();
+
+public:
+    Win32MakefileGenerator(TQMakeProject *p);
+    ~Win32MakefileGenerator();
+};
+
+inline Win32MakefileGenerator::~Win32MakefileGenerator()
+{ }
+
+inline bool Win32MakefileGenerator::findLibraries()
+{ return findLibraries("QMAKE_LIBS"); }
+
+
+
+#endif /* __WINMAKEFILE_H__ */