update qmake to 1.05a

19 files changed, 2036 insertions, 739 deletions

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index f490313..c12375d 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -5,7 +5,7 @@
 **
 ** Created : 970521
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the network module of the Qt GUI Toolkit.
 **
@@ -59,8 +59,22 @@
 #define S_ISDIR(m)	(((m) & S_IFMT) == S_IFDIR)
 #endif
 
+static QString mkdir_p_asstring(const QString &dir)
+{
+    QString ret =  "@$(CHK_DIR_EXISTS) \"" + dir + "\" ";
+    if(Option::target_mode == Option::TARG_WIN_MODE)
+	ret += "$(MKDIR)";
+    else
+	ret += "|| $(MKDIR)";
+    ret += " \"" + dir + "\"";
+    return ret;
+}
+
 static bool createDir(const QString& fullPath)
 {
+    if(QFile::exists(fullPath))
+	return FALSE;
+
     QDir dirTmp;
     bool ret = TRUE;
     QString pathComponent, tmpPath;
@@ -77,8 +91,8 @@ static bool createDir(const QString& fullPath)
 }
 
 
-MakefileGenerator::MakefileGenerator(QMakeProject *p) : init_opath_already(FALSE), 
-							init_already(FALSE), moc_aware(FALSE), 
+MakefileGenerator::MakefileGenerator(QMakeProject *p) : init_opath_already(FALSE),
+							init_already(FALSE), moc_aware(FALSE),
 							no_io(FALSE), project(p)
 {
 }
@@ -88,12 +102,12 @@ 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);
+	big_buffer = (char *)realloc(big_buffer, s);
     return big_buffer;
 }
 
 bool
-MakefileGenerator::generateMocList(QString fn_target)
+MakefileGenerator::generateMocList(const QString &fn_target)
 {
     if(!findMocDestination(fn_target).isEmpty())
 	return TRUE;
@@ -173,7 +187,8 @@ MakefileGenerator::generateMocList(QString fn_target)
 		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);
+		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;
@@ -185,16 +200,17 @@ MakefileGenerator::generateMocList(QString fn_target)
 		    mocFile = fn_target.left(dir_pos+1);
 
 		bool cpp_ext = FALSE;
-		for(QStringList::Iterator cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit) {
+		for(QStringList::Iterator cppit = Option::cpp_ext.begin(); 
+		    cppit != Option::cpp_ext.end(); ++cppit) {
 		    if((cpp_ext = (fn_target.right(ext_len) == (*cppit))))
 			break;
 		}
 		if(cpp_ext) {
 		    mocFile += fn_target.mid(dir_pos+1, ext_pos - dir_pos-1) + Option::moc_ext;
-		    findDependencies(fn_target).append(mocFile);
 		    project->variables()["_SRCMOC"].append(mocFile);
 		} else if(project->variables()["HEADERS"].findIndex(fn_target) != -1) {
-		    for(QStringList::Iterator hit = Option::h_ext.begin(); hit != Option::h_ext.end(); ++hit) {
+		    for(QStringList::Iterator hit = Option::h_ext.begin(); 
+			hit != Option::h_ext.end(); ++hit) {
 			if((fn_target.right(ext_len) == (*hit))) {
 			    mocFile += Option::moc_mod + fn_target.mid(dir_pos+1, ext_pos - dir_pos-1) +
 				       Option::cpp_ext.first();
@@ -225,13 +241,12 @@ MakefileGenerator::generateMocList(QString fn_target)
 }
 
 bool
-MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QString fn, bool recurse)
+MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, const QString &f, bool recurse)
 {
-    fn = fileFixify(fn);
-    QStringList &fndeps = findDependencies(fn);
+    QStringList &fndeps = findDependencies(f);
     if(!fndeps.isEmpty())
 	return TRUE;
-
+    QString fn = fileFixify(f, QDir::currentDirPath(), Option::output_dir);
     fn = Option::fixPathToLocalOS(fn, FALSE);
     QString fix_env_fn = Option::fixPathToLocalOS(fn);
     int file = open(fix_env_fn.latin1(), O_RDONLY);
@@ -288,8 +303,10 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
 		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 ", 8)) {
-		    for(x+=8; //skip spaces after keyword
+		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);
@@ -328,7 +345,7 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
 	} else if(ui_file) {
 	    // skip whitespaces
 	    while(x < total_size_read &&
-		  (*(big_buffer+x) == ' ' || *(big_buffer+x) == '\t')) 
+		  (*(big_buffer+x) == ' ' || *(big_buffer+x) == '\t'))
 		x++;
 	    if(*(big_buffer + x) == '<') {
 		x++;
@@ -342,7 +359,7 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
 		} 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' && 
+			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) != '=')
@@ -369,7 +386,7 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
 			    *(big_buffer + x + val_len) = saved;
 			    if(where == "in implementation") {
 				QString cpp = fn.left(fn.length() - Option::ui_ext.length()) +
-					              Option::cpp_ext.first();
+						      Option::cpp_ext.first();
 				outdeps = &findDependencies(cpp);
 			    }
 			}
@@ -383,6 +400,7 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
 	}
 
 	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")) {
@@ -404,6 +422,7 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
 	    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((Option::target_mode == Option::TARG_MAC9_MODE && inc.find(':')) ||
 		   (Option::target_mode == Option::TARG_WIN_MODE && inc[1] != ':') ||
@@ -415,17 +434,17 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
 			if(!stat(mdd->local_dir + QDir::separator() + inc, &fst) &&
 			   !S_ISDIR(fst.st_mode)) {
 			    fqn = mdd->real_dir + QDir::separator() + inc;
-			    break;
+			    goto handle_fqn;
 			}
 		    }
 		}
 	    }
-	    if(fqn.isEmpty()) {
+	    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(Option::mkfile::do_dep_heuristics && depHeuristics.contains(inc)) {
+		if(depHeuristics.contains(inc)) {
 		    fqn = depHeuristics[inc];
 		} else if(Option::mkfile::do_dep_heuristics) { //some heuristics..
 		    //is it a file from a .ui?
@@ -447,11 +466,34 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
 				if(!fqn.isEmpty() && !fqn.endsWith(Option::dir_sep))
 				    fqn += Option::dir_sep;
 				fqn += inc_file;
-				break;
+				from_source_dir = FALSE;  //uics go in the output_dir (so don't fix them)
+				fqn = fileFixify(fqn, QDir::currentDirPath(), Option::output_dir);
+				goto handle_fqn;
+			    }
+			}
+		    }
+		    if(project->isActiveConfig("lex_included")) { //is this the lex file?
+			QString rhs = Option::lex_mod + Option::cpp_ext.first();
+			if(inc.endsWith(rhs)) {
+			    QString lhs = inc.left(inc.length() - rhs.length()) + Option::lex_ext;
+			    QStringList ll = project->variables()["LEXSOURCES"];
+			    for(QStringList::Iterator it = ll.begin(); it != ll.end(); ++it) {
+				QString s = (*it), d;
+				int slsh = s.findRev(Option::dir_sep);
+				if(slsh != -1) {
+				    d = s.left(slsh + 1);
+				    s = s.right(s.length() - slsh - 1);
+				}
+				if(!project->isEmpty("QMAKE_ABSOLUTE_SOURCE_PATH"))
+				    d = project->first("QMAKE_ABSOLUTE_SOURCE_PATH");
+				if(s == lhs) {
+				    fqn = d + inc;
+				    goto handle_fqn;
+				}
 			    }
 			}
 		    }
-		    if(fqn.isEmpty()) { //is it from a .y?
+		    { //is it from a .y?
 			QString rhs = Option::yacc_mod + Option::h_ext.first();
 			if(inc.endsWith(rhs)) {
 			    QString lhs = inc.left(inc.length() - rhs.length()) + Option::yacc_ext;
@@ -467,19 +509,48 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
 				    d = project->first("QMAKE_ABSOLUTE_SOURCE_PATH");
 				if(s == lhs) {
 				    fqn = d + inc;
-				    break;
+				    goto handle_fqn;
+				}
+			    }
+			}
+		    }
+		    if(mocAware() &&		    //is it a moc file?
+		       (inc.endsWith(Option::cpp_ext.first()) || inc.endsWith(Option::moc_ext))) {
+			QString mocs[] = { QString("_HDRMOC"), QString("_SRCMOC"), QString::null };
+			for(int moc = 0; !mocs[moc].isNull(); moc++) {
+			    QStringList &l = project->variables()[mocs[moc]];
+			    for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+				QString file = Option::fixPathToTargetOS((*it));
+				if(file.section(Option::dir_sep, -(inc.contains('/')+1)) == inc) {
+				    fqn = (*it);
+				    if(mocs[moc] == "_HDRMOC") {
+					//Since it is include, no need to link it in as well
+					project->variables()["_SRCMOC"].append((*it));
+					l.remove(it);
+				    } else if(!findMocSource(fqn).endsWith(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 handle_fqn;
 				}
 			    }
 			}
 		    }
 		    depHeuristics.insert(inc, fqn);
 		}
-		if(!Option::mkfile::do_dep_heuristics || fqn.isEmpty()) //I give up
-		    continue;
 	    }
-
-	    fqn = fileFixify(Option::fixPathToTargetOS(fqn, FALSE));
-	    debug_msg(4, "Resolved dependancy of %s to %s", inc.latin1(), fqn.latin1());
+	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);
 	}
@@ -497,7 +568,7 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
 		    fndeps.append((*it));
 	}
     }
-    debug_msg(2, "Dependancies: %s -> %s", fn.latin1(), fndeps.join(" :: ").latin1());
+    debug_msg(2, "Dependencies: %s -> %s", fn.latin1(), fndeps.join(" :: ").latin1());
     return TRUE;
 }
 
@@ -613,7 +684,11 @@ MakefileGenerator::init()
 
     /* get deps and mocables */
     QDict<void> cache_found_files;
-    QString cache_file(Option::output_dir + QDir::separator() + ".qmake.internal.cache");
+    QString cache_file(".qmake.internal.cache");
+    if(!project->isEmpty("QMAKE_INTERNAL_CACHE_FILE"))
+	cache_file = Option::fixPathToLocalOS(project->first("QMAKE_INTERNAL_CACHE_FILE"));
+    if(cache_file.find(QDir::separator()) == -1) //guess they know what they are doing..
+	cache_file.prepend(Option::output_dir + QDir::separator());
     if((Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT ||
 	Option::mkfile::do_deps || Option::mkfile::do_mocs) && !noIO()) {
 	QPtrList<MakefileDependDir> deplist;
@@ -628,7 +703,7 @@ MakefileGenerator::init()
 		deplist.append(new MakefileDependDir(r.replace("\"",""),
 						     l.replace("\"","")));
 	    }
-	    debug_msg(1, "Dependancy Directories: %s", incDirs.join(" :: ").latin1());
+	    debug_msg(1, "Dependency Directories: %s", incDirs.join(" :: ").latin1());
 	    if(Option::output.name() != "-" && project->isActiveConfig("qmake_cache")) {
 		QFile cachef(cache_file);
 		if(cachef.open(IO_ReadOnly | IO_Translate)) {
@@ -683,7 +758,7 @@ MakefileGenerator::init()
 					}
 				    }
 				    if(found) {
-					debug_msg(2, "Dependancies (cached): %s -> %s", file.latin1(),
+					debug_msg(2, "Dependencies (cached): %s -> %s", file.latin1(),
 						  files.join(" :: ").latin1());
 					findDependencies(file) = files;
 				    }
@@ -743,6 +818,7 @@ MakefileGenerator::init()
 		for(QStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) {
 		    if(!(*val_it).isEmpty()) {
 			QString file = Option::fixPathToLocalOS((*val_it));
+			QStringList file_list(file);
 			if(!QFile::exists(file)) {
 			    bool found = FALSE;
 			    if(QDir::isRelativePath(file)) {
@@ -769,7 +845,7 @@ MakefileGenerator::init()
 				QString dir, regex = (*val_it), real_dir;
 				if(regex.findRev(Option::dir_sep) != -1) {
 				    dir = regex.left(regex.findRev(Option::dir_sep) + 1);
-				    real_dir = fileFixify(Option::fixPathToLocalOS(dir), 
+				    real_dir = fileFixify(Option::fixPathToLocalOS(dir),
 							  QDir::currentDirPath(), Option::output_dir);
 				    regex = regex.right(regex.length() - dir.length());
 				}
@@ -782,9 +858,14 @@ MakefileGenerator::init()
 					warn_msg(WarnLogic, "Failure to find: %s", (*val_it).latin1());
 					continue;
 				    } else {
-					(*val_it) = dir + d[0];
-					for(int i = 1; i < (int)d.count(); i++)
-					    l.insert(val_it, dir + d[i]);
+					file_list.clear();
+					for(int i = 0; i < (int)d.count(); i++) {
+					    file_list.append(dir + d[i]);
+					    if(i == (int)d.count() - 1)
+						(*val_it) = dir + d[i];
+					    else
+						l.insert(val_it, dir + d[i]);
+					}
 				    }
 				} else {
 				    debug_msg(1, "%s:%d Cannot match %s%c%s, as %s does not exist.",
@@ -795,39 +876,43 @@ MakefileGenerator::init()
 				}
 			    }
 			}
-
-			QString val_file = fileFixify((*val_it));
-			bool found_cache_moc = FALSE, found_cache_dep = FALSE;
-			if(read_cache && Option::output.name() != "-" &&
-			   project->isActiveConfig("qmake_cache")) {
-			    if(!findDependencies(val_file).isEmpty())
-				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;
-			}
-			if(!found_cache_dep && sources[x] != "OBJECTS") {
-			    debug_msg(5, "Looking for dependancies for %s", (*val_it).latin1());
-			    generateDependencies(deplist, (*val_it), doDepends());
-			}
-			if(found_cache_moc) {
-			    QString moc = findMocDestination(val_file);
-			    if(!moc.isEmpty()) {
-				for(QStringList::Iterator cppit = Option::cpp_ext.begin();
-				    cppit != Option::cpp_ext.end(); ++cppit) {
-				    if(val_file.endsWith((*cppit))) {
-					QStringList &deps = findDependencies(val_file);
-					if(!deps.contains(moc))
-					    deps.append(moc);
-					break;
+			for(QStringList::Iterator file_it = file_list.begin(); 
+			    file_it != file_list.end(); ++file_it) {
+			    QString file_list_file = fileFixify((*file_it));
+			    bool found_cache_moc = FALSE, found_cache_dep = FALSE;
+			    if(read_cache && Option::output.name() != "-" &&
+			       project->isActiveConfig("qmake_cache")) {
+				if(!findDependencies(file_list_file).isEmpty())
+				    found_cache_dep = TRUE;
+				if(cache_found_files[(*file_it)] == (void *)2)
+				    found_cache_moc = TRUE;
+				if(!found_cache_moc || !found_cache_dep)
+				    write_cache = TRUE;
+			    }
+			    /* Do moc before dependency checking since some includes can come from
+			       moc_*.cpp files */
+			    if(found_cache_moc) {
+				QString moc = findMocDestination(file_list_file);
+				if(!moc.isEmpty()) {
+				    for(QStringList::Iterator cppit = Option::cpp_ext.begin();
+					cppit != Option::cpp_ext.end(); ++cppit) {
+					if(file_list_file.endsWith((*cppit))) {
+					    QStringList &deps = findDependencies(file_list_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((*file_it));
+			    }
+			    if(!found_cache_dep && sources[x] != "OBJECTS") {
+				debug_msg(5, "Looking for dependencies for %s", (*file_it).latin1());
+				generateDependencies(deplist, (*file_it), doDepends());
 			    }
-			} else if(mocAware() && (sources[x] == "SOURCES" || sources[x] == "HEADERS") &&
-				  (Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT ||
-				   Option::mkfile::do_mocs)) {
-			    generateMocList((*val_it));
 			}
 		    }
 		}
@@ -853,11 +938,12 @@ MakefileGenerator::init()
 		    for(int x = 0; moc_sources[x] != QString::null; x++) {
 			QStringList &l = v[moc_sources[x]];
 			for(QStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) {
-			    if(!(*val_it).isEmpty()) {
-				mc = mocablesToMOC[(*val_it)];
+			    QString f = fileFixify((*val_it));
+			    if(!f.isEmpty()) {
+				mc = mocablesToMOC[f];
 				if(mc.isEmpty())
 				    mc = "*qmake_ignore*";
-				cachet << (*val_it) << " = " << mc << endl;
+				cachet << f << " = " << mc << endl;
 			    }
 			}
 		    }
@@ -946,10 +1032,11 @@ MakefileGenerator::init()
 
     //UI files
     {
+	QStringList &includepath = project->variables()["INCLUDEPATH"];
 	if(!project->isEmpty("UI_DIR"))
-	    project->variables()["INCLUDEPATH"].append(project->first("UI_DIR"));
+	    includepath.append(project->first("UI_DIR"));
 	else if(!project->isEmpty("UI_HEADERS_DIR"))
-	    project->variables()["INCLUDEPATH"].append(project->first("UI_HEADERS_DIR"));
+	    includepath.append(project->first("UI_HEADERS_DIR"));
 	QStringList &decls = v["UICDECLS"], &impls = v["UICIMPLS"];
 	QStringList &l = v["FORMS"];
 	for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
@@ -960,19 +1047,20 @@ MakefileGenerator::init()
 		QString d = fi.dirPath();
 		if( d == ".")
 		    d = QDir::currentDirPath();
-		d = fileFixify(d);
-		if( !project->variables()["INCLUDEPATH"].contains(d))
-		    project->variables()["INCLUDEPATH"].append(d);
+		d = fileFixify(d, QDir::currentDirPath(), Option::output_dir);
+		if(!includepath.contains(d))
+		    includepath.append(d);
 	    } else {
 		if(decl.isEmpty() && !project->isEmpty("UI_HEADERS_DIR"))
 		    decl = project->first("UI_HEADERS_DIR");
-		if ( !decl.isEmpty() || (project->isEmpty("UI_HEADERS_DIR") && !project->isEmpty("UI_SOURCES_DIR")) ) {
+		if(!decl.isEmpty() || (project->isEmpty("UI_HEADERS_DIR") && 
+				       !project->isEmpty("UI_SOURCES_DIR")) ) {
 		    QString d = fi.dirPath();
 		    if( d == ".")
 			d = QDir::currentDirPath();
-		    d = fileFixify(d);
-		    if( !project->variables()["INCLUDEPATH"].contains(d))
-			project->variables()["INCLUDEPATH"].append(d);
+		    d = fileFixify(d, QDir::currentDirPath(), Option::output_dir);
+		    if(includepath.contains(d))
+			includepath.append(d);
 		}
 		if(impl.isEmpty() && !project->isEmpty("UI_SOURCES_DIR"))
 		    impl = project->first("UI_SOURCES_DIR");
@@ -983,7 +1071,21 @@ MakefileGenerator::init()
 			decl = fi.dirPath() + Option::dir_sep;
 		}
 	    }
-	    impl += fi.baseName(TRUE) + Option::cpp_ext.first(),
+	    impl = fileFixify(impl, QDir::currentDirPath(), Option::output_dir);
+	    if(!impl.isEmpty())
+		impl += Option::dir_sep;
+	    impl += fi.baseName(TRUE) + Option::cpp_ext.first();
+	    if(Option::output_dir != QDir::currentDirPath() && 
+	       project->isEmpty("UI_DIR") && project->isEmpty("UI_HEADERS_DIR")) {
+		QString decl_fixed = fileFixify(decl, QDir::currentDirPath(), Option::output_dir);
+		if(!includepath.contains(decl_fixed))
+		    includepath.append(decl_fixed);
+		if(!includepath.contains(decl))
+		    project->variables()["INCLUDEPATH"].append(decl);
+	    }
+	    decl = fileFixify(decl, QDir::currentDirPath(), Option::output_dir);
+	    if(!decl.isEmpty())
+		decl += Option::dir_sep;
 	    decl += fi.baseName(TRUE) + Option::h_ext.first();
 	    logicWarn(impl, "SOURCES");
 	    logicWarn(decl, "HEADERS");
@@ -1030,9 +1132,9 @@ MakefileGenerator::init()
 	}
 	v["OBJECTS"] += (v["IMAGEOBJECTS"] = createObjectList("QMAKE_IMAGE_COLLECTION"));
     }
-
-    if(!project->isEmpty("QMAKE_ABSOLUTE_SOURCE_PATH"))
-	project->variables()["INCLUDEPATH"].append(Option::output_dir);
+    if(Option::output_dir != QDir::currentDirPath()) 
+	project->variables()["INCLUDEPATH"].append(fileFixify(Option::output_dir, Option::output_dir,
+							      Option::output_dir));
 
     //moc files
     if ( mocAware() ) {
@@ -1066,7 +1168,7 @@ MakefileGenerator::processPrlFile(QString &file)
 	prl_file = tmp + Option::prl_ext;
     }
     prl_file = fileFixify(prl_file);
-    if(!QFile::exists(fileFixify(prl_file, QDir::currentDirPath(), Option::output_dir)) && 
+    if(!QFile::exists(fileFixify(prl_file, QDir::currentDirPath(), Option::output_dir)) &&
        project->isActiveConfig("qt")) {
 	QString stem = prl_file, dir, extn;
 	int slsh = stem.findRev('/'), hadlib = 0;
@@ -1104,7 +1206,7 @@ MakefileGenerator::processPrlFile(QString &file)
 	QMakeProject proj;
 	debug_msg(1, "Processing PRL file: %s", real_prl_file.latin1());
 	if(!proj.read(fileFixify(real_prl_file, QDir::currentDirPath(), Option::output_dir),
-		      QDir::currentDirPath())) {
+		      QDir::currentDirPath(), TRUE)) {
 	    fprintf(stderr, "Error processing prl file: %s\n", real_prl_file.latin1());
 	} else {
 	    ret = TRUE;
@@ -1196,6 +1298,8 @@ MakefileGenerator::writePrlFile(QTextStream &t)
 	t << "QMAKE_PRL_DEFINES = " << project->variables()["PRL_EXPORT_DEFINES"].join(" ") << endl;
     if(!project->isEmpty("CONFIG"))
 	t << "QMAKE_PRL_CONFIG = " << project->variables()["CONFIG"].join(" ") << endl;
+    if(!project->isEmpty("VERSION"))
+        t << "QMAKE_PRL_VERSION = " << project->first("VERSION") << endl;
     if(project->isActiveConfig("staticlib") || project->isActiveConfig("explicitlib")) {
 	QStringList libs;
 	if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
@@ -1228,8 +1332,7 @@ MakefileGenerator::write()
 	prl += Option::prl_ext;
 	if(!project->isEmpty("DESTDIR"))
 	    prl.prepend(var("DESTDIR"));
-	QString local_prl = fileFixify(prl, QDir::currentDirPath(), Option::output_dir);
-	fixEnvVariables(local_prl);
+	QString local_prl = Option::fixPathToLocalOS(fileFixify(prl, QDir::currentDirPath(), Option::output_dir));
 	QFile ft(local_prl);
 	if(ft.open(IO_WriteOnly)) {
 	    project->variables()["ALL_DEPS"].append(prl);
@@ -1240,7 +1343,7 @@ MakefileGenerator::write()
 	}
     }
     if(Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE &&
-       project->isActiveConfig("link_prl")) //load up prl's
+       project->isActiveConfig("link_prl")) //load up prl's'
 	processPrlFiles();
 
     if(Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE ||
@@ -1302,7 +1405,7 @@ MakefileGenerator::writeObj(QTextStream &t, const QString &obj, const QString &s
 		    use_implicit_rule = FALSE;
 	    }
 	}
-	if (!use_implicit_rule) {
+	if (!use_implicit_rule && !project->isEmpty(comp)) {
 	    QString p = var(comp);
 	    p.replace(stringSrc, (*sit));
 	    p.replace(stringObj, (*oit));
@@ -1320,20 +1423,36 @@ MakefileGenerator::writeUicSrc(QTextStream &t, const QString &ui)
     for(QStringList::Iterator it = uil.begin(); it != uil.end(); it++) {
 	QString deps = findDependencies((*it)).join(" \\\n\t\t"), decl, impl;
 	{
-	    QString tmp = (*it);
+	    QString tmp = (*it), impl_dir, decl_dir;
 	    decl = tmp.replace(QRegExp("\\" + Option::ui_ext + "$"), Option::h_ext.first());
+	    decl = fileFixify(decl, QDir::currentDirPath(), Option::output_dir);
+	    int dlen = decl.findRev(Option::dir_sep) + 1;	    
 	    tmp = (*it);
 	    impl = tmp.replace(QRegExp("\\" + Option::ui_ext + "$"), Option::cpp_ext.first());
-		int dlen = (*it).findRev(Option::dir_sep) + 1;
+	    impl = fileFixify(impl, QDir::currentDirPath(), Option::output_dir);
+	    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() - dlen);
+		impl = project->first("UI_DIR") + impl.right(impl.length() - ilen);
 	    } else {
-		if(!project->isEmpty("UI_HEADERS_DIR"))
+		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 = project->first("UI_SOURCES_DIR") + impl.right(impl.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);
+		}
+	    } 
+	    if(decl_dir.isEmpty()) 
+		decl_dir = decl.left(dlen);
+	    if(impl_dir.isEmpty()) 
+		impl_dir = impl.left(ilen);
+	    if(!impl_dir.isEmpty()) 
+		createDir(Option::output_dir + Option::dir_sep + impl_dir);
+	    if(!decl_dir.isEmpty() && decl_dir != impl_dir) 
+		createDir(Option::output_dir + Option::dir_sep + decl_dir);
 	}
 	t << decl << ": " << (*it) << " " << deps << "\n\t"
 	  << "$(UIC) " << (*it) << " -o " << decl << endl << endl;
@@ -1370,7 +1489,7 @@ MakefileGenerator::writeMocObj(QTextStream &t, const QString &obj, const QString
 		    use_implicit_rule = FALSE;
 	    }
 	}
-	if (!use_implicit_rule) {
+	if (!use_implicit_rule && !project->isEmpty("QMAKE_RUN_CXX")) {
 	    QString p = var("QMAKE_RUN_CXX");
 	    p.replace(stringSrc, (*sit));
 	    p.replace(stringObj, (*oit));
@@ -1413,9 +1532,13 @@ MakefileGenerator::writeYaccSrc(QTextStream &t, const QString &src)
     QString stringBase("$base");
     for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
 	QFileInfo fi((*it));
-	QString dir = fileFixify(Option::output_dir);
+	QString dir;
+	if(fi.dirPath() != ".")
+	    dir = fi.dirPath() + Option::dir_sep;
+	dir = fileFixify(dir, QDir::currentDirPath(), Option::output_dir);
 	if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep)
 	    dir += Option::dir_sep;
+
 	QString impl = dir + fi.baseName(TRUE) + Option::yacc_mod + Option::cpp_ext.first();
 	QString decl = dir + fi.baseName(TRUE) + Option::yacc_mod + Option::h_ext.first();
 
@@ -1423,7 +1546,7 @@ MakefileGenerator::writeYaccSrc(QTextStream &t, const QString &src)
 	if(!project->isActiveConfig("yacc_no_name_mangle")) {
 	    mangle = fi.baseName(TRUE);
 	    yaccflags += " -p " + mangle;
-	} 
+	}
 	QString out_h = default_out_h, out_c = default_out_c;
 	if(!mangle.isEmpty()) {
 	    out_h.replace(stringBase, mangle);
@@ -1452,7 +1575,10 @@ MakefileGenerator::writeLexSrc(QTextStream &t, const QString &src)
     QString stringBase("$base");
     for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
 	QFileInfo fi((*it));
-	QString dir = fileFixify(Option::output_dir);
+	QString dir;
+	if(fi.dirPath() != ".")
+	    dir = fi.dirPath() + Option::dir_sep;
+	dir = fileFixify(dir, QDir::currentDirPath(), Option::output_dir);
 	if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep)
 	    dir += Option::dir_sep;
 	QString impl = dir + fi.baseName(TRUE) + Option::lex_mod + Option::cpp_ext.first();
@@ -1463,7 +1589,7 @@ MakefileGenerator::writeLexSrc(QTextStream &t, const QString &src)
 	    lexflags += " -P" + stub;
 	}
 	QString out_c = default_out_c;
-	if(!stub.isEmpty()) 
+	if(!stub.isEmpty())
 	    out_c.replace(stringBase, stub);
 
 	t << impl << ": " << (*it) << " " << findDependencies((*it)).join(" \\\n\t\t") << "\n\t"
@@ -1494,7 +1620,7 @@ MakefileGenerator::writeImageObj(QTextStream &t, const QString &obj)
 		    use_implicit_rule = FALSE;
 	    }
 	}
-	if(!use_implicit_rule) {
+	if(!use_implicit_rule && !project->isEmpty("QMAKE_RUN_CXX")) {
 	    QString p = var("QMAKE_RUN_CXX");
 	    p.replace( stringSrc, src);
 	    p.replace( stringObj, (*oit));
@@ -1541,76 +1667,105 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs)
 	}
 
 	bool do_default = TRUE;
-	QString target, dst="$(INSTALL_ROOT)" + Option::fixPathToTargetOS(project->variables()[pvar].first(), FALSE);
+	const QString root = "$(INSTALL_ROOT)";
+	QString target, dst= fileFixify(project->variables()[pvar].first());
+#ifndef Q_WS_WIN
 	if(dst.right(1) != Option::dir_sep)
 	    dst += Option::dir_sep;
- 	QStringList tmp, &uninst = project->variables()[(*it) + ".uninstall"];
- 	//other
- 	tmp = project->variables()[(*it) + ".extra"];
- 	if(!tmp.isEmpty()) {
+#endif
+	QStringList tmp, &uninst = project->variables()[(*it) + ".uninstall"];
+	//other
+	tmp = project->variables()[(*it) + ".extra"];
+	if(!tmp.isEmpty()) {
 	    do_default = FALSE;
 	    if(!target.isEmpty())
- 		target += "\n\t";
- 	    target += tmp.join(" ");
- 	}
- 	//masks
- 	tmp = project->variables()[(*it) + ".files"];
- 	if(!tmp.isEmpty()) {
+		target += "\n\t";
+	    target += tmp.join(" ");
+	}
+	//masks
+	tmp = project->variables()[(*it) + ".files"];
+	if(!tmp.isEmpty()) {
 	    if(!target.isEmpty())
- 		target += "\n";
+		target += "\n";
 	    do_default = FALSE;
 	    for(QStringList::Iterator wild_it = tmp.begin(); wild_it != tmp.end(); ++wild_it) {
 		QString wild = Option::fixPathToLocalOS((*wild_it), FALSE), wild_var = fileFixify(wild);
+		QString dirstr = QDir::currentDirPath(), filestr = wild;
+		int slsh = filestr.findRev(Option::dir_sep);
+		if(slsh != -1) {
+		    dirstr = filestr.left(slsh+1);
+		    filestr = filestr.right(filestr.length() - slsh - 1);
+		}
+		if(dirstr.right(Option::dir_sep.length()) != Option::dir_sep)
+		    dirstr += Option::dir_sep;
 		if(QFile::exists(wild)) { //real file
+		    QString file = wild;
 		    QFileInfo fi(wild);
-		    target += QString("\t-") + (fi.isDir() ? "$(COPY_DIR)" : "$(COPY_FILE)") +
-			      " \"" + Option::fixPathToTargetOS(fileFixify(wild), FALSE) + "\" \"" + fileFixify(dst) + "\"\n";
+		    if(!target.isEmpty())
+			target += "\t";
+		    target += QString(fi.isDir() ? "-$(COPY_DIR)" : "-$(COPY_FILE)") + " \"" +
+			      Option::fixPathToTargetOS(fileFixify(wild), FALSE) + "\" \"" + root + dst + "\"\n";
 		    if(!project->isActiveConfig("debug") &&
 		       !fi.isDir() && fi.isExecutable() && !project->isEmpty("QMAKE_STRIP"))
-			target += QString("\t") + var("QMAKE_STRIP") + " \"" + fileFixify(dst + wild) + "\"\n";
-		    uninst.append(QString("-$(DEL_FILE) -r") + " \"" + fileFixify(dst + wild) + "\"");
+			target += QString("\t-") + var("QMAKE_STRIP") + " \"" + root + fileFixify(dst + filestr) + "\"\n";
+		    if(!uninst.isEmpty())
+			uninst.append("\n\t");
+		    uninst.append(
+#ifdef Q_WS_WIN
+		    QString("-$(DEL_FILE)")
+#else
+		    QString("-$(DEL_FILE) -r")
+#endif
+		    + " \"" + root + fileFixify(dst + filestr) + "\"");
 		    continue;
 		}
-		QString dirstr = QDir::currentDirPath(), f = wild; 		    //wild
-		int slsh = f.findRev(Option::dir_sep);
-		if(slsh != -1) {
-		    dirstr = f.left(slsh+1);
-		    f = f.right(f.length() - slsh - 1);
-		}
-		if(dirstr.right(Option::dir_sep.length()) != Option::dir_sep)
-		    dirstr += Option::dir_sep;
-		if(!uninst.isEmpty())
-		    uninst.append("\n\t");
-		uninst.append(QString("-$(DEL_FILE) -r") + " " + fileFixify(dst + f) + "");
-		
-		QDir dir(dirstr, f);
+		QDir dir(dirstr, filestr);		    //wild
 		for(uint x = 0; x < dir.count(); x++) {
 		    QString file = dir[x];
 		    if(file == "." || file == "..") //blah
 			continue;
+		    if(!uninst.isEmpty())
+			uninst.append("\n\t");
+		    uninst.append(
+#ifdef Q_WS_WIN
+			QString("-$(DEL_FILE)")
+#else
+			QString("-$(DEL_FILE) -r")
+#endif
+			+ " \"" + root + fileFixify(dst + file) + "\"");
 		    QFileInfo fi(file);
-		    target += QString("\t-") + (fi.isDir() ? "$(COPY_DIR)" : "$(COPY_FILE)") +
-			      " \"" + Option::fixPathToTargetOS(fileFixify(dirstr + file), FALSE) +
-			      "\" \"" + fileFixify(dst) + "\"\n";
+		    if(!target.isEmpty())
+			target += "\t";
+		    target += QString(fi.isDir() ? "-$(COPY_DIR)" : "-$(COPY_FILE)") + " \"" + 
+			      Option::fixPathToTargetOS(fileFixify(dirstr + file), FALSE) +
+			      "\" \"" + root + fileFixify(dst) + "\"\n";
 		    if(!project->isActiveConfig("debug") &&
 		       !fi.isDir() && fi.isExecutable() && !project->isEmpty("QMAKE_STRIP"))
-			target += QString("\t") + var("QMAKE_STRIP") + " \"" + fileFixify(dst + file) + "\"\n";
+			target += QString("\t-") + var("QMAKE_STRIP") + " \"" + root + fileFixify(dst + file) + "\"\n";
 		}
 	    }
- 	}
- 	//default?
+	}
+	//default?
 	if(do_default)
 	    target = defaultInstall((*it));
 
 	if(!target.isEmpty()) {
-	    t << "install_" << (*it) << ": " << "\n\t"
-	      << "@test -d " << dst << " || mkdir -p " << dst << "\n\t"
-	      << target << endl << endl;
+	    t << "install_" << (*it) << ": " << "\n\t";
+	    const QStringList &dirs = project->variables()[pvar];
+	    for(QStringList::ConstIterator pit = dirs.begin(); pit != dirs.end(); ++pit) {
+		QString tmp_dst = fileFixify((*pit));
+#ifndef Q_WS_WIN
+		if(tmp_dst.right(1) != Option::dir_sep)
+		    tmp_dst += Option::dir_sep;
+#endif
+		t << mkdir_p_asstring(root+tmp_dst) << "\n\t";
+	    }
+	    t << target << endl << endl;
 	    all_installs += QString("install_") + (*it) + " ";
 	    if(!uninst.isEmpty()) {
 		t << "uninstall_" << (*it) << ": " << "\n\t"
-		  << uninst.join(" ") << "\n\t"
-		  << "-$(DEL_DIR) \"" << dst << "\"" << endl << endl;
+		  << uninst.join("") << "\n\t"
+		  << "-$(DEL_DIR) \"" << ( root + dst ) << "\"" << endl << endl;
 		all_uninstalls += "uninstall_" + (*it) + " ";
 	    }
 	    t << endl;
@@ -1787,7 +1942,7 @@ MakefileGenerator::writeHeader(QTextStream &t)
     time_t foo = time(NULL);
     t << "#############################################################################" << endl;
     t << "# Makefile for building: " << var("TARGET") << endl;
-    t << "# Generated by qmake (" << qmake_version() << ") on: " << ctime(&foo);
+    t << "# Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: " << ctime(&foo);
     t << "# Project:  " << fileFixify(project->projectFile()) << endl;
     t << "# Template: " << var("TEMPLATE") << endl;
     t << "# Command: " << build_args() << endl;
@@ -1802,7 +1957,7 @@ bool
 MakefileGenerator::writeMakeQmake(QTextStream &t)
 {
     QString ofile = Option::fixPathToTargetOS(fileFixify(Option::output.name()));
-    if(project->isEmpty("QMAKE_FAILED_REQUIREMENTS") &&
+    if(project->isEmpty("QMAKE_FAILED_REQUIREMENTS") && !project->isActiveConfig("no_autoqmake") &&
        !project->isEmpty("QMAKE_INTERNAL_PRL_FILE")) {
 	QStringList files = fileFixify(Option::mkfile::project_files);
 	t << project->first("QMAKE_INTERNAL_PRL_FILE") << ": " << "\n\t"
@@ -1846,9 +2001,15 @@ MakefileGenerator::fileFixify(const QStringList& files, const QString &out_dir,
 QString
 MakefileGenerator::fileFixify(const QString& file0, const QString &out_d, const QString &in_d, bool force_fix) const
 {
+    if(file0.isEmpty()) 
+	return file0;
+    QString key = file0;
+    if(!in_d.isEmpty() || !out_d.isEmpty() || force_fix)
+	key.prepend(in_d + "--" + out_d + "--" + QString::number((int)force_fix) + "-");
+    if(fileFixed.contains(key)) 
+	return fileFixed[key];
+
     QString file = file0;
-    if(file.isEmpty())
-	return file;
     int depth = 4;
     if(Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE ||
        Option::qmake_mode == Option::QMAKE_GENERATE_PRL) {
@@ -1890,6 +2051,12 @@ MakefileGenerator::fileFixify(const QString& file0, const QString &out_d, const
 		if(!out_fi.convertToAbs())
 		    out_dir = out_fi.filePath();
 	    }
+	    QString in_canonical_dir = QDir(in_dir).canonicalPath(),
+		   out_canonical_dir = QDir(out_dir).canonicalPath();
+	    if(!in_canonical_dir.isEmpty())
+		in_dir = in_canonical_dir;
+	    if(!out_canonical_dir.isEmpty())
+		out_dir = out_canonical_dir;
 	}
 	if(out_dir != in_dir || !QDir::isRelativePath(qfile)) {
 	    if(QDir::isRelativePath(qfile)) {
@@ -1899,6 +2066,11 @@ MakefileGenerator::fileFixify(const QString& file0, const QString &out_d, const
 		file.prepend(in_dir);
 	    }
 	    file = Option::fixPathToTargetOS(file, FALSE);
+	    if(QFile::exists(file) && file == Option::fixPathToTargetOS(file, TRUE)) {
+		QString real_file = QDir(file).canonicalPath();
+		if(!real_file.isEmpty())
+		    file = real_file;
+	    }
 	    QString match_dir = Option::fixPathToTargetOS(out_dir, FALSE);
 	    if(file == match_dir) {
 		file = "";
@@ -1929,9 +2101,12 @@ MakefileGenerator::fileFixify(const QString& file0, const QString &out_d, const
 	}
     }
     file = Option::fixPathToTargetOS(file, FALSE);
+    if(file.isEmpty())
+	file = ".";
     if(!quote.isNull())
 	file = quote + file + quote;
     debug_msg(3, "Fixed %s :: to :: %s (%d)", orig_file.latin1(), file.latin1(), depth);
+    ((MakefileGenerator*)this)->fileFixed.insert(key, file);
     return file;
 }
 
@@ -2039,8 +2214,9 @@ MakefileGenerator::openOutput(QFile &file) const
 
 //Factory thing
 #include "unixmake.h"
-#include "borland_bmake.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"
@@ -2061,19 +2237,21 @@ MakefileGenerator::create(QMakeProject *proj)
     } else if(gen == "UNIX") {
 	mkfile = new UnixMakefileGenerator(proj);
     } else if(gen == "MSVC") {
-    	// Visual Studio =< v6.0
+	// Visual Studio =< v6.0
 	if(proj->first("TEMPLATE").find(QRegExp("^vc.*")) != -1)
 	    mkfile = new DspMakefileGenerator(proj);
 	else
 	    mkfile = new NmakeMakefileGenerator(proj);
     } else if(gen == "MSVC.NET") {
-    	// Visual Studio >= v7.0
+	// Visual Studio >= v7.0
 	if(proj->first("TEMPLATE").find(QRegExp("^vc.*")) != -1)
 	    mkfile = new VcprojGenerator(proj);
 	else
 	    mkfile = new NmakeMakefileGenerator(proj);
     } else if(gen == "BMAKE") {
 	mkfile = new BorlandMakefileGenerator(proj);
+    } else if(gen == "MINGW") {
+	mkfile = new MingwMakefileGenerator(proj);
     } else if(gen == "METROWERKS") {
 	mkfile = new MetrowerksMakefileGenerator(proj);
     } else if(gen == "PROJECTBUILDER") {
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
index 1d19d98..4fdabe8 100644
--- a/qmake/generators/makefile.h
+++ b/qmake/generators/makefile.h
@@ -5,7 +5,7 @@
 **
 ** Created : 970521
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the network module of the Qt GUI Toolkit.
 **
@@ -47,7 +47,7 @@ class MakefileGenerator
     bool init_opath_already, init_already, moc_aware, no_io;
     QStringList createObjectList(const QString &var);
     QString build_args();
-    QMap<QString, QString> depHeuristics, depKeyMap;
+    QMap<QString, QString> depHeuristics, depKeyMap, fileFixed;
     QMap<QString, QString> mocablesToMOC, mocablesFromMOC;
     QMap<QString, QStringList> depends;
 
@@ -68,16 +68,16 @@ protected:
 
     class MakefileDependDir {
     public:
-	MakefileDependDir(QString r, QString l) : real_dir(r), local_dir(l) { }
+	MakefileDependDir(const QString &r, const QString &l) : real_dir(r), local_dir(l) { }
 	QString real_dir, local_dir;
     };
-    bool generateDependencies(QPtrList<MakefileDependDir> &dirs, QString x, bool recurse);
+    bool generateDependencies(QPtrList<MakefileDependDir> &dirs, const QString &x, bool recurse);
 
     QString buildArgs();
 
     QString specdir();
     QString cleanFilePath(const QString &file) const;
-    bool generateMocList(QString fn);
+    bool generateMocList(const QString &fn);
 
     QString findMocSource(const QString &moc_file) const;
     QString findMocDestination(const QString &src_file) const;
diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp
index 5ff6250..1515216 100644
--- a/qmake/generators/projectgenerator.cpp
+++ b/qmake/generators/projectgenerator.cpp
@@ -42,6 +42,22 @@
 #include <qfileinfo.h>
 #include <qregexp.h>
 
+QString project_builtin_regx() //calculate the builtin regular expression..
+{ 
+    QString ret;
+    QStringList builtin_exts(".c");
+    builtin_exts << Option::ui_ext << Option::yacc_ext << Option::lex_ext << ".ts";
+    builtin_exts += Option::h_ext + Option::cpp_ext;
+    for(QStringList::Iterator ext_it = builtin_exts.begin(); 
+	ext_it != builtin_exts.end(); ++ext_it) {
+	if(!ret.isEmpty())
+	    ret += "; ";
+	ret += QString("*") + (*ext_it);
+    }
+    return ret;
+}
+
+
 
 ProjectGenerator::ProjectGenerator(QMakeProject *p) : MakefileGenerator(p), init_flag(FALSE)
 {
@@ -67,21 +83,13 @@ ProjectGenerator::init()
 
     //the scary stuff
     if(project->first("TEMPLATE_ASSIGN") != "subdirs") {
-	QString builtin_regex;
-	{ //calculate the builtin regular expression..
-	    QStringList builtin_exts(".c");
-	    builtin_exts << Option::ui_ext << Option::yacc_ext << Option::lex_ext;
-	    builtin_exts += Option::h_ext + Option::cpp_ext;
-	    for(QStringList::Iterator ext_it = builtin_exts.begin(); 
-		ext_it != builtin_exts.end(); ++ext_it) {
-		if(!builtin_regex.isEmpty())
-		    builtin_regex += "; ";
-		builtin_regex += QString("*") + (*ext_it);
-	    }
-	}
+	QString builtin_regex = project_builtin_regx();
 	QStringList dirs = Option::projfile::project_dirs;
-	if(Option::projfile::do_pwd)
+	if(Option::projfile::do_pwd) {
+	    if(!v["INCLUDEPATH"].contains("."))
+		v["INCLUDEPATH"] += ".";
 	    dirs.prepend(QDir::currentDirPath());
+	}
 
 	for(QStringList::Iterator pd = dirs.begin(); pd != dirs.end(); pd++) {
 	    QString dir, regex;
@@ -140,9 +148,8 @@ ProjectGenerator::init()
 	    }
 	    if(add_depend && !dir.isEmpty() && !v["DEPENDPATH"].contains(dir)) {
 		QFileInfo fi(dir);
-		if(fi.absFilePath() != QDir::currentDirPath()) {
+		if(fi.absFilePath() != QDir::currentDirPath()) 
 		    v["DEPENDPATH"] += fileFixify(dir);
-		}
 	    }
 	}
     }
@@ -241,12 +248,19 @@ ProjectGenerator::init()
 		QStringList &tmp = findDependencies((*val_it));
 		if(!tmp.isEmpty()) {
 		    for(QStringList::Iterator dep_it = tmp.begin(); dep_it != tmp.end(); ++dep_it) {
-			QString file_no_path = (*dep_it).right(
-			    (*dep_it).length() - ((*dep_it).findRev(Option::dir_sep)+1));
+			QString file_dir = (*dep_it).section(Option::dir_sep, 0, -2),
+			    file_no_path = (*dep_it).section(Option::dir_sep, -1);
+			if(!file_dir.isEmpty()) {
+			    for(MakefileDependDir *mdd = deplist.first(); mdd; mdd = deplist.next()) {
+				if(mdd->local_dir == file_dir && !v["INCLUDEPATH"].contains(mdd->real_dir))
+				    v["INCLUDEPATH"] += mdd->real_dir;
+			    }
+			}
 			if(no_qt_files && file_no_path.find(QRegExp("^q[a-z_0-9].h$")) != -1)
 			    no_qt_files = FALSE;
 			QString h_ext;
-			for(QStringList::Iterator hit = Option::h_ext.begin(); hit != Option::h_ext.end(); ++hit) {
+			for(QStringList::Iterator hit = Option::h_ext.begin(); 
+			    hit != Option::h_ext.end(); ++hit) {
 			    if((*dep_it).endsWith((*hit))) {
 				h_ext = (*hit);
 				break;
@@ -260,11 +274,13 @@ ProjectGenerator::init()
 			    }
 			    for(QStringList::Iterator cppit = Option::cpp_ext.begin();
 				cppit != Option::cpp_ext.end(); ++cppit) {
-				QString src((*dep_it).left((*dep_it).length() - h_ext.length()) + (*cppit));
+				QString src((*dep_it).left((*dep_it).length() - h_ext.length()) + 
+					    (*cppit));
 				if(QFile::exists(src)) {
 				    bool exists = FALSE;
 				    QStringList &srcl = v["SOURCES"];
-				    for(QStringList::Iterator src_it = srcl.begin(); src_it != srcl.end(); ++src_it) {
+				    for(QStringList::Iterator src_it = srcl.begin(); 
+					src_it != srcl.end(); ++src_it) {
 					if((*src_it).lower() == src.lower()) {
 					    exists = TRUE;
 					    break;
@@ -337,14 +353,16 @@ ProjectGenerator::writeMakefile(QTextStream &t)
 	t << getWritableVar("TARGET")
 	  << getWritableVar("CONFIG", FALSE)
 	  << getWritableVar("CONFIG_REMOVE", FALSE)
-	  << getWritableVar("DEPENDPATH") << endl;
+	  << getWritableVar("DEPENDPATH")
+	  << getWritableVar("INCLUDEPATH") << endl;
 
 	t << "# Input" << "\n";
 	t << getWritableVar("HEADERS") 
 	  << getWritableVar("INTERFACES") 
 	  << getWritableVar("LEXSOURCES") 
 	  << getWritableVar("YACCSOURCES") 
-	  << getWritableVar("SOURCES");
+	  << getWritableVar("SOURCES")
+	  << getWritableVar("TRANSLATIONS");
     }
     for(it = Option::after_user_vars.begin(); it != Option::after_user_vars.end(); ++it)
 	t << (*it) << endl;
@@ -403,6 +421,8 @@ ProjectGenerator::addFile(QString file)
 	    where = "LEXSOURCES";
 	else if(file.endsWith(Option::yacc_ext))
 	    where = "YACCSOURCES";
+	else if(file.endsWith(".ts"))
+	    where = "TRANSLATIONS";
     }
 
     QString newfile = fileFixify(file);
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index 7df95b2..e274481 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -5,7 +5,7 @@
 **
 ** Created : 970521
 **
-** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the network module of the Qt GUI Toolkit.
 **
@@ -72,18 +72,17 @@ UnixMakefileGenerator::init()
     }
 
     if( project->isEmpty("QMAKE_EXTENSION_SHLIB") ) {
-	QString os = project->variables()["QMAKESPEC"].first().section( '-', 0, 0 );
-	if ( os == "cygwin" ) {
-	    project->variables()["QMAKE_EXTENSION_SHLIB"].append( "dll" );
-	} else {
+	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_COPY_FILE") )
 	project->variables()["QMAKE_COPY_FILE"].append( "$(COPY) -p" );
     if( project->isEmpty("QMAKE_COPY_DIR") )
 	project->variables()["QMAKE_COPY_DIR"].append( "$(COPY) -pR" );
-    //If the TARGET looks like a path split it into DESTDIR and the resulting TARGET 
+    //If the TARGET looks like a path split it into DESTDIR and the resulting TARGET
     if(!project->isEmpty("TARGET")) {
 	QString targ = project->first("TARGET");
 	int slsh = QMAX(targ.findRev('/'), targ.findRev(Option::dir_sep));
@@ -138,7 +137,7 @@ UnixMakefileGenerator::init()
 	project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR"];
     if(!project->isEmpty("QMAKE_LIBDIR")) {
 	if ( !project->isEmpty("QMAKE_RPATH") )
-	    project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR", " " + var("QMAKE_RPATH"), 
+	    project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR", " " + var("QMAKE_RPATH"),
 								  " " + var("QMAKE_RPATH"), "");
 	project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue( "QMAKE_LIBDIR", "-L", " -L", "" );
     }
@@ -166,7 +165,7 @@ UnixMakefileGenerator::init()
 	if ( !is_qt ) {
 	    if ( !project->isEmpty("QMAKE_LIBDIR_QT") ) {
 		if ( !project->isEmpty("QMAKE_RPATH") )
-		    project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR_QT", " " + var("QMAKE_RPATH"), 
+		    project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR_QT", " " + var("QMAKE_RPATH"),
 									  " " + var("QMAKE_RPATH"), "");
 		project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR_QT", "-L", " -L", "");
 	    }
@@ -176,21 +175,9 @@ UnixMakefileGenerator::init()
 		project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"];
 	}
     }
-    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"];
-	if( !project->isEmpty("QMAKE_CXXFLAGS_THREAD"))
-	    project->variables()["QMAKE_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("opengl") ) {
 	project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_OPENGL"];
-	if(!project->isEmpty("QMAKE_LIBDIR_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"];
@@ -199,10 +186,6 @@ UnixMakefileGenerator::init()
     }
     if(project->isActiveConfig("global_init_link_order"))
 	project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
-    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("x11inc") )
 	project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_X11"];
     if ( project->isActiveConfig("x11lib") ) {
@@ -210,6 +193,22 @@ UnixMakefileGenerator::init()
 	    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"];
+	if( !project->isEmpty("QMAKE_CXXFLAGS_THREAD"))
+	    project->variables()["QMAKE_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);
     if ( project->isEmpty("QMAKE_RUN_CC") )
@@ -340,7 +339,7 @@ UnixMakefileGenerator::uniqueSetLFlags(const QStringList &list1, QStringList &li
 	    }
 	} else if(QFile::exists((*it))) {
 	    unique = (list2.findIndex((*it)) == -1);
-	} 
+	}
 	if(unique)
 	    ret.append((*it));
     }
@@ -351,12 +350,96 @@ UnixMakefileGenerator::uniqueSetLFlags(const QStringList &list1, QStringList &li
 void
 UnixMakefileGenerator::processPrlVariable(const QString &var, const QStringList &l)
 {
-    if(var == "QMAKE_PRL_LIBS") 
+    if(var == "QMAKE_PRL_LIBS")
 	project->variables()["QMAKE_CURRENT_PRL_LIBS"] += uniqueSetLFlags(l, project->variables()["QMAKE_LIBS"]);
     else
 	MakefileGenerator::processPrlVariable(var, l);
 }
 
+bool
+UnixMakefileGenerator::findLibraries()
+{
+    QPtrList<MakefileDependDir> libdirs;
+    libdirs.setAutoDelete(TRUE);
+    const QString lflags[] = { "QMAKE_LIBDIR_FLAGS", "QMAKE_LIBS", QString::null };
+    for(int i = 0; !lflags[i].isNull(); i++) {
+	QStringList &l = project->variables()[lflags[i]];
+	for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	    QString stub, dir, extn, opt = (*it).stripWhiteSpace();
+	    if(opt.startsWith("-")) {
+		if(opt.startsWith("-L")) {
+		    QString r = opt.right(opt.length() - 2), l = r;
+		    fixEnvVariables(l);
+		    libdirs.append(new MakefileDependDir(r.replace("\"",""),
+							 l.replace("\"","")));
+		} else if(opt.startsWith("-l")) {
+		    stub = opt.mid(2);
+		} else if(project->isActiveConfig("macx") && opt.startsWith("-framework")) {
+		    if(opt.length() > 11) {
+			opt = opt.mid(11);
+		    } else {
+			++it;
+			opt = (*it);
+		    }
+		    extn = "";
+		    dir = "/System/Library/Frameworks/" + opt + ".framework/";
+		    stub = opt;
+		}
+	    } else {
+		extn = dir = "";
+		stub = opt;
+		int slsh = opt.findRev(Option::dir_sep);
+		if(slsh != -1) {
+		    dir = opt.left(slsh);
+		    stub = opt.mid(slsh+1);
+		}
+		QRegExp stub_reg("^.*lib(" + stub + "[^./=]*)\\.(.*)$");
+		if(stub_reg.exactMatch(stub)) {
+		    stub = stub_reg.cap(1);
+		    extn = stub_reg.cap(2);
+		}
+	    }
+	    if(!stub.isEmpty()) {
+		const QString modifs[] = { "-mt", QString::null };
+		for(int modif = 0; !modifs[modif].isNull(); modif++) {
+		    bool found = FALSE;
+		    QStringList extens;
+		    if(!extn.isNull())
+			extens << extn;
+		    else
+			extens << project->variables()["QMAKE_EXTENSION_SHLIB"].first() << "a";
+		    for(QStringList::Iterator extit = extens.begin(); extit != extens.end(); ++extit) {
+			if(dir.isNull()) {
+			    QString lib_stub;
+			    for(MakefileDependDir *mdd = libdirs.first(); mdd; mdd = libdirs.next() ) {
+				if(QFile::exists(mdd->local_dir + Option::dir_sep + "lib" + stub +
+						 modifs[modif] + "." + (*extit))) {
+				    lib_stub = stub + modifs[modif];
+				    break;
+				}
+			    }
+			    if(!lib_stub.isNull()) {
+				(*it) = "-l" + lib_stub;
+				found = TRUE;
+				break;
+			    }
+			} else {
+			    if(QFile::exists("lib" + stub + modifs[modif] + "." + (*extit))) {
+				(*it) = "lib" + stub + modifs[modif] + "." + (*extit);
+				found = TRUE;
+				break;
+			    }
+			}
+		    }
+		    if(found)
+			break;
+		}
+	    }
+	}
+    }
+    return FALSE;
+}
+
 void
 UnixMakefileGenerator::processPrlFiles()
 {
@@ -402,7 +485,7 @@ UnixMakefileGenerator::processPrlFiles()
 			}
 			QString prl = "/System/Library/Frameworks/" + opt +
 				      ".framework/" + opt + Option::prl_ext;
-			if(processPrlFile(prl)) 
+			if(processPrlFile(prl))
 			    ret = TRUE;
 			l_out.append("-framework");
 		    }
@@ -434,12 +517,13 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
 	return QString();
 
     bool resource = FALSE;
+    const QString root = "$(INSTALL_ROOT)";
     QStringList &uninst = project->variables()[t + ".uninstall"];
-    QString ret, destdir=fileFixify(project->first("DESTDIR"));
+    QString ret, destdir=project->first("DESTDIR");
     QString targetdir = Option::fixPathToTargetOS(project->first("target.path"), FALSE);
     if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep)
 	destdir += Option::dir_sep;
-    targetdir = "$(INSTALL_ROOT)" + Option::fixPathToTargetOS(targetdir, FALSE);
+    targetdir = fileFixify(targetdir);
     if(targetdir.right(1) != Option::dir_sep)
 	targetdir += Option::dir_sep;
 
@@ -458,19 +542,18 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
 	    int slsh = dst_prl.findRev('/');
 	    if(slsh != -1)
 		dst_prl = dst_prl.right(dst_prl.length() - slsh - 1);
-	    dst_prl = targetdir + dst_prl;
-	    ret += "-$(COPY) " + project->first("QMAKE_INTERNAL_PRL_FILE") + " " + dst_prl;
+	    dst_prl = root + targetdir + dst_prl;
+	    ret += "-$(COPY) \"" + project->first("QMAKE_INTERNAL_PRL_FILE") + "\" \"" + dst_prl + "\"";
 	    if(!uninst.isEmpty())
 		uninst.append("\n\t");
 	    uninst.append("-$(DEL_FILE) \"" + dst_prl + "\"");
 	}
-	QString os = project->variables()["QMAKESPEC"].first().section( '-', 0, 0 );
-	if ( os != "cygwin" ) {
+	if ( project->isEmpty("QMAKE_CYGWIN_SHLIB") ) {
 	    if ( !project->isActiveConfig("staticlib") && !project->isActiveConfig("plugin") ) {
-		if ( os == "hpux" ) {
-		    links << "$(TARGET0)";
-		} else {
+		if ( project->isEmpty("QMAKE_HPUX_SHLIB") ) {
 		    links << "$(TARGET0)" << "$(TARGET1)" << "$(TARGET2)";
+		} else {
+		    links << "$(TARGET0)";
 	        }
 	    }
 	}
@@ -478,15 +561,17 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
     QString src_targ = target;
     if(!destdir.isEmpty())
 	src_targ = Option::fixPathToTargetOS(destdir + target, FALSE);
-    QString dst_targ = fileFixify(targetdir + target);
+    QString dst_targ = root + fileFixify(targetdir + target);
     if(!ret.isEmpty())
 	ret += "\n\t";
     ret += QString(resource ? "-$(COPY_DIR)" : "-$(COPY)") + " \"" +
 	   src_targ + "\" \"" + dst_targ + "\"";
-    if(!project->isEmpty("QMAKE_STRIP")) {
+    if(!project->isActiveConfig("debug") && !project->isEmpty("QMAKE_STRIP")) {
 	ret += "\n\t-" + var("QMAKE_STRIP");
+	if(!project->isEmpty("QMAKE_STRIPFLAGS_LIB") && project->first("TEMPLATE") == "lib")
+	    ret += " " + var("QMAKE_STRIPFLAGS_LIB");
 	if(resource)
-	    ret = " \"" + dst_targ + "/Contents/MacOS/$(QMAKE_TARGET)";
+	    ret = " \"" + dst_targ + "/Contents/MacOS/$(QMAKE_TARGET)\"";
 	else
 	    ret += " \"" + dst_targ + "\"";
     }
@@ -506,7 +591,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
 		int lslash = link.findRev(Option::dir_sep);
 		if(lslash != -1)
 		    link = link.right(link.length() - (lslash + 1));
-		QString dst_link = fileFixify(targetdir + link);
+		QString dst_link = root + fileFixify(targetdir + link);
 		ret += "\n\t-$(SYMLINK) \"$(TARGET)\" \"" + dst_link + "\"";
 		if(!uninst.isEmpty())
 		    uninst.append("\n\t");
@@ -517,4 +602,3 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
     return ret;
 }
 
-
diff --git a/qmake/generators/unix/unixmake.h b/qmake/generators/unix/unixmake.h
index e889dcc..3d00214 100644
--- a/qmake/generators/unix/unixmake.h
+++ b/qmake/generators/unix/unixmake.h
@@ -55,6 +55,7 @@ protected:
     virtual void processPrlVariable(const QString &, const QStringList &);
     virtual void processPrlFiles();
 
+    virtual bool findLibraries();
     virtual void init();
 
     void writeMakeParts(QTextStream &);
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 9bb6f6b..7fbb9f4 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -79,9 +79,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
     bool do_incremental = (project->isActiveConfig("incremental") &&
 			   !project->variables()["QMAKE_INCREMENTAL"].isEmpty() &&
 			   (!project->variables()["QMAKE_APP_FLAG"].isEmpty() ||
-			    !project->isActiveConfig("staticlib"))),
+			    !project->isActiveConfig("staticlib"))), 
 	 src_incremental=FALSE, moc_incremental=FALSE;
-    QString os = project->variables()["QMAKESPEC"].first().section( '-', 0, 0 );
 
     t << "####### Compiler, tools and options" << endl << endl;
     t << "CC       = ";
@@ -108,7 +107,14 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
       << varGlue("DEFINES","-D"," -D","") << endl;
     t << "LEXFLAGS = " << var("QMAKE_LEXFLAGS") << endl;
     t << "YACCFLAGS= " << var("QMAKE_YACCFLAGS") << endl;
-    t << "INCPATH  = " << varGlue("INCLUDEPATH","-I", " -I", "") << " -I" << specdir() << endl;
+    t << "INCPATH  = " << "-I" << specdir();
+    if(!project->isActiveConfig("no_include_pwd")) {
+	QString pwd = fileFixify(QDir::currentDirPath());
+	if(pwd.isEmpty())
+	    pwd = ".";
+	t << " -I" << pwd;
+    }
+    t << varGlue("INCLUDEPATH"," -I", " -I", "") << endl;
 
     if(!project->isActiveConfig("staticlib")) {
 	t << "LINK     = ";
@@ -136,7 +142,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
     t << "SYMLINK  = " << var("QMAKE_SYMBOLIC_LINK") << endl;
     t << "DEL_DIR  = " << var("QMAKE_DEL_DIR") << endl;
     t << "MOVE     = " << var("QMAKE_MOVE") << endl;
-    t << "PRO      = " << fileFixify(project->projectFile()  )<< endl;
+    t << "CHK_DIR_EXISTS= " << var("QMAKE_CHK_DIR_EXISTS") << endl;
+    t << "MKDIR    = " << var("QMAKE_MKDIR") << endl;
     t << endl;
 
     t << "####### Output directory" << endl << endl;
@@ -212,8 +219,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
     }
     if(do_incremental && !moc_incremental && !src_incremental)
 	do_incremental = FALSE;
-    t << "DIST	   = " << varList("DISTFILES") << endl;
-    t << "PRO      = " << fileFixify(project->projectFile()) << endl;
+    t << "DIST	   = " << valList(fileFixify(project->variables()["DISTFILES"])) << endl;
     t << "QMAKE_TARGET = " << var("QMAKE_ORIG_TARGET") << endl;
     t << "DESTDIR  = " << var("DESTDIR") << endl;
     t << "TARGET   = " << var("TARGET") << endl;
@@ -221,15 +227,14 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	t << "TARGETD   = " << var("TARGET") << endl;
     } else if (!project->isActiveConfig("staticlib") && project->variables()["QMAKE_APP_FLAG"].isEmpty()) {
 	t << "TARGETA	= " << var("TARGETA") << endl;
-	if (os == "hpux") {
-	    t << "TARGETD	= " << var("TARGET_x") << endl;
-	    t << "TARGET0	= " << var("TARGET_") << endl;
-	}
-	else {
+	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;
 	}
     }
     t << endl;
@@ -261,7 +266,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	QString odir;
 	if(!project->variables()["OBJECTS_DIR"].isEmpty())
 	    odir = project->first("OBJECTS_DIR");
-	t << "###### Dependancies" << endl << endl;
+	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"
@@ -386,7 +391,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	      << endl << endl;
 
 	    //real target
-	    t << var("TARGET") << ": " << " " << incr_deps << " " << var("TARGETDEPS") << "\n\t";
+	    t << var("TARGET") << ": " << var("PRE_TARGETDEPS") << " " << incr_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"))
@@ -399,7 +405,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	    t << "all: " << deps <<  " " << varGlue("ALL_DEPS",""," "," ") <<  "$(TARGET)"
 	      << endl << endl;
 
-	    t << "$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) " << var("TARGETDEPS") << "\n\t";
+	    t << "$(TARGET): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC) " 
+	      << var("POST_TARGETDEPS") << "\n\t";
 	    if(!destdir.isEmpty())
 		t << "test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
 	    if(!project->isEmpty("QMAKE_PRE_LINK"))
@@ -460,13 +467,13 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	      << " " <<  var("DESTDIR_TARGET") << endl << endl;
 
 	    //real target
-	    t << var("DESTDIR_TARGET") << ": " << incr_deps << " $(SUBLIBS) " <<
-		var("TARGETDEPS");
+	    t << var("DESTDIR_TARGET") << ": " << var("PRE_TARGETDEPS") << " " 
+	      << incr_deps << " $(SUBLIBS) " << var("POST_TARGETDEPS");
 	} else {
 	    t << "all: " << deps << " " << varGlue("ALL_DEPS",""," ","") << " " <<
 		var("DESTDIR_TARGET") << endl << endl;
-	    t << var("DESTDIR_TARGET") << ":  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) " <<
-		var("TARGETDEPS");
+	    t << var("DESTDIR_TARGET") << ": " << var("PRE_TARGETDEPS") 
+	      << " $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) " << var("POST_TARGETDEPS");
 	}
 	if(!destdir.isEmpty())
 	    t << "\n\t" << "test -d " << destdir << " || mkdir -p " << destdir;
@@ -483,20 +490,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	    if(!project->isEmpty("QMAKE_POST_LINK"))
 		t << "\n\t" << var("QMAKE_POST_LINK") << "\n\t";
 	    t << endl << endl;
-	} else if ( os == "hpux" ) {
-	    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;
-	} else {
+	} 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";
@@ -513,15 +507,28 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	    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): $(UICDECLS) $(OBJECTS) $(OBJMOC)";
+	    t << "$(TARGETA): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC)";
 	    if(do_incremental)
 		t << " $(INCREMENTAL_OBJECTS) $(INCREMENTAL_OBJMOC)";
-	    t << var("TARGETDEPS") << "\n\t"
+	    t << var("POST_TARGETDEPS") << "\n\t"
 	      << "-$(DEL_FILE) $(TARGETA) " << "\n\t"
 	      << var("QMAKE_AR_CMD");
 	    if(do_incremental)
@@ -531,11 +538,12 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	    t << endl << endl;
 	}
     } else {
-	t << "all: " << deps << " " << varGlue("ALL_DEPS",""," "," ") << var("DESTDIR") << "$(TARGET) "
+	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): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(TARGETDEPS) " << "\n\t";
+	    t << var("DESTDIR") << "$(TARGET): " << var("PRE_TARGETDEPS") 
+	      << " $(UICDECLS) $(OBJECTS) $(OBJMOC) " << var("POST_TARGETDEPS") << "\n\t";
 	    if(!project->isEmpty("DESTDIR")) {
 		QString destdir = project->first("DESTDIR");
 		t << "test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
@@ -546,25 +554,25 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 		t << "\t" << var("QMAKE_POST_LINK") << "\n";
 	    if(!project->isEmpty("QMAKE_RANLIB"))
 		t << "\t" << "$(RANLIB) $(TARGET)" << "\n";
-	    if(!project->isEmpty("DESTDIR"))
+	    if(!project->isEmpty("DESTDIR")) 
 		t << "\t" << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET)" << "\n"
 		  << "\t" << "-$(MOVE) $(TARGET) " << var("DESTDIR") << "\n";
 	} else {
-	    int cnt = 0, max_files = project->first("QMAKE_MAX_FILES_PER_AR").toInt();
+	    int max_files = project->first("QMAKE_MAX_FILES_PER_AR").toInt();
 	    QStringList objs = project->variables()["OBJECTS"] + project->variables()["OBJMOC"],
 			libs = project->variables()["QMAKE_AR_SUBLIBS"];
 	    libs.prepend("$(TARGET)");
-	    for(QStringList::Iterator libit = libs.begin(), objit = objs.begin();
+	    for(QStringList::Iterator libit = libs.begin(), objit = objs.begin(); 
 		libit != libs.end(); ++libit) {
 		QStringList build;
-		for(cnt = 0; cnt < max_files && objit != objs.end(); ++objit, cnt++)
+		for(int cnt = 0; cnt < max_files && objit != objs.end(); ++objit, cnt++) 
 		    build << (*objit);
 		QString ar;
 		if((*libit) == "$(TARGET)") {
-		    t << var("DESTDIR") << "$(TARGET): $(UICDECLS) " << " $(TARGETDEPS) "
-		      << valList(build) << "\n\t";
+		    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)",
+		    ar = ar.replace("$(OBJMOC)", "").replace("$(OBJECTS)", 
 							     build.join(" "));
 		} else {
 		    t << (*libit) << ": " << valList(build) << "\n\t";
@@ -580,7 +588,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 		    t << "\t" << var("QMAKE_POST_LINK") << "\n";
 		if(!project->isEmpty("QMAKE_RANLIB"))
 		    t << "\t" << "$(RANLIB) " << (*libit) << "\n";
-		if(!project->isEmpty("DESTDIR"))
+		if(!project->isEmpty("DESTDIR")) 
 		    t << "\t" << "-$(DEL_FILE) " << var("DESTDIR") << (*libit) << "\n"
 		      << "\t" << "-$(MOVE) " << (*libit) << " " << var("DESTDIR") << "\n";
 	    }
@@ -592,12 +600,12 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 
     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 dependancy - this is a little kludgy but it is
+	//moc itself shouldn't have this dependency - this is a little kludgy but it is
 	//better than the alternative for now.
 	QString moc = project->first("QMAKE_MOC"), target = project->first("TARGET");
 	fixEnvVariables(target);
 	fixEnvVariables(moc);
-	if(target != moc)
+	if(target != moc) 
 	    t << "$(MOC): \n\t"
 	      << "( cd $(QTDIR)/src/moc ; $(MAKE) )"  << endl << endl;
     }
@@ -643,7 +651,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	QStringList &forms = project->variables()["FORMS"], ui_headers;
 	for(QStringList::Iterator formit = forms.begin(); formit != forms.end(); ++formit) {
 	    QString ui_h = fileFixify((*formit) + Option::h_ext.first());
-	    if(QFile::exists(ui_h) )
+	    if(QFile::exists(ui_h) ) 
 	       ui_headers << ui_h;
 	}
 	if(!ui_headers.isEmpty())
@@ -653,7 +661,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
       << "$(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_DIR) " << ddir_c
+      << "$(DEL_FILE) -r " << ddir_c
       << endl << endl;
 
     QString clean_targets;
@@ -677,6 +685,45 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
     }
     t << endl;
 
+    t << "yaccclean:" << "\n";
+    if(!var("YACCSOURCES").isEmpty()) {
+	QStringList clean, &l = project->variables()["YACCSOURCES"];
+	for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	    QFileInfo fi((*it));
+	    QString dir;
+	    if(fi.dirPath() != ".")
+		dir = fi.dirPath() + Option::dir_sep;
+	    dir = fileFixify(dir, QDir::currentDirPath(), Option::output_dir);
+	    if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep)
+		dir += Option::dir_sep;
+	    clean <<  dir + fi.baseName(TRUE) + Option::yacc_mod + Option::cpp_ext.first();
+	    clean << dir + fi.baseName(TRUE) + Option::yacc_mod + Option::h_ext.first();
+	}
+	if(!clean.isEmpty()) {
+	    t << "\t-$(DEL_FILE) " << clean.join(" ") << "\n";
+	    clean_targets += " yaccclean";
+	}
+    }
+
+    t << "lexclean:" << "\n";
+    if(!var("LEXSOURCES").isEmpty()) {
+	QStringList clean, &l = project->variables()["LEXSOURCES"];
+	for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+	    QFileInfo fi((*it));
+	    QString dir;
+	    if(fi.dirPath() != ".")
+		dir = fi.dirPath() + Option::dir_sep;
+	    dir = fileFixify(dir, QDir::currentDirPath(), Option::output_dir);
+	    if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep)
+		dir += Option::dir_sep;
+	    clean <<  dir + fi.baseName(TRUE) + Option::lex_mod + Option::cpp_ext.first();
+	}
+	if(!clean.isEmpty()) {
+	    t << "\t-$(DEL_FILE) " << clean.join(" ") << "\n";
+	    clean_targets += " lexclean";
+	}
+    }
+
     if(do_incremental) {
 	t << "incrclean:" << "\n";
 	if(src_incremental)
@@ -710,8 +757,12 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
     QString destdir = project->first("DESTDIR");
     if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep)
 	destdir += Option::dir_sep;
-    t << "distclean: " << "clean\n\t"
-      << "-$(DEL_FILE) " << destdir << "$(TARGET)" << " " << "$(TARGET)" << "\n";
+    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
+	t << "\t-$(DEL_FILE) " << destdir << "$(TARGET)" << " " << "$(TARGET)" << "\n";
     if(!project->isActiveConfig("staticlib") && project->variables()["QMAKE_APP_FLAG"].isEmpty() &&
        !project->isActiveConfig("plugin"))
 	t << "\t-$(DEL_FILE) " << destdir << "$(TARGET0) " << destdir << "$(TARGET1) "
@@ -806,7 +857,7 @@ UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
     t << "QMAKE    =	" << var("QMAKE") << endl;
     t << "DEL_FILE =    " << var("QMAKE_DEL_FILE") << endl;
     t << "SUBTARGETS =	";     // subdirectory targets are sub-directory
-    for( it.toFirst(); it.current(); ++it)
+    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;
@@ -835,7 +886,7 @@ UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
 	for( it.toFirst(); it.current(); ) {
 	    QString tar = it.current()->target;
 	    ++it;
-	    if (it.current())
+	    if (it.current()) 
 		t << it.current()->target << ": " << tar << endl;
 	}
 	t << endl;
@@ -844,7 +895,7 @@ UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
     writeMakeQmake(t);
 
     if(project->isEmpty("SUBDIRS")) {
-	t << "all qmake_all distclean install uiclean mocclean clean: FORCE" << endl;
+	t << "all qmake_all distclean install uiclean mocclean lexclean yaccclean clean: FORCE" << endl;
     } else {
 	t << "all: $(SUBTARGETS)" << endl;
 	t << "qmake_all:";
@@ -858,11 +909,11 @@ UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
 	    t << "\n\t ( ";
 	    if(!(*it)->directory.isEmpty())
 		t << "[ -d " << (*it)->directory << " ] && cd " << (*it)->directory << " ; ";
-	    t << "grep \"^qmake_all:\" " << (*it)->makefile
+	    t << "grep \"^qmake_all:\" " << (*it)->makefile 
 	      << " && $(MAKE) -f " << (*it)->makefile << " qmake_all" << "; ) || true";
 	}
 	t << endl;
-	t << "clean uninstall install uiclean mocclean: qmake_all FORCE";
+	t << "clean uninstall install uiclean mocclean lexclean yaccclean: qmake_all FORCE";
 	for( it.toFirst(); it.current(); ++it) {
 	    t << "\n\t ( ";
 	    if(!(*it)->directory.isEmpty())
@@ -906,6 +957,8 @@ void UnixMakefileGenerator::init2()
 	}
 #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";
@@ -917,13 +970,12 @@ void UnixMakefileGenerator::init2()
 	    project->variables()["QMAKE_AR_CMD"].first().replace("(TARGET)","(TARGETA)");
 	else
 	    project->variables()["QMAKE_AR_CMD"].append("$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)");
-	QString os = project->variables()["QMAKESPEC"].first().section( '-', 0, 0 );
 	if( project->isActiveConfig("plugin") ) {
 	    project->variables()["TARGET_x.y.z"].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("VER_MAJ") + "." + 
 							project->first("QMAKE_EXTENSION_SHLIB"));
 	    else
 		project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
@@ -933,16 +985,16 @@ void UnixMakefileGenerator::init2()
 	    project->variables()["TARGET"] = project->variables()["TARGET_x.y.z"];
 	    if(project->isActiveConfig("qt"))
 		project->variables()["DEFINES"].append("QT_PLUGIN");
-	} else if ( os == "hpux" ) {
+	} 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->variables()["TARGET_x"].append("lib" + project->first("VER_MAJ") + "." + 
 							project->first("TARGET"));
 	    else
-		project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
+		project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." + 
 							project->first("VER_MAJ"));
 	    project->variables()["TARGET"] = project->variables()["TARGET_x"];
-	} else if ( os == "aix" ) {
+	} 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") + "." +
@@ -1011,8 +1063,15 @@ void UnixMakefileGenerator::init2()
 	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() && !project->variables()["TARGET_x"].isEmpty() )
-	    project->variables()["QMAKE_LFLAGS_SONAME"].first() += project->first("TARGET_x");
+	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)");
diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp
index ae7b47b..26eea88 100644
--- a/qmake/generators/win32/borland_bmake.cpp
+++ b/qmake/generators/win32/borland_bmake.cpp
@@ -132,6 +132,8 @@ BorlandMakefileGenerator::writeBorlandParts(QTextStream &t)
     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 << endl;
 
     t << "####### Files" << endl << endl;
@@ -150,15 +152,19 @@ BorlandMakefileGenerator::writeBorlandParts(QTextStream &t)
     t << endl;
 
     t << "####### Implicit rules" << endl << endl;
-    t << ".SUFFIXES: .cpp .cxx .cc .c" << endl << endl;
-    t << ".cpp.obj:\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl;
-    t << ".cxx.obj:\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl;
-    t << ".cc.obj:\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl;
-    t << ".c.obj:\n\t" << var("QMAKE_RUN_CC_IMP") << endl << endl;
+    t << ".SUFFIXES: .c";
+    QStringList::Iterator cppit;
+    for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
+	t << " " << (*cppit);
+    t << endl << endl;
+    for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
+	t << (*cppit) << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl;
+    t << ".c" << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CC_IMP") << endl << endl;
 
     t << "####### Build rules" << endl << endl;
     t << "all: " << varGlue("ALL_DEPS",""," "," ") << " $(TARGET)" << endl << endl;
-    t << "$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) " << var("TARGETDEPS");
+    t << "$(TARGET): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC) " 
+      << 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)";
@@ -169,6 +175,10 @@ BorlandMakefileGenerator::writeBorlandParts(QTextStream &t)
 	  << project->variables()["OBJMOC"].join(" \\\n+");
     }
     t << endl << "|" << endl;
+
+    if ( !project->variables()["QMAKE_POST_LINK"].isEmpty() )
+	t << "\t" <<var("QMAKE_POST_LINK") << endl;
+
     if(project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty()) {
 	QStringList dlldirs = project->variables()["DLLDESTDIR"];
 	for ( QStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) {
@@ -213,15 +223,12 @@ BorlandMakefileGenerator::writeBorlandParts(QTextStream &t)
       << varGlue("OBJMOC" ,"\n\t-del ","\n\t-del ","")
       << varGlue("UICDECLS" ,"\n\t-del ","\n\t-del ","")
       << varGlue("UICIMPLS" ,"\n\t-del ","\n\t-del ","")
-      << "\n\t-del $(TARGET)"
       << varGlue("QMAKE_CLEAN","\n\t-del ","\n\t-del ","")
       << varGlue("CLEAN_FILES","\n\t-del ","\n\t-del ","");
     if ( project->isActiveConfig("activeqt")) {
 	t << ("\n\t-del tmp\\" + targetfilename + ".*");
 	t << "\n\t-del tmp\\dump.*";
     }
-    if(project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty()) 
-	t << "\n\t-del " << var("DLLDESTDIR") << "\\" << project->variables()[ "TARGET" ].first() << project->variables()[ "TARGET_EXT" ].first();
     if(!project->isEmpty("IMAGES"))
 	t << varGlue("QMAKE_IMAGE_COLLECTION", "\n\t-del ", "\n\t-del ", "");
 
@@ -244,6 +251,10 @@ BorlandMakefileGenerator::writeBorlandParts(QTextStream &t)
     }
 
     t << endl << endl;
+
+    t << "distclean: clean"
+      << "\n\t-del $(TARGET)"
+      << endl << endl;
 }
 
 void
@@ -364,7 +375,7 @@ BorlandMakefileGenerator::init()
 	    if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) {
 		int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt");
 		if ( hver == -1 )
-		    hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt-mt");
+		    hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qtmt");
 		if(hver != -1) {
 		    QString ver;
 		    ver.sprintf("qt%s" QTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "mt" : ""), hver);
@@ -426,6 +437,28 @@ BorlandMakefileGenerator::init()
 	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 {
@@ -452,7 +485,7 @@ BorlandMakefileGenerator::init()
 	}
 	project->variables()["RES_FILE"] = project->variables()["RC_FILE"];
 	project->variables()["RES_FILE"].first().replace(".rc",".res");
-	project->variables()["TARGETDEPS"] += project->variables()["RES_FILE"];
+	project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"];
     }
     MakefileGenerator::init();
     if ( !project->variables()["VERSION"].isEmpty()) {
@@ -474,4 +507,3 @@ BorlandMakefileGenerator::init()
 		project->first("DESTDIR") + project->first("TARGET") + tdsPostfix );
     }
 }
-
diff --git a/qmake/generators/win32/borland_bmake.h b/qmake/generators/win32/borland_bmake.h
index 90f8229..5ffed58 100644
--- a/qmake/generators/win32/borland_bmake.h
+++ b/qmake/generators/win32/borland_bmake.h
@@ -5,7 +5,7 @@
 **
 ** Created : 970521
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the network module of the Qt GUI Toolkit.
 **
@@ -34,8 +34,8 @@
 ** not clear to you.
 **
 **********************************************************************/
-#ifndef __BORLANDMAKE_H__
-#define __BORLANDMAKE_H__
+#ifndef __BORLAND_BMAKE_H__
+#define __BORLAND_BMAKE_H__
 
 #include "winmakefile.h"
 
@@ -55,5 +55,4 @@ public:
 inline BorlandMakefileGenerator::~BorlandMakefileGenerator()
 { }
 
-
-#endif /* __BORLANDMAKE_H__ */
+#endif /* __BORLAND_BMAKE_H__ */
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
new file mode 100644
index 0000000..7f58a55
--- a/dev/null
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -0,0 +1,524 @@
+/****************************************************************************

+** $Id$

+**

+** Definition of ________ class.

+**

+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.

+**

+** This file is part of the network module of the Qt GUI Toolkit.

+**

+** This file may be distributed under the terms of the Q Public License

+** as defined by Trolltech AS of Norway and appearing in the file

+** LICENSE.QPL included in the packaging of this file.

+**

+** This file may be distributed and/or modified under the terms of the

+** GNU General Public License version 2 as published by the Free Software

+** Foundation and appearing in the file LICENSE.GPL included in the

+** packaging of this file.

+**

+** Licensees holding valid Qt Enterprise Edition licenses may use this

+** file in accordance with the Qt Commercial License Agreement provided

+** with the Software.

+**

+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE

+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

+**

+** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for

+**   information about Qt Commercial License Agreements.

+** See http://www.trolltech.com/qpl/ for QPL licensing information.

+** See http://www.trolltech.com/gpl/ for GPL licensing information.

+**

+** Contact info@trolltech.com if any conditions of this licensing are

+** not clear to you.

+**

+**********************************************************************/

+

+#include "mingw_make.h"

+#include "option.h"

+#include <qregexp.h>

+#include <qdir.h>

+#include <stdlib.h>

+#include <time.h>

+

+

+MingwMakefileGenerator::MingwMakefileGenerator(QMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE)

+{

+    Option::obj_ext = ".o";

+}

+

+bool

+MingwMakefileGenerator::writeMakefile(QTextStream &t)

+{

+    writeHeader(t);

+    if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {

+	t << "all clean:" << "\n\t"

+	  << "@echo \"Some of the required modules ("

+	  << var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t"

+	  << "@echo \"Skipped.\"" << endl << endl;

+	writeMakeQmake(t);

+	return TRUE;

+    }

+

+    if(project->first("TEMPLATE") == "app" ||

+       project->first("TEMPLATE") == "lib") {

+	writeMingwParts(t);

+	return MakefileGenerator::writeMakefile(t);

+    }

+    else if(project->first("TEMPLATE") == "subdirs") {

+	writeSubDirs(t);

+	return TRUE;

+    }

+    return FALSE;

+}

+

+void

+MingwMakefileGenerator::writeMingwParts(QTextStream &t)

+{

+    t << "####### Compiler, tools and options" << endl << endl;

+    t << "CC		=	" << var("QMAKE_CC") << endl;

+    t << "CXX		=	" << var("QMAKE_CXX") << endl;

+    t << "LEX		= " << var("QMAKE_LEX") << endl;

+    t << "YACC		= " << var("QMAKE_YACC") << endl;

+    t << "CFLAGS	=	" << var("QMAKE_CFLAGS") << " " 

+      << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " "

+      <<  varGlue("DEFINES","-D"," -D","") << endl;

+    t << "CXXFLAGS	=	" << var("QMAKE_CXXFLAGS") << " " 

+      << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " "

+      << varGlue("DEFINES","-D"," -D","") << endl;

+    t << "LEXFLAGS	=" << var("QMAKE_LEXFLAGS") << endl;

+    t << "YACCFLAGS	=" << var("QMAKE_YACCFLAGS") << endl;

+

+    t << "INCPATH	=	";

+    QStringList &incs = project->variables()["INCLUDEPATH"];

+    for(QStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) {

+	QString inc = (*incit);

+	inc.replace(QRegExp("\\\\$"), "\\\\");

+	inc.replace(QRegExp("\""), "");

+	t << " -I" << inc ;

+    }

+    t << " -I" << specdir()

+      << endl;

+    if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) {

+	t << "LINK	=	" << var("QMAKE_LINK") << endl;

+	t << "LFLAGS	=	";

+	if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() )

+	    t << varGlue("QMAKE_LIBDIR","-L",";","") << " ";

+	t << var("QMAKE_LFLAGS") << endl;

+	t << "LIBS	=	" << var("QMAKE_LIBS").replace(QRegExp("(\\slib|^lib)")," -l") << endl;

+    }

+    else {

+	t << "LIB	=	" << var("QMAKE_LIB") << endl;

+    }

+    t << "MOC		=	" << (project->isEmpty("QMAKE_MOC") ? QString("moc") : 

+			      Option::fixPathToTargetOS(var("QMAKE_MOC"), FALSE)) << endl;

+    t << "UIC		=	" << (project->isEmpty("QMAKE_UIC") ? QString("uic") : 

+			      Option::fixPathToTargetOS(var("QMAKE_UIC"), FALSE)) << endl;

+    t << "QMAKE		=	" << (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : 

+			      Option::fixPathToTargetOS(var("QMAKE_QMAKE"), FALSE)) << endl;

+    t << "IDC		=	" << (project->isEmpty("QMAKE_IDC") ? QString("idc") :

+			      Option::fixPathToTargetOS(var("QMAKE_IDC"), FALSE)) << endl;

+    t << "IDL		=	" << (project->isEmpty("QMAKE_IDL") ? QString("midl") :

+			      Option::fixPathToTargetOS(var("QMAKE_IDL"), FALSE)) << endl;

+    t << "ZIP		=	" << var("QMAKE_ZIP") << endl;

+    t << "DEF_FILE      =	" << varList("DEF_FILE") << endl;

+    t << "COPY_FILE	=       " << var("QMAKE_COPY") << endl;

+    t << "COPY_DIR	=       " << var("QMAKE_COPY") << endl;

+    t << "DEL_FILE	=       " << var("QMAKE_DEL_FILE") << endl;

+    t << "DEL_DIR	=       " << var("QMAKE_DEL_DIR") << endl;

+    t << "MOVE		=       " << var("QMAKE_MOVE") << endl;

+    t << "CHK_DIR_EXISTS =	" << var("QMAKE_CHK_DIR_EXISTS") << endl;

+    t << "MKDIR		=	" << var("QMAKE_MKDIR") << endl;

+    t << endl;

+

+    t << "####### Output directory" << endl << endl;

+    if (! project->variables()["OBJECTS_DIR"].isEmpty())

+	t << "OBJECTS_DIR = " << var("OBJECTS_DIR").replace(QRegExp("\\\\$"),"") << endl;

+    else

+	t << "OBJECTS_DIR = . " << endl;

+    if (! project->variables()["MOC_DIR"].isEmpty())

+	t << "MOC_DIR = " << var("MOC_DIR").replace(QRegExp("\\\\$"),"") << endl;

+    else

+	t << "MOC_DIR = . " << endl;

+    t << endl;

+

+    t << "####### Files" << endl << endl;

+    t << "HEADERS =	" << varList("HEADERS") << endl;

+    t << "SOURCES =	" << varList("SOURCES") << endl;

+//    t << "OBJECTS =	" << varList("OBJECTS").replace(QRegExp("\\.obj"),".o") << 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;

+//    t << "OBJMOC	=	" << varList("OBJMOC").replace(QRegExp("\\.obj"),".o") << 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_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) " 

+      << var("POST_TARGETDEPS");

+    if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) {

+	t << "\n\t" << "$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)";

+    } else {

+	t << "\n\t" << "$(LIB) $(TARGET) $(OBJECTS) $(OBJMOC)";

+    }

+

+    if(project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty()) {

+	QStringList dlldirs = project->variables()["DLLDESTDIR"];

+	for ( QStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) {

+	    t << "\n\t" << "copy $(TARGET) " << *dlldir;

+	}

+    }

+    QString targetfilename = project->variables()["TARGET"].first();

+    if(project->isActiveConfig("activeqt")) {

+	QString version = project->variables()["VERSION"].first();

+	if ( version.isEmpty() )

+	    version = "1.0";

+

+	if ( project->isActiveConfig("dll")) {

+	    t << "\n\t" << ("-$(IDC) $(TARGET) /idl tmp\\" + targetfilename + ".idl -version " + version);

+	    t << "\n\t" << ("-$(IDL) tmp\\" + targetfilename + ".idl /nologo /o tmp\\" + targetfilename + ".midl /tlb tmp\\" + targetfilename + ".tlb /iid tmp\\dump.midl /dlldata tmp\\dump.midl /cstub tmp\\dump.midl /header tmp\\dump.midl /proxy tmp\\dump.midl /sstub tmp\\dump.midl");

+	    t << "\n\t" << ("-$(IDC) $(TARGET) /tlb tmp\\" + targetfilename + ".tlb");

+	    t << "\n\t" << ("-$(IDC) $(TARGET) /regserver" );

+	} else {

+	    t << "\n\t" << ("-$(TARGET) -dumpidl tmp\\" + targetfilename + ".idl -version " + version);

+	    t << "\n\t" << ("-$(IDL) tmp\\" + targetfilename + ".idl /nologo /o tmp\\" + targetfilename + ".midl /tlb tmp\\" + targetfilename + ".tlb /iid tmp\\dump.midl /dlldata tmp\\dump.midl /cstub tmp\\dump.midl /header tmp\\dump.midl /proxy tmp\\dump.midl /sstub tmp\\dump.midl");

+	    t << "\n\t" << ("-$(IDC) $(TARGET) /tlb tmp\\" + targetfilename + ".tlb");

+	    t << "\n\t" << "-$(TARGET) -regserver";

+	}

+    }

+    t << endl << endl;

+

+    if(!project->variables()["RC_FILE"].isEmpty()) {

+	t << var("RES_FILE") << ": " << var("RC_FILE") << "\n\t"

+	  << var("QMAKE_RC") << " -i " << var("RC_FILE") << " -o " << var("RC_FILE").replace(QRegExp("\\.rc"),".o") << endl << endl;

+    }

+	project->variables()["RES_FILE"].first().replace(QRegExp("\\.rc"),".o");

+

+    t << "mocables: $(SRCMOC)" << endl << endl;

+

+    t << "$(OBJECTS_DIR):" << "\n\t"

+      << "@if not exist $(OBJECTS_DIR) mkdir $(OBJECTS_DIR)" << endl << endl;

+

+    t << "$(MOC_DIR):" << "\n\t"

+      << "@if not exist $(MOC_DIR) mkdir $(MOC_DIR)" << endl << endl;

+

+    writeMakeQmake(t);

+

+    t << "dist:" << "\n\t"

+      << "$(ZIP) " << var("PROJECT") << ".zip "

+      << var("PROJECT") << ".pro $(SOURCES) $(HEADERS) $(DIST) $(FORMS)" << endl << endl;

+

+    t << "clean:"

+      << varGlue("OBJECTS","\n\t-del ","\n\t-del ","").replace(QRegExp("\\.obj"),".o")

+      << varGlue("SRCMOC" ,"\n\t-del ","\n\t-del ","")

+      << varGlue("OBJMOC" ,"\n\t-del ","\n\t-del ","").replace(QRegExp("\\.obj"),".o")

+      << varGlue("UICDECLS" ,"\n\t-del ","\n\t-del ","")

+      << varGlue("UICIMPLS" ,"\n\t-del ","\n\t-del ","")

+      << "\n\t-del $(TARGET)"

+      << varGlue("QMAKE_CLEAN","\n\t-del ","\n\t-del ","")

+      << varGlue("CLEAN_FILES","\n\t-del ","\n\t-del ","");

+    if ( project->isActiveConfig("activeqt")) {

+	t << ("\n\t-del tmp\\" + targetfilename + ".*");

+	t << "\n\t-del tmp\\dump.*";

+    }

+    if(project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty()) 

+	t << "\n\t-del " << var("DLLDESTDIR") << "\\" << project->variables()[ "TARGET" ].first() << project->variables()[ "TARGET_EXT" ].first();

+    if(!project->isEmpty("IMAGES"))

+	t << varGlue("QMAKE_IMAGE_COLLECTION", "\n\t-del ", "\n\t-del ", "");

+

+    // blasted user defined targets

+    QStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"];

+    for(QStringList::Iterator it = qut.begin(); it != qut.end(); ++it) {

+	QString targ = var((*it) + ".target"),

+		 cmd = var((*it) + ".commands"), deps;

+	if(targ.isEmpty())

+	    targ = (*it);

+	QStringList &deplist = project->variables()[(*it) + ".depends"];

+	for(QStringList::Iterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) {

+	    QString dep = var((*dep_it) + ".target");

+	    if(dep.isEmpty())

+		dep = (*dep_it);

+	    deps += " " + dep;

+	}

+	t << "\n\n" << targ << ":" << deps << "\n\t"

+	  << cmd;

+    }

+

+    t << endl << endl;

+}

+

+

+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;

+    }

+

+    bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qt-mt"QTDLL_POSTFIX);

+    project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];

+    

+    // LIBS defined in Profile comes first for gcc

+    project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];

+    

+    QString targetfilename = project->variables()["TARGET"].first();

+    QStringList &configs = project->variables()["CONFIG"];

+    if (project->isActiveConfig("qt") && project->isActiveConfig("shared"))

+	project->variables()["DEFINES"].append("QT_DLL");

+    if (project->isActiveConfig("qt_dll"))

+	if(configs.findIndex("qt") == -1) configs.append("qt");

+    if ( project->isActiveConfig("qt") ) {

+	if ( project->isActiveConfig( "plugin" ) ) {

+	    project->variables()["CONFIG"].append("dll");

+	    if(project->isActiveConfig("qt"))

+		project->variables()["DEFINES"].append("QT_PLUGIN");

+	}

+	if ( (project->variables()["DEFINES"].findIndex("QT_NODLL") == -1) &&

+         ((project->variables()["DEFINES"].findIndex("QT_MAKEDLL") != -1 ||

+           project->variables()["DEFINES"].findIndex("QT_DLL") != -1) ||

+          (getenv("QT_DLL") && !getenv("QT_NODLL"))) ) {

+	    project->variables()["QMAKE_QT_DLL"].append("1");

+	    if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() )

+		project->variables()["CONFIG"].append("dll");

+	}

+	if ( project->isActiveConfig("thread") ) 

+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT");

+	if ( project->isActiveConfig("accessibility" ) )

+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT");

+	if ( project->isActiveConfig("tablet") )

+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_TABLET_SUPPORT");

+    }

+    if ( project->isActiveConfig("dll") || !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) {

+	project->variables()["CONFIG"].remove("staticlib");

+	project->variables()["QMAKE_APP_OR_DLL"].append("1");

+    } else {

+	project->variables()["CONFIG"].append("staticlib");

+    }

+    if ( project->isActiveConfig("warn_off") ) {

+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_OFF"];

+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_OFF"];

+    } else if ( project->isActiveConfig("warn_on") ) {

+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_ON"];

+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_ON"];

+    }

+    if ( project->isActiveConfig("debug") ) {

+        if ( project->isActiveConfig("thread") ) {

+	    // use the DLL RT even here

+	    if ( project->variables()["DEFINES"].contains("QT_DLL") ) {

+		project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DLLDBG"];

+		project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DLLDBG"];

+	    } else {

+		project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DBG"];

+		project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DBG"];

+	    }

+	}

+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_DEBUG"];

+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_DEBUG"];

+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_DEBUG"];

+    } else {

+	if ( project->isActiveConfig("thread") ) {

+	    if ( project->variables()["DEFINES"].contains("QT_DLL") ) {

+		project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DLL"];

+		project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DLL"];

+	    } else {

+		project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT"];

+		project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT"];

+	    }

+	}

+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RELEASE"];

+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RELEASE"];

+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_RELEASE"];

+    }

+

+    if ( !project->variables()["QMAKE_INCDIR"].isEmpty()) 

+	project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR"];

+    if ( project->isActiveConfig("qt") || project->isActiveConfig("opengl") ) 

+	project->variables()["CONFIG"].append("windows");

+    if ( project->isActiveConfig("qt") ) {

+	project->variables()["CONFIG"].append("moc");

+	project->variables()["INCLUDEPATH"] +=	project->variables()["QMAKE_INCDIR_QT"];

+	project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"];

+	if ( !project->isActiveConfig("debug") ) 

+	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG");

+	if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) {

+	    if ( !project->variables()["QMAKE_QT_DLL"].isEmpty()) {

+		project->variables()["DEFINES"].append("QT_MAKEDLL");

+		project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_QT_DLL"];

+	    }

+	} else {

+	    if(project->isActiveConfig("thread"))

+		project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"];

+	    else

+		project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"];

+	    if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) {

+		int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt");

+		if ( hver == -1 )

+		    hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt-mt");

+		if(hver != -1) {

+		    QString ver;

+		    ver.sprintf("libqt-%s" QTDLL_POSTFIX "%d.a", (project->isActiveConfig("thread") ? "-mt" : ""), hver);

+		    QStringList &libs = project->variables()["QMAKE_LIBS"];

+// @@@HGTODO maybe we must change the replace regexp if we understand what's going on

+		    for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit)

+			(*libit).replace(QRegExp("qt(-mt)?\\.lib"), ver);

+		}

+	    }

+	    if ( project->isActiveConfig( "activeqt" ) ) {

+		project->variables().remove("QMAKE_LIBS_QT_ENTRY");

+		project->variables()["QMAKE_LIBS_QT_ENTRY"] = "qaxserver.lib";

+		if ( project->isActiveConfig( "dll" ) )

+		    project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"];

+	    }

+	    if ( !project->isActiveConfig("dll") && !project->isActiveConfig("plugin") ) {

+		project->variables()["QMAKE_LIBS"] +=project->variables()["QMAKE_LIBS_QT_ENTRY"];

+	    }

+	}

+    }

+    if ( project->isActiveConfig("opengl") ) {

+	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"];

+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"];

+    }

+    if ( project->isActiveConfig("dll") ) {

+	project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE_DLL"];

+	project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE_DLL"];

+	project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE_DLL"];

+	project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS_DLL"];

+	if ( !project->variables()["QMAKE_LIB_FLAG"].isEmpty()) {

+	    project->variables()["TARGET_EXT"].append(

+		QStringList::split('.',project->first("VERSION")).join("") + ".dll");

+	} else {

+	    project->variables()["TARGET_EXT"].append(".dll");

+	}

+    } else {

+	project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE"];

+	project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE"];

+	project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE"];

+	project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS"];

+	if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty()) {

+	    project->variables()["TARGET_EXT"].append(".exe");

+	} else {

+	    project->variables()["TARGET_EXT"].append(".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("moc") ) 

+	setMocAware(TRUE);

+    project->variables()["QMAKE_FILETAGS"] += QStringList::split(' ',

+	"HEADERS SOURCES DEF_FILE RC_FILE TARGET QMAKE_LIBS DESTDIR DLLDESTDIR INCLUDEPATH");

+    QStringList &l = project->variables()["QMAKE_FILETAGS"];

+    for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {

+	QStringList &gdmf = project->variables()[(*it)];

+	for(QStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner)

+	    (*inner) = Option::fixPathToTargetOS((*inner), FALSE);

+    }

+

+    if ( project->isActiveConfig("dll") )

+	project->variables()["QMAKE_LFLAGS"].append(QString("-Wl,--out-implib,") + project->first("DESTDIR") + "\\lib"+ project->first("TARGET") + ".a");

+

+    if ( !project->variables()["DEF_FILE"].isEmpty() ) 

+	project->variables()["QMAKE_LFLAGS"].append(QString("-Wl,--output-def,") + project->first("DEF_FILE"));

+//    if(!project->isActiveConfig("incremental"))

+//	project->variables()["QMAKE_LFLAGS"].append(QString("/incremental:no"));

+

+#if 0

+    if ( !project->variables()["VERSION"].isEmpty() ) {

+	QString version = project->variables()["VERSION"][0];

+	int firstDot = version.find( "." );

+	QString major = version.left( firstDot );

+	QString minor = version.right( version.length() - firstDot - 1 );

+	minor.replace( ".", "" );

+	project->variables()["QMAKE_LFLAGS"].append( "/VERSION:" + major + "." + minor );

+    }

+#endif

+    if ( !project->variables()["RC_FILE"].isEmpty()) {

+	if ( !project->variables()["RES_FILE"].isEmpty()) {

+	    fprintf(stderr, "Both .rc and .res file specified.\n");

+	    fprintf(stderr, "Please specify one of them, not both.");

+	    exit(666);

+	}

+	project->variables()["RES_FILE"] = project->variables()["RC_FILE"];

+	project->variables()["RES_FILE"].first().replace(".rc",".o");

+	project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"];

+    }

+    if ( !project->variables()["RES_FILE"].isEmpty()) 

+	project->variables()["QMAKE_LIBS"] += project->variables()["RES_FILE"];

+

+    MakefileGenerator::init();

+    if ( !project->variables()["VERSION"].isEmpty()) {

+	QStringList l = QStringList::split('.', project->first("VERSION"));

+	project->variables()["VER_MAJ"].append(l[0]);

+	project->variables()["VER_MIN"].append(l[1]);

+    }

+    if(project->isActiveConfig("dll")) {

+	project->variables()["QMAKE_CLEAN"].append(project->first("DESTDIR") +"lib" + project->first("TARGET") + ".a");

+    }

+}

+

+void

+MingwMakefileGenerator::writeSubDirs(QTextStream &t)

+{

+    QString qs ;

+    QTextStream ts (&qs, IO_WriteOnly) ;

+    Win32MakefileGenerator::writeSubDirs( ts ) ;

+    QRegExp rx("(\\n\\tcd [^\\n\\t]+)(\\n\\t.+)\\n\\t@cd ..") ;

+    rx.setMinimal(true);

+    int pos = 0 ;

+    while ( -1 != (pos = rx.search( qs, pos)))

+    {

+	QString qsMatch = rx.cap(2);

+	qsMatch.replace("\n\t"," && \\\n\t");

+	qs.replace(pos+rx.cap(1).length(), rx.cap(2).length(), qsMatch );

+	pos += (rx.cap(1).length()+qsMatch.length());

+    }

+    t << qs ;

+}

diff --git a/qmake/generators/win32/mingw_make.h b/qmake/generators/win32/mingw_make.h
new file mode 100644
index 0000000..c00bf1b
--- a/dev/null
+++ b/qmake/generators/win32/mingw_make.h
@@ -0,0 +1,58 @@
+/****************************************************************************

+** $Id$

+**

+** Definition of ________ class.

+**

+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.

+**

+** This file is part of the network module of the Qt GUI Toolkit.

+**

+** This file may be distributed under the terms of the Q Public License

+** as defined by Trolltech AS of Norway and appearing in the file

+** LICENSE.QPL included in the packaging of this file.

+**

+** This file may be distributed and/or modified under the terms of the

+** GNU General Public License version 2 as published by the Free Software

+** Foundation and appearing in the file LICENSE.GPL included in the

+** packaging of this file.

+**

+** Licensees holding valid Qt Enterprise Edition licenses may use this

+** file in accordance with the Qt Commercial License Agreement provided

+** with the Software.

+**

+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE

+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

+**

+** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for

+**   information about Qt Commercial License Agreements.

+** See http://www.trolltech.com/qpl/ for QPL licensing information.

+** See http://www.trolltech.com/gpl/ for GPL licensing information.

+**

+** Contact info@trolltech.com if any conditions of this licensing are

+** not clear to you.

+**

+**********************************************************************/

+#ifndef __MINGW_MAKE_H__

+#define __MINGW_MAKE_H__

+

+#include "winmakefile.h"

+

+class MingwMakefileGenerator : public Win32MakefileGenerator

+{

+    bool init_flag;

+    void writeMingwParts(QTextStream &);

+    void writeSubDirs(QTextStream &t) ;

+

+    bool writeMakefile(QTextStream &);

+    void init();

+

+public:

+    MingwMakefileGenerator(QMakeProject *p);

+    ~MingwMakefileGenerator();

+

+};

+

+inline MingwMakefileGenerator::~MingwMakefileGenerator()

+{ }

+

+#endif /* __MINGW_MAKE_H__ */

diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp
index 8b08c78..3fa0496 100644
--- a/qmake/generators/win32/msvc_dsp.cpp
+++ b/qmake/generators/win32/msvc_dsp.cpp
@@ -508,6 +508,30 @@ DspMakefileGenerator::init()
     QStringList::Iterator it;
     init_flag = TRUE;
 
+    const bool thread = project->isActiveConfig("thread");
+
+    if ( project->isActiveConfig("stl") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_ON"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_OFF"];
+    }
+    if ( project->isActiveConfig("exceptions") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_ON"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_OFF"];
+    }
+    if ( project->isActiveConfig("rtti") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_ON"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_OFF"];
+    }
+
     /* this should probably not be here, but I'm using it to wrap the .t files */
     if(project->first("TEMPLATE") == "vcapp" )
 	project->variables()["QMAKE_APP_FLAG"].append("1");
@@ -568,7 +592,7 @@ DspMakefileGenerator::init()
 		project->variables()["QMAKE_LFLAGS"].append("/base:\"0x39D00000\"");
 	    }
 	} else {
-	    if(project->isActiveConfig("thread"))
+	    if( thread )
 		project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"];
 	    else
 		project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"];
@@ -578,7 +602,7 @@ DspMakefileGenerator::init()
 		    hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt-mt");
 		if(hver != -1) {
 		    QString ver;
-		    ver.sprintf("qt%s" QTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "-mt" : ""), hver);
+		    ver.sprintf("qt%s" QTDLL_POSTFIX "%d.lib", (thread ? "-mt" : ""), hver);
 		    QStringList &libs = project->variables()["QMAKE_LIBS"];
 		    for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit)
 			(*libit).replace(QRegExp("qt(-mt)?\\.lib"), ver);
@@ -622,7 +646,7 @@ DspMakefileGenerator::init()
 	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"];
 	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"];
     }
-    if ( project->isActiveConfig("thread") ) {
+    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"
@@ -732,6 +756,7 @@ DspMakefileGenerator::init()
     project->variables()["MSVCDSP_DEFINES"].append(varGlue("DEFINES","/D ","" " /D ",""));
     project->variables()["MSVCDSP_DEFINES"].append(varGlue("PRL_EXPORT_DEFINES","/D ","" " /D ",""));
 
+    processPrlFiles();
     QStringList &libs = project->variables()["QMAKE_LIBS"];
     for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) {
 	QString lib = (*libit);
@@ -754,6 +779,18 @@ DspMakefileGenerator::init()
     }
 
     QString dest;
+    QString postLinkStep;
+    QString copyDllStep;
+    QString activeQtStepPreCopyDll;
+    QString activeQtStepPostCopyDll;
+    QString activeQtStepPreCopyDllDebug;
+    QString activeQtStepPostCopyDllDebug;
+    QString activeQtStepPreCopyDllRelease;
+    QString activeQtStepPostCopyDllRelease;
+
+    if ( !project->variables()["QMAKE_POST_LINK"].isEmpty() )
+	postLinkStep += var("QMAKE_POST_LINK");
+
     if ( !project->variables()["DESTDIR"].isEmpty() ) {
 	project->variables()["TARGET"].first().prepend(project->first("DESTDIR"));
 	Option::fixPathToTargetOS(project->first("TARGET"));
@@ -770,20 +807,13 @@ DspMakefileGenerator::init()
     }
     if ( project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty() ) {
 	QStringList dlldirs = project->variables()["DLLDESTDIR"];
-	QString copydll = "# Begin Special Build Tool\n"
-	     "TargetPath=" + dest + "\n"
-		 "SOURCE=$(InputPath)\n"
-	 "PostBuild_Desc=Copy DLL to " + project->first("DLLDESTDIR") + "\n"
-	 "PostBuild_Cmds=";
-
+	if ( dlldirs.count() )
+	    copyDllStep += "\t";
 	for ( QStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) {
-	    copydll += "copy \"" + dest + "\" \"" + *dlldir + "\"\t";
+	    copyDllStep += "copy \"$(TargetPath)\" \"" + *dlldir + "\"\t";
 	}
-
-	copydll += "\n# End Special Build Tool";
-	project->variables()["MSVCDSP_COPY_DLL_REL"].append( copydll );
-	project->variables()["MSVCDSP_COPY_DLL_DBG"].append( copydll );
     }
+
     if ( project->isActiveConfig("activeqt") ) {
 	QString idl = project->variables()["QMAKE_IDL"].first();
 	QString idc = project->variables()["QMAKE_IDC"].first();
@@ -795,42 +825,54 @@ DspMakefileGenerator::init()
 	project->variables()["MSVCDSP_IDLSOURCES"].append( "tmp\\" + targetfilename + ".tlb" );
 	project->variables()["MSVCDSP_IDLSOURCES"].append( "tmp\\" + targetfilename + ".midl" );
 	if ( project->isActiveConfig( "dll" ) ) {
-	    QString regcmd = "# Begin Special Build Tool\n"
-		"TargetPath=" + targetfilename + "\n"
-		    "SOURCE=$(InputPath)\n"
-	    "PostBuild_Desc=Finalizing ActiveQt server...\n"
-	    "PostBuild_Cmds=" +
-			     idc + " %1 -idl tmp\\" + targetfilename + ".idl -version " + version +
+	    activeQtStepPreCopyDll += 
+			     "\t" + idc + " %1 -idl tmp\\" + targetfilename + ".idl -version " + version +
 			     "\t" + idl + " tmp\\" + targetfilename + ".idl /nologo /o tmp\\" + targetfilename + ".midl /tlb tmp\\" + targetfilename + ".tlb /iid tmp\\dump.midl /dlldata tmp\\dump.midl /cstub tmp\\dump.midl /header tmp\\dump.midl /proxy tmp\\dump.midl /sstub tmp\\dump.midl"
-			     "\t" + idc + " %1 /tlb tmp\\" + targetfilename + ".tlb"
-			     "\t" + idc + " %1 /regserver\n"
-			     "# End Special Build Tool";
+			     "\t" + idc + " %1 /tlb tmp\\" + targetfilename + ".tlb";
+	    activeQtStepPostCopyDll +=
+			     "\t" + idc + " %1 /regserver\n";
 
-	    QString executable = project->variables()["MSVCDSP_TARGETDIRREL"].first() + "\\" + project->variables()["TARGET"].first();
-	    project->variables()["MSVCDSP_COPY_DLL_REL"].append( regcmd.arg(executable).arg(executable).arg(executable) );
+	    QString executable = project->variables()["MSVCDSP_TARGETDIRREL"].first() + "\\" + targetfilename + ".dll";
+	    activeQtStepPreCopyDllRelease = activeQtStepPreCopyDll.arg(executable).arg(executable);
+	    activeQtStepPostCopyDllRelease = activeQtStepPostCopyDll.arg(executable);
 
-	    executable = project->variables()["MSVCDSP_TARGETDIRDEB"].first() + "\\" + project->variables()["TARGET"].first();
-	    project->variables()["MSVCDSP_COPY_DLL_DBG"].append( regcmd.arg(executable).arg(executable).arg(executable) );
+	    executable = project->variables()["MSVCDSP_TARGETDIRDEB"].first() + "\\" + targetfilename + ".dll";
+	    activeQtStepPreCopyDllDebug = activeQtStepPreCopyDll.arg(executable).arg(executable);
+	    activeQtStepPostCopyDllDebug = activeQtStepPostCopyDll.arg(executable);
 	} else {
-	    QString regcmd = "# Begin Special Build Tool\n"
-		"TargetPath=" + targetfilename + "\n"
-		    "SOURCE=$(InputPath)\n"
-	    "PostBuild_Desc=Finalizing ActiveQt server...\n"
-	    "PostBuild_Cmds="
-			     "%1 -dumpidl tmp\\" + targetfilename + ".idl -version " + version +
+	    activeQtStepPreCopyDll += 
+			     "\t%1 -dumpidl tmp\\" + targetfilename + ".idl -version " + version +
 			     "\t" + idl + " tmp\\" + targetfilename + ".idl /nologo /o tmp\\" + targetfilename + ".midl /tlb tmp\\" + targetfilename + ".tlb /iid tmp\\dump.midl /dlldata tmp\\dump.midl /cstub tmp\\dump.midl /header tmp\\dump.midl /proxy tmp\\dump.midl /sstub tmp\\dump.midl"
-			     "\t" + idc + " %1 /tlb tmp\\" + targetfilename + ".tlb"
-			     "\t%1 -regserver\n"
-			     "# End Special Build Tool";
-
-	    QString executable = project->variables()["MSVCDSP_TARGETDIRREL"].first() + "\\" + project->variables()["TARGET"].first();
-	    project->variables()["MSVCDSP_REGSVR_REL"].append( regcmd.arg(executable).arg(executable).arg(executable) );
-
-	    executable = project->variables()["MSVCDSP_TARGETDIRDEB"].first() + "\\" + project->variables()["TARGET"].first();
-	    project->variables()["MSVCDSP_REGSVR_DBG"].append( regcmd.arg(executable).arg(executable).arg(executable) );
+			     "\t" + idc + " %1 /tlb tmp\\" + targetfilename + ".tlb";
+	    activeQtStepPostCopyDll +=
+			     "\t%1 -regserver\n";
+	    QString executable = project->variables()["MSVCDSP_TARGETDIRREL"].first() + "\\" + targetfilename + ".exe";
+	    activeQtStepPreCopyDllRelease = activeQtStepPreCopyDll.arg(executable).arg(executable);
+	    activeQtStepPostCopyDllRelease = activeQtStepPostCopyDll.arg(executable);
+
+	    executable = project->variables()["MSVCDSP_TARGETDIRDEB"].first() + "\\" + targetfilename + ".exe";
+	    activeQtStepPreCopyDllDebug = activeQtStepPreCopyDll.arg(executable).arg(executable);
+	    activeQtStepPostCopyDllDebug = activeQtStepPostCopyDll.arg(executable);
 	}
 
     }
+
+    
+    if ( !postLinkStep.isEmpty() || !copyDllStep.isEmpty() || !activeQtStepPreCopyDllDebug.isEmpty() || !activeQtStepPreCopyDllRelease.isEmpty() ) {
+	project->variables()["MSVCDSP_POST_LINK_DBG"].append(
+	    "# Begin Special Build Tool\n"
+	    "SOURCE=$(InputPath)\n"
+	    "PostBuild_Desc=Post Build Step\n"
+	    "PostBuild_Cmds=" + postLinkStep + activeQtStepPreCopyDllDebug + copyDllStep + activeQtStepPostCopyDllDebug + "\n"
+	    "# End Special Build Tool\n" );
+	project->variables()["MSVCDSP_POST_LINK_REL"].append(
+	    "# Begin Special Build Tool\n"
+	    "SOURCE=$(InputPath)\n"
+	    "PostBuild_Desc=Post Build Step\n"
+	    "PostBuild_Cmds=" + postLinkStep + activeQtStepPreCopyDllRelease + copyDllStep + activeQtStepPostCopyDllRelease + "\n"
+	    "# End Special Build Tool\n" );
+    }
+
     if ( !project->variables()["SOURCES"].isEmpty() || !project->variables()["RC_FILE"].isEmpty() ) {
 	project->variables()["SOURCES"] += project->variables()["RC_FILE"];
     }
@@ -844,7 +886,7 @@ DspMakefileGenerator::init()
 
 
 QString
-DspMakefileGenerator::findTemplate(QString file)
+DspMakefileGenerator::findTemplate(const QString &file)
 {
     QString ret;
     if(!QFile::exists((ret = file)) &&
@@ -871,58 +913,59 @@ DspMakefileGenerator::processPrlVariable(const QString &var, const QStringList &
 }
 
 
-int
+void
 DspMakefileGenerator::beginGroupForFile(QString file, QTextStream &t,
-					QString filter)
+					const QString& filter)
 {
     if(project->isActiveConfig("flat"))
-	return 0;
+	return;
 
     fileFixify(file, QDir::currentDirPath(), QDir::currentDirPath(), TRUE);
     file = file.section(Option::dir_sep, 0, -2);
     if(file.right(Option::dir_sep.length()) != Option::dir_sep)
 	file += Option::dir_sep;
     if(file == currentGroup)
-	return 0;
+	return;
 
     if(file.isEmpty() || !QDir::isRelativePath(file)) {
 	endGroups(t);
-	return 0;
+	return;
     }
     if(file.startsWith(currentGroup))
 	file = file.mid(currentGroup.length());
-    else
-	endGroups(t);
-    int lvl = file.contains(Option::dir_sep), old_lvl = currentGroup.contains(Option::dir_sep);
-    if(lvl > old_lvl) {
-	QStringList dirs = QStringList::split(Option::dir_sep, file);
-	for(QStringList::Iterator dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) {
-	    t << "# Begin Group \"" << (*dir_it) << "\"\n"
-	      << "# Prop Default_Filter \"" << filter << "\"\n";
-	}
-    } else {
-	for(int x = old_lvl - lvl; x; x--)
+    int dirSep = currentGroup.findRev( Option::dir_sep );
+    while( !file.startsWith( currentGroup ) && dirSep != -1 ) {
+	currentGroup.truncate( dirSep );
+	dirSep = currentGroup.findRev( Option::dir_sep );
+	if ( !file.startsWith( currentGroup ) && dirSep != -1 )
 	    t << "\n# End Group\n";
     }
+    if ( !file.startsWith( currentGroup ) ) {
+	t << "\n# End Group\n";
+	currentGroup = "";
+    }
+    QStringList dirs = QStringList::split(Option::dir_sep, file.right( file.length() - currentGroup.length() ) );
+    for(QStringList::Iterator dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) {
+	t << "# Begin Group \"" << (*dir_it) << "\"\n"
+	    << "# Prop Default_Filter \"" << filter << "\"\n";
+    }
     currentGroup = file;
-    return lvl - old_lvl;
 }
 
 
-int
+void
 DspMakefileGenerator::endGroups(QTextStream &t)
 {
     if(project->isActiveConfig("flat"))
-	return 0;
+	return;
     else if(currentGroup.isEmpty())
-	return 0;
+	return;
 
     QStringList dirs = QStringList::split(Option::dir_sep, currentGroup);
     for(QStringList::Iterator dir_it = dirs.end(); dir_it != dirs.begin(); --dir_it) {
 	t << "\n# End Group\n";
     }
     currentGroup = "";
-    return dirs.count();
 }
 
 bool
diff --git a/qmake/generators/win32/msvc_dsp.h b/qmake/generators/win32/msvc_dsp.h
index a7fc3e7..3a7d18e 100644
--- a/qmake/generators/win32/msvc_dsp.h
+++ b/qmake/generators/win32/msvc_dsp.h
@@ -5,7 +5,7 @@
 **
 ** Created : 970521
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the network module of the Qt GUI Toolkit.
 **
@@ -34,8 +34,8 @@
 ** not clear to you.
 **
 **********************************************************************/
-#ifndef __DSPMAKE_H__
-#define __DSPMAKE_H__
+#ifndef __MSVC_DSP_H__
+#define __MSVC_DSP_H__
 
 #include "winmakefile.h"
 #include <qvaluestack.h>
@@ -43,14 +43,14 @@
 class DspMakefileGenerator : public Win32MakefileGenerator
 {
     QString currentGroup;
-    int beginGroupForFile(QString file, QTextStream &, const QString filter="");
-    int endGroups(QTextStream &);
+    void beginGroupForFile(QString file, QTextStream &, const QString& filter="");
+    void endGroups(QTextStream &);
 
     bool init_flag;
     bool writeDspParts(QTextStream &);
 
     bool writeMakefile(QTextStream &);
-    QString findTemplate(QString file);
+    QString findTemplate(const QString &file);
     void init();
 
 public:
@@ -70,4 +70,4 @@ inline DspMakefileGenerator::~DspMakefileGenerator()
 inline bool DspMakefileGenerator::findLibraries()
 { return Win32MakefileGenerator::findLibraries("MSVCDSP_LIBS"); }
 
-#endif /* __DSPMAKE_H__ */
+#endif /* __MSVC_DSP_H__ */
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 9cc9a69..ecef34d 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -5,7 +5,7 @@
 **
 ** Created : 970521
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the network module of the Qt GUI Toolkit.
 **
@@ -38,6 +38,7 @@
 #include "msvc_nmake.h"
 #include "option.h"
 #include <qregexp.h>
+#include <qdict.h>
 #include <qdir.h>
 #include <stdlib.h>
 #include <time.h>
@@ -135,6 +136,8 @@ NmakeMakefileGenerator::writeNmakeParts(QTextStream &t)
     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 << endl;
 
     t << "####### Files" << endl << endl;
@@ -156,15 +159,56 @@ NmakeMakefileGenerator::writeNmakeParts(QTextStream &t)
     t << endl;
 
     t << "####### Implicit rules" << endl << endl;
-    t << ".SUFFIXES: .cpp .cxx .cc .c" << endl << endl;
-    t << ".cpp.obj:\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl;
-    t << ".cxx.obj:\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl;
-    t << ".cc.obj:\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl;
-    t << ".c.obj:\n\t" << var("QMAKE_RUN_CC_IMP") << endl << endl;
+    t << ".SUFFIXES: .c";
+    QStringList::Iterator cppit;
+    for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
+	t << " " << (*cppit);
+    t << endl << endl;
+    if(!project->isActiveConfig("no_batch")) {
+	// Batchmode doesn't use the non implicit rules QMAKE_RUN_CXX & QMAKE_RUN_CC
+	project->variables().remove("QMAKE_RUN_CXX");
+	project->variables().remove("QMAKE_RUN_CC");
+
+	QDict<void> source_directories;
+	source_directories.insert(".", (void*)1);
+	if(!project->isEmpty("MOC_DIR"))
+	    source_directories.insert(project->first("MOC_DIR"), (void*)1);
+	if(!project->isEmpty("UI_SOURCES_DIR"))
+	    source_directories.insert(project->first("UI_SOURCES_DIR"), (void*)1);
+	else if(!project->isEmpty("UI_DIR"))
+	    source_directories.insert(project->first("UI_DIR"), (void*)1);
+	QString srcs[] = { QString("SOURCES"), QString("UICIMPLS"), QString("SRCMOC"), QString::null };
+	for(int x = 0; !srcs[x].isNull(); x++) {
+	    QStringList &l = project->variables()[srcs[x]];
+	    for(QStringList::Iterator sit = l.begin(); sit != l.end(); ++sit) {
+		QString sep = "\\";
+		if((*sit).find(sep) == -1)
+		    sep = "/";
+		QString dir = (*sit).section(sep, 0, -2);
+		if(!dir.isEmpty() && !source_directories[dir])
+		    source_directories.insert(dir, (void*)1);
+	    }
+	}
+
+	for(QDictIterator<void> it(source_directories); it.current(); ++it) {
+	    if(it.currentKey().isEmpty())
+		continue;
+	    for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
+		t << "{" << it.currentKey() << "}" << (*cppit) << "{" << var("OBJECTS_DIR") << "}" << Option::obj_ext << "::\n\t"
+		  << var("QMAKE_RUN_CXX_IMP_BATCH").replace( QRegExp( "\\$@" ), var("OBJECTS_DIR") ) << endl << "\t$<" << endl << "<<" << endl << endl;
+	    t << "{" << it.currentKey() << "}" << ".c{" << var("OBJECTS_DIR") << "}" << Option::obj_ext << "::\n\t"
+	      << var("QMAKE_RUN_CC_IMP_BATCH").replace( QRegExp( "\\$@" ), var("OBJECTS_DIR") ) << endl << "\t$<" << endl << "<<" << endl << endl;
+	}
+    } else {
+	for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
+	    t << (*cppit) << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl;
+	t << ".c" << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CC_IMP") << endl << endl;
+    }
 
     t << "####### Build rules" << endl << endl;
     t << "all: " << varGlue("ALL_DEPS",""," "," ") << "$(TARGET)" << endl << endl;
-    t << "$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) " << var("TARGETDEPS");
+    t << "$(TARGET): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC) " 
+      << var("POST_TARGETDEPS");
     if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) {
 	t << "\n\t" << "$(LINK) $(LFLAGS) /OUT:$(TARGET) @<< " << "\n\t  "
 	  << "$(OBJECTS) $(OBJMOC) $(LIBS)";
@@ -173,6 +217,8 @@ NmakeMakefileGenerator::writeNmakeParts(QTextStream &t)
 	  << "$(OBJECTS) $(OBJMOC)";
     }
     t << endl << "<<" << endl;
+    if ( !project->variables()["QMAKE_POST_LINK"].isEmpty() )
+	t << "\t" << var( "QMAKE_POST_LINK" ) << endl;
     if(project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty()) {
 	QStringList dlldirs = project->variables()["DLLDESTDIR"];
 	for ( QStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) {
@@ -220,6 +266,7 @@ NmakeMakefileGenerator::writeNmakeParts(QTextStream &t)
       << varGlue("UICIMPLS" ,"\n\t-del ","\n\t-del ","")
       << varGlue("QMAKE_CLEAN","\n\t-del ","\n\t-del ","")
       << varGlue("CLEAN_FILES","\n\t-del ","\n\t-del ","");
+    
     if ( project->isActiveConfig("activeqt")) {
 	t << ("\n\t-del tmp\\" + targetfilename + ".*");
 	t << "\n\t-del tmp\\dump.*";
@@ -246,6 +293,10 @@ NmakeMakefileGenerator::writeNmakeParts(QTextStream &t)
     }
 
     t << endl << endl;
+
+    t << "distclean: clean"
+      << "\n\t-del $(TARGET)"
+      << endl << endl;
 }
 
 
@@ -431,6 +482,28 @@ NmakeMakefileGenerator::init()
 	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);
@@ -465,7 +538,7 @@ NmakeMakefileGenerator::init()
 	}
 	project->variables()["RES_FILE"] = project->variables()["RC_FILE"];
 	project->variables()["RES_FILE"].first().replace(".rc",".res");
-	project->variables()["TARGETDEPS"] += project->variables()["RES_FILE"];
+	project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"];
     }
     if ( !project->variables()["RES_FILE"].isEmpty())
 	project->variables()["QMAKE_LIBS"] += project->variables()["RES_FILE"];
@@ -476,13 +549,14 @@ NmakeMakefileGenerator::init()
 	project->variables()["VER_MAJ"].append(l[0]);
 	project->variables()["VER_MIN"].append(l[1]);
     }
+
+    QString version = QStringList::split('.', project->first("VERSION")).join("");
     if(project->isActiveConfig("dll")) {
-	project->variables()["QMAKE_CLEAN"].append(project->first("DESTDIR") + project->first("TARGET") + ".lib");
-	project->variables()["QMAKE_CLEAN"].append(project->first("DESTDIR") + project->first("TARGET") + ".exp");
+	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") + ".pdb");
-	project->variables()["QMAKE_CLEAN"].append(project->first("DESTDIR") + project->first("TARGET") + ".ilk");
+	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");
     }
 }
diff --git a/qmake/generators/win32/msvc_nmake.h b/qmake/generators/win32/msvc_nmake.h
index d3e170f..579fc35 100644
--- a/qmake/generators/win32/msvc_nmake.h
+++ b/qmake/generators/win32/msvc_nmake.h
@@ -5,7 +5,7 @@
 **
 ** Created : 970521
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the network module of the Qt GUI Toolkit.
 **
@@ -34,8 +34,8 @@
 ** not clear to you.
 **
 **********************************************************************/
-#ifndef __NMAKEMAKE_H__
-#define __NMAKEMAKE_H__
+#ifndef __MSVC_NMAKE_H__
+#define __MSVC_NMAKE_H__
 
 #include "winmakefile.h"
 
@@ -56,4 +56,4 @@ public:
 inline NmakeMakefileGenerator::~NmakeMakefileGenerator()
 { }
 
-#endif /* __NMAKEMAKE_H__ */
+#endif /* __MSVC_NMAKE_H__ */
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index c2b9e30..7ffe4f7 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -254,27 +254,27 @@ 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; 
+    const char* name;
+    const triState value;
 };
-struct EPair { 
+struct EPair {
     EPair( const char* n, const int v ) : name(n), value(v) {};
-    const char* name; 
+    const char* name;
     const int value;
 };
-struct LPair { 
+struct LPair {
     LPair( const char* n, const long v ) : name(n), value(v) {};
-    const char* name; 
-    const long value; 
+    const char* name;
+    const long value;
 };
-struct SPair { 
+struct SPair {
     SPair( const char* n, const QString& v ) : name(n), value(v) {};
-    const char* name; 
-    const QString& value; 
+    const char* name;
+    const QString& value;
 };
-struct XPair { 
+struct XPair {
     XPair( const char* n, const QStringList& v, const char* s = "," ) : name(n), value(v), sep(s) {};
-    const char* name; 
+    const char* name;
     const QStringList& value;
     const char* sep;
 };
@@ -383,7 +383,7 @@ QTextStream &operator<<( QTextStream &strm, const VCCLCompilerTool &tool )
     strm << _begTool3;
     strm << _VCCLCompilerToolName;
     strm << XPair( _AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories );
-    strm << XPair( _AdditionalOptions, tool.AdditionalOptions );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
     strm << XPair( _AdditionalUsingDirectories, tool.AdditionalUsingDirectories );
     strm << SPair( _AssemblerListingLocation, tool.AssemblerListingLocation );
     if ( tool.AssemblerOutput != asmListingNone )	    strm << EPair( _AssemblerOutput, tool.AssemblerOutput );
@@ -442,7 +442,7 @@ QTextStream &operator<<( QTextStream &strm, const VCCLCompilerTool &tool )
 	strm << EPair( _UsePrecompiledHeader, tool.UsePrecompiledHeader );
     strm << TPair( _WarnAsError, tool.WarnAsError );
     strm << EPair( _WarningLevel, tool.WarningLevel );
-    strm << TPair( _WholeProgramOptimization, tool.WholeProgramOptimization ); 
+    strm << TPair( _WholeProgramOptimization, tool.WholeProgramOptimization );
     strm << "/>";
 return strm;
 }
@@ -450,26 +450,30 @@ return strm;
 bool VCCLCompilerTool::parseOption( const char* option )
 {
     // skip index 0 ('/' or '-')
-    char first  = option[1]; 
+    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" );
-	return FALSE;
+	found = FALSE;
+	break;
     case '@':
 	qWarning( "Generator: Option '/@': MSVC.NET projects do not support the use of a response file" );
-	return FALSE;
+	found = FALSE;
+	break;
     case 'l':
 	qWarning( "Generator: Option '/link': qmake generator does not support passing link options through the compiler tool" );
-	return FALSE;
-
+	found = FALSE;
+	break;
     case 'A':
-	if ( second != 'I' )
-	    return FALSE;
+	if ( second != 'I' ) {
+	    found = FALSE; break;
+	}
 	AdditionalUsingDirectories += option+2;
 	break;
     case 'C':
@@ -487,7 +491,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 		AdditionalOptions += option;
 		break;
 	    }
-	    return FALSE;
+	    found = FALSE; break;
 	}
 	GeneratePreprocessedFile = preprocessYes;
 	break;
@@ -544,7 +548,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 		ExpandAttributedSource = _True;
 		break;
 	    default:
-		return FALSE;
+		found = FALSE; break;
 	    }
 	}
 	break;
@@ -553,7 +557,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	case '3':
 	case '4':
 	    qWarning( "Option '/G3' and '/G4' were phased out in Visual C++ 5.0" );
-	    return FALSE;
+	    found = FALSE; break;
         case '5':
 	    OptimizeForProcessor = procOptimizePentium;
 	    break;
@@ -619,7 +623,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    CallingConvention = callConventionStdCall;
 	    break;
 	default:
-	    return FALSE;
+	    found = FALSE; break;
 	}
 	break;
     case 'H':
@@ -633,7 +637,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    AdditionalOptions += option;
 	    break;
 	}
-	return FALSE;
+	found = FALSE; break;
     case 'M':
 	if ( second == 'D' ) {
 	    RuntimeLibrary = rtMultiThreadedDLL;
@@ -651,7 +655,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 		RuntimeLibrary = rtMultiThreadedDebug;
 	    break;
 	}
-	return FALSE;
+	found = FALSE; break;
     case 'O':
 	switch ( second ) {
 	case '1':
@@ -671,7 +675,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    else if ( third == '2' )
 		InlineFunctionExpansion = expandAnySuitable;
 	    else
-		return FALSE;
+		found = FALSE;
 	    break;
 	case 'd':
 	    Optimization = optimizeDisabled;
@@ -705,7 +709,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 		OmitFramePointers = _False;
 	    break;
 	default:
-	    return FALSE;
+	    found = FALSE; break;
 	}
 	break;
     case 'P':
@@ -716,7 +720,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    AdditionalOptions += option;
 	    break;
 	}
-	return FALSE;
+	found = FALSE; break;
     case 'R':
 	if ( second == 'T' && third == 'C' ) {
 	    if ( fourth == '1' )
@@ -728,7 +732,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    else if ( fourth == 'u' )
 		BasicRuntimeChecks = runtimeCheckUninitVariables;
 	    else
-		return FALSE;
+		found = FALSE; break;
 	}
 	break;
     case 'T':
@@ -738,7 +742,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    CompileAs = compileAsCPlusPlus;
 	} else {
 	    qWarning( "Generator: Options '/Tp<filename>' and '/Tc<filename>' are not supported by qmake" );
-	    return FALSE;
+	    found = FALSE; break;
 	}
 	break;
     case 'U':
@@ -778,7 +782,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    }
 	    // Fallthrough
 	default:
-	    return FALSE;
+	    found = FALSE; break;
 	}
 	break;
     case 'X':
@@ -807,7 +811,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    PrecompiledHeaderFile = option+3;
 	    break;
 	default:
-	    return FALSE;
+	    found = FALSE; break;
 	}
 	break;
     case 'Z':
@@ -840,9 +844,9 @@ bool VCCLCompilerTool::parseOption( const char* option )
 		else if ( fourth == 'w' )
 		    TreatWChar_tAsBuiltInType = _True;
 		else
-		    return FALSE;
+		    found = FALSE;
 	    } else {
-		return FALSE;
+		found = FALSE; break;
 	    }
 	    break;
 	case 'g':
@@ -869,11 +873,11 @@ bool VCCLCompilerTool::parseOption( const char* option )
 		StructMemberAlignment = alignEightBytes;
 		break;
 	    default:
-		return FALSE;
+		found = FALSE; break;
 	    }
 	    break;
 	default:
-	    return FALSE;
+	    found = FALSE; break;
 	}
 	break;
     case 'c':
@@ -887,12 +891,13 @@ bool VCCLCompilerTool::parseOption( const char* option )
 		CompileAsManaged = managedAssembly;
 	    }
 	} else {
-	    return FALSE;
+	    found = FALSE; break;
 	}
 	break;
     case 'd':
-	if ( second != 'r' )
-	    return FALSE;
+	if ( second != 'r' ) {
+	    found = FALSE; break;
+	}
         CompileAsManaged = managedAssembly;
 	break;
     case 'n':
@@ -904,13 +909,13 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    SuppressStartupBanner = _True;
 	    break;
 	}
-	return FALSE;
+	found = FALSE; break;
     case 's':
 	if ( second == 'h' && third == 'o' && fourth == 'w' ) {
 	    ShowIncludes = _True;
 	    break;
 	}
-	return FALSE;
+	found = FALSE; break;
     case 'u':
 	UndefineAllPreprocessorDefinitions = _True;
 	break;
@@ -919,7 +924,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    AdditionalOptions += option;
 	    break;
 	}
-	return FALSE;
+	found = FALSE; break;
     case 'w':
 	switch ( second ) {
 	case '\0':
@@ -933,8 +938,10 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	}
 	break;
     default:
-	return FALSE;
+	found = FALSE; break;
     }
+    if( !found )
+	warn_msg( WarnLogic, "Could not parse Compiler option: %s", option );
     return TRUE;
 }
 
@@ -980,7 +987,7 @@ QTextStream &operator<<( QTextStream &strm, const VCLinkerTool &tool )
     strm << _VCLinkerToolName;
     strm << XPair( _AdditionalDependencies4, tool.AdditionalDependencies, " " );
     strm << XPair( _AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories );
-    strm << XPair( _AdditionalOptions, tool.AdditionalOptions );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
     strm << XPair( _AddModuleNamesToAssembly, tool.AddModuleNamesToAssembly );
     strm << SPair( _BaseAddress, tool.BaseAddress );
     strm << XPair( _DelayLoadDLLs, tool.DelayLoadDLLs );
@@ -1046,8 +1053,8 @@ static uint elfHash( const char* name )
 
     if ( name ) {
 	k = (const uchar *) name;
-	while ( (*k) && 
-		(*k)!= ':' && 
+	while ( (*k) &&
+		(*k)!= ':' &&
 		(*k)!=',' &&
 		(*k)!=' ' ) {
 	    h = ( h << 4 ) + *k++;
@@ -1060,45 +1067,49 @@ static uint elfHash( const char* name )
 	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 )
 {
-#if 0
+#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( "/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
-#if 0
+#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" ); 
+    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]
@@ -1141,7 +1152,7 @@ bool VCLinkerTool::parseOption( const char* option )
 	DelayLoadDLLs += option+11;
 	break;
     // case 0x003390c: // /DLL
-    // This option is not used for vcproj files 
+    // This option is not used for vcproj files
     //	break;
     case 0x33a3979: // /ENTRY:function
 	EntryPointSymbol = option+7;
@@ -1192,7 +1203,7 @@ bool VCLinkerTool::parseOption( const char* option )
 	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, 
+	    // Very limited documentation on all options but X86,
 	    // so we put the others in AdditionalOptions...
 	case 0x0046063: // AM33
 	case 0x000466d: // ARM
@@ -1216,7 +1227,7 @@ bool VCLinkerTool::parseOption( const char* option )
 	    TargetMachine = machineX86;
 	    break;
 	default:
-	    return FALSE;
+	    found = FALSE;
 	}
 	break;
     case 0x0034160: // /MAP[:filename]
@@ -1275,7 +1286,7 @@ bool VCLinkerTool::parseOption( const char* option )
 		OptimizeForWindows98 = optWin98No;
 		break;
 	    default:
-		return FALSE;
+		found = FALSE;
 	    }
 	}
 	break;
@@ -1324,7 +1335,7 @@ bool VCLinkerTool::parseOption( const char* option )
 		AdditionalOptions += option;
 		break;
 	    default:
-		return FALSE;
+		found = FALSE;
 	    }
 	}
 	break;
@@ -1334,7 +1345,7 @@ bool VCLinkerTool::parseOption( const char* option )
 	else if ( *(option+9) == 'C' )
 	    SwapRunFromCD = _True;
 	else
-	    return FALSE;
+	    found = FALSE;
 	break;
     case 0x34906d4: // /TLBID:id
 	TypeLibraryResourceID = QString( option+7 ).toLong();
@@ -1360,9 +1371,11 @@ bool VCLinkerTool::parseOption( const char* option )
 	Version = option+9;
 	break;
     default:
-	return FALSE;
+	found = FALSE;
     }
-    return TRUE;
+    if( !found )
+	warn_msg( WarnLogic, "Could not parse Linker options: %s", option );
+    return found;
 }
 
 // VCMIDLTool -------------------------------------------------------
@@ -1392,7 +1405,7 @@ QTextStream &operator<<( QTextStream &strm, const VCMIDLTool &tool )
     strm << _begTool3;
     strm << _VCMIDLToolName;
     strm << XPair( _AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories );
-    strm << XPair( _AdditionalOptions, tool.AdditionalOptions );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
     strm << XPair( _CPreprocessOptions, tool.CPreprocessOptions );
     strm << EPair( _DefaultCharType, tool.DefaultCharType );
     strm << SPair( _DLLDataFileName, tool.DLLDataFileName );
@@ -1427,7 +1440,7 @@ QTextStream &operator<<( QTextStream &strm, const VCMIDLTool &tool )
 
 bool VCMIDLTool::parseOption( const char* option )
 {
-#if 0
+#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}" );
@@ -1435,7 +1448,7 @@ bool VCMIDLTool::parseOption( const char* option )
     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( "/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" );
@@ -1445,7 +1458,7 @@ bool VCMIDLTool::parseOption( const char* option )
     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( "/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" );
@@ -1455,6 +1468,7 @@ bool VCMIDLTool::parseOption( const char* option )
     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]
@@ -1490,7 +1504,7 @@ bool VCMIDLTool::parseOption( const char* option )
 	    StructMemberAlignment = midlAlignEightBytes;
 	    break;
 	default:
-	    return FALSE;
+	    found = FALSE;
 	}
 	break;
     case 0x0359e82: // /char {ascii7|signed|unsigned}
@@ -1505,7 +1519,7 @@ bool VCMIDLTool::parseOption( const char* option )
 	    DefaultCharType = midlCharUnsigned;
 	    break;
 	default:
-	    return FALSE;
+	    found = FALSE;
 	}
 	break;
     case 0xa766524: // /cpp_opt options
@@ -1536,13 +1550,13 @@ bool VCMIDLTool::parseOption( const char* option )
 	    EnableErrorChecks = midlDisableAll;
 	    break;
 	case 'r':
-	    break;
 	    ErrorCheckRefPointers = _True;
-	case 's':
 	    break;
+	case 's':
 	    ErrorCheckStubData = _True;
+	    break;
 	default:
-	    return FALSE;
+	    found = FALSE;
 	}
 	break;
     case 0x5eb7af2: // /header filename
@@ -1647,11 +1661,13 @@ bool VCMIDLTool::parseOption( const char* option )
 		WarningLevel = midlWarningLevel_4;
 		break;
 	    default:
-		return FALSE;
+		found = FALSE;
 	    }
 	}
 	break;
     }
+    if( !found )
+	warn_msg( WarnLogic, "Could not parse MIDL option: %s", option );
     return TRUE;
 }
 
@@ -1668,7 +1684,7 @@ QTextStream &operator<<( QTextStream &strm, const VCLibrarianTool &tool )
     strm << SPair( _ToolName, QString( "VCLibrarianTool" ) );
     strm << XPair( _AdditionalDependencies4, tool.AdditionalDependencies );
     strm << XPair( _AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories );
-    strm << XPair( _AdditionalOptions, tool.AdditionalOptions );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
     strm << XPair( _ExportNamedFunctions, tool.ExportNamedFunctions );
     strm << XPair( _ForceSymbolReferences, tool.ForceSymbolReferences );
     strm << TPair( _IgnoreAllDefaultLibraries, tool.IgnoreAllDefaultLibraries );
@@ -1714,7 +1730,7 @@ QTextStream &operator<<( QTextStream &strm, const VCResourceCompilerTool &tool )
     strm << _VCResourceCompilerToolName;
     strm << SPair( _ToolPath, tool.ToolPath );
     strm << XPair( _AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories );
-    strm << XPair( _AdditionalOptions, tool.AdditionalOptions );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
     if ( tool.Culture != rcUseDefault )			    strm << EPair( _Culture, tool.Culture );
     strm << XPair( _FullIncludePath, tool.FullIncludePath );
     strm << TPair( _IgnoreStandardIncludePath, tool.IgnoreStandardIncludePath );
@@ -1851,13 +1867,34 @@ void VCFilter::generateUIC( QTextStream &strm, const QString& str ) const
     QString mocApp = Project->var( "QMAKE_MOC" );
     QString fname = str.section( '\\', -1 );
     QString mocDir = Project->var( "MOC_DIR" );
+    QString uiDir = Project->var( "UI_DIR" );
+    QString uiHeaders;
+    QString uiSources;
+
+    // Determining the paths for the output files.
+    int slash = str.findRev( '\\' );
+    QString pname = ( slash != -1 ) ? str.left( slash+1 ) : QString( ".\\" );
+    if( !uiDir.isEmpty() ) {
+	uiHeaders = uiDir;
+	uiSources = uiDir;
+    } else {
+	uiHeaders = Project->var( "UI_HEADERS_DIR" );
+	uiSources = Project->var( "UI_SOURCES_DIR" );
+	if( uiHeaders.isEmpty() )
+	    uiHeaders = pname;
+	if( uiSources.isEmpty() )
+	    uiSources = pname;
+    }
+    if( !uiHeaders.endsWith( "\\" ) )
+	uiHeaders += "\\";
+    if( !uiSources.endsWith( "\\" ) )
+	uiSources += "\\";
+
+    // Determine the file name.
     int dot = fname.findRev( '.' );
-    if( dot != -1 ) 
+    if( dot != -1 )
 	fname.truncate( dot );
 
-    int slash = str.findRev( '\\' );  
-    QString pname = ( slash != -1 ) ? str.left( slash+1 ) : QString(".\\");
-
     strm << _begFileConfiguration;
     strm << _Name5;
     strm << Config->Name;
@@ -1867,13 +1904,13 @@ void VCFilter::generateUIC( QTextStream &strm, const QString& str ) const
     strm << _Description6;
     strm << "Uic'ing " << str << "...\"";
     strm << _CommandLine6;
-    strm << uicApp << " " << str << " -o " << pname << fname << ".h &amp;&amp; ";				// Create .h from .ui file
-    strm << uicApp << " " << str << " -i " << fname << ".h -o " << pname << fname << ".cpp &amp;&amp; ";	// Create .cpp from .ui file
-    strm << mocApp << " " << pname << fname << ".h -o " << mocDir << "moc_" << fname << ".cpp\"";
+    strm << uicApp << " " << str << " -o " << uiHeaders << fname << ".h &amp;&amp; ";				// Create .h from .ui file
+    strm << uicApp << " " << str << " -i " << fname << ".h -o " << uiSources << fname << ".cpp &amp;&amp; ";	// Create .cpp from .ui file
+    strm << mocApp << " " << uiHeaders << fname << ".h -o " << mocDir << "moc_" << fname << ".cpp\"";
     strm << _AdditionalDependencies6;
     strm << mocApp << ";" << uicApp << "\"";
     strm << _Outputs6;
-    strm << pname << fname << ".h;" << pname << fname << ".cpp;" << mocDir << "moc_" << fname << ".cpp\"";
+    strm << uiHeaders << fname << ".h;" << uiSources << fname << ".cpp;" << mocDir << "moc_" << fname << ".cpp\"";
     strm << "/>";
     strm << _endFileConfiguration;
 }
@@ -1906,9 +1943,9 @@ QTextStream &operator<<( QTextStream &strm, const VCFilter &tool )
 // VCProject --------------------------------------------------------
 VCProject::VCProject()
 {
-    QUuid uniqueId;
 #if defined(Q_WS_WIN32)
     GUID guid;
+    QUuid uniqueId;
     HRESULT h = CoCreateGuid( &guid );
     if ( h == S_OK )
 	uniqueId = QUuid( guid );
diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index 2d09280..1dca68d 100644
--- a/qmake/generators/win32/msvc_objectmodel.h
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -40,16 +40,16 @@
 #include <qstringlist.h>
 
 /*
-    This Object model is of course VERY simplyfied, 
+    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 
+    If a triState value is 'unset' then the
     corresponding property is not in the output,
-    forcing the tool to utilize default values. 
+    forcing the tool to utilize default values.
     False/True values will be in the output...
 */
 enum customBuildCheck {
@@ -83,7 +83,7 @@ enum basicRuntimeCheckOption {
 };
 enum browseInfoOption {
     brInfoNone,
-    brAllInfo, 
+    brAllInfo,
     brNoLocalSymbols
 };
 enum callingConventionOption {
@@ -118,13 +118,13 @@ enum debugOption {
     debugOldStyleInfo,
     debugLineInfoOnly,
     debugEnabled,
-    debugEditAndContinue 
+    debugEditAndContinue
 };
 enum eAppProtectionOption {
     eAppProtectUnchanged,
     eAppProtectLow,
     eAppProtectMedium,
-    eAppProtectHigh 
+    eAppProtectHigh
 };
 enum enumResourceLangID {
     rcUseDefault		= 0,
@@ -231,7 +231,7 @@ enum enumSccEvent {
 enum favorSizeOrSpeedOption {
     favorNone,
     favorSpeed,
-    favorSize 
+    favorSize
 };
 enum genProxyLanguage {
     genProxyNative,
@@ -245,12 +245,12 @@ enum inlineExpansionOption {
 enum linkIncrementalType {
     linkIncrementalDefault,
     linkIncrementalNo,
-    linkIncrementalYes 
+    linkIncrementalYes
 };
 enum linkProgressOption {
     linkProgressNotSet,
     linkProgressAll,
-    linkProgressLibs 
+    linkProgressLibs
 };
 enum machineTypeOption {
     machineNotSet,
@@ -264,7 +264,7 @@ enum midlCharOption {
 enum midlErrorCheckOption {
     midlEnableCustom,
     midlDisableAll,
-    midlEnableAll 
+    midlEnableAll
 };
 enum midlStructMemberAlignOption {
     midlAlignNotSet,
@@ -284,7 +284,7 @@ enum midlWarningLevelOption {
     midlWarningLevel_1,
     midlWarningLevel_2,
     midlWarningLevel_3,
-    midlWarningLevel_4 
+    midlWarningLevel_4
 };
 enum optFoldingType {
     optFoldingDefault,
@@ -296,7 +296,7 @@ enum optimizeOption {
     optimizeMinSpace,
     optimizeMaxSpeed,
     optimizeFull,
-    optimizeCustom 
+    optimizeCustom
 };
 enum optRefType {
     optReferencesDefault,
@@ -312,22 +312,22 @@ enum pchOption {
     pchNone,
     pchCreateUsingSpecific,
     pchGenerateAuto,
-    pchUseUsingSpecific 
+    pchUseUsingSpecific
 };
 enum preprocessOption {
     preprocessNo,
     preprocessYes,
-    preprocessNoLineNumbers 
+    preprocessNoLineNumbers
 };
 enum ProcessorOptimizeOption {
     procOptimizeBlended,
     procOptimizePentium,
-    procOptimizePentiumProAndAbove 
+    procOptimizePentiumProAndAbove
 };
 enum RemoteDebuggerType {
     DbgLocal,
     DbgRemote,
-    DbgRemoteTCPIP 
+    DbgRemoteTCPIP
 };
 enum runtimeLibraryOption {
     rtMultiThreaded,
@@ -335,7 +335,7 @@ enum runtimeLibraryOption {
     rtMultiThreadedDLL,
     rtMultiThreadedDebugDLL,
     rtSingleThreaded,
-    rtSingleThreadedDebug 
+    rtSingleThreadedDebug
 };
 enum structMemberAlignOption {
     alignNotSet,
@@ -343,7 +343,7 @@ enum structMemberAlignOption {
     alignTwoBytes,
     alignFourBytes,
     alignEightBytes,
-    alignSixteenBytes 
+    alignSixteenBytes
 };
 enum subSystemOption {
     subSystemNotSet,
@@ -366,17 +366,17 @@ enum TypeOfDebugger {
     DbgNativeOnly,
     DbgManagedOnly,
     DbgMixed,
-    DbgAuto 
+    DbgAuto
 };
 enum useOfATL {
     useATLNotSet,
     useATLStatic,
-    useATLDynamic 
+    useATLDynamic
 };
 enum useOfMfc {
     useMfcStdWin,
     useMfcStatic,
-    useMfcDynamic 
+    useMfcDynamic
 };
 enum warningLevelOption {
     warningLevel_0,
@@ -390,14 +390,12 @@ class VCToolBase {
 protected:
     // Functions
     VCToolBase(){};
-    ~VCToolBase(){};
+    virtual ~VCToolBase(){}
     virtual bool parseOption( const char* option ) = 0;
 public:
-    bool parseOptions( QStringList& options ) {
-	bool result = TRUE;
-	for ( QStringList::ConstIterator it=options.begin(); (it!=options.end()) && result; it++ )
-	    result = parseOption( (*it).latin1() );
-	return result;
+    void parseOptions( QStringList& options ) {
+	for ( QStringList::ConstIterator it=options.begin(); (it!=options.end()); it++ )
+	    parseOption( (*it).latin1() );
     }
 };
 
@@ -409,9 +407,9 @@ class VCCLCompilerTool : public VCToolBase
 public:
     // Functions
     VCCLCompilerTool();
-    ~VCCLCompilerTool(){};
-    virtual bool parseOption( const char* option );
-    
+    virtual ~VCCLCompilerTool(){}
+    bool parseOption( const char* option );
+
     // Variables
     QStringList		    AdditionalIncludeDirectories;
     QStringList		    AdditionalOptions;
@@ -480,8 +478,8 @@ class VCLinkerTool : public VCToolBase
 public:
     // Functions
     VCLinkerTool();
-    ~VCLinkerTool(){};
-    virtual bool parseOption( const char* option );
+    virtual ~VCLinkerTool(){}
+    bool parseOption( const char* option );
 
     // Variables
     QStringList		    AdditionalDependencies;
@@ -545,8 +543,8 @@ class VCMIDLTool : public VCToolBase
 public:
     // Functions
     VCMIDLTool();
-    ~VCMIDLTool(){};
-    virtual bool parseOption( const char* option );
+    virtual ~VCMIDLTool(){}
+    bool parseOption( const char* option );
 
     // Variables
     QStringList		    AdditionalIncludeDirectories;
@@ -587,8 +585,8 @@ class VCLibrarianTool : public VCToolBase
 public:
     // Functions
     VCLibrarianTool();
-    ~VCLibrarianTool(){};
-    virtual bool parseOption( const char* option ){ return FALSE; };
+    virtual ~VCLibrarianTool(){}
+    bool parseOption( const char* ){ return FALSE; };
 
     // Variables
     QStringList		    AdditionalDependencies;
@@ -608,8 +606,8 @@ class VCCustomBuildTool : public VCToolBase
 public:
     // Functions
     VCCustomBuildTool();
-    ~VCCustomBuildTool(){};
-    virtual bool parseOption( const char* option ){ return FALSE; };
+    virtual ~VCCustomBuildTool(){}
+    bool parseOption( const char* ){ return FALSE; };
 
     // Variables
     QStringList		    AdditionalDependencies;
@@ -625,8 +623,8 @@ class VCResourceCompilerTool : public VCToolBase
 public:
     // Functions
     VCResourceCompilerTool();
-    ~VCResourceCompilerTool(){};
-    virtual bool parseOption( const char* option ){ return FALSE; };
+    virtual ~VCResourceCompilerTool(){}
+    bool parseOption( const char* ){ return FALSE; };
 
     // Variables
     QStringList		    AdditionalIncludeDirectories;
@@ -645,8 +643,8 @@ class VCEventTool : public VCToolBase
 protected:
     // Functions
     VCEventTool() : ExcludedFromBuild( unset ){};
-    ~VCEventTool(){};
-    virtual bool parseOption( const char* option ){ return FALSE; };
+    virtual ~VCEventTool(){}
+    bool parseOption( const char* ){ return FALSE; };
 
 public:
     // Variables
@@ -657,25 +655,25 @@ public:
     QString		    ToolPath;
 };
 
-class VCPostBuildEventTool : public VCEventTool 
+class VCPostBuildEventTool : public VCEventTool
 {
 public:
     VCPostBuildEventTool();
-    ~VCPostBuildEventTool(){};
+    ~VCPostBuildEventTool(){}
 };
 
-class VCPreBuildEventTool : public VCEventTool 
+class VCPreBuildEventTool : public VCEventTool
 {
 public:
     VCPreBuildEventTool();
-    ~VCPreBuildEventTool(){};
+    ~VCPreBuildEventTool(){}
 };
 
-class VCPreLinkEventTool : public VCEventTool 
+class VCPreLinkEventTool : public VCEventTool
 {
 public:
     VCPreLinkEventTool();
-    ~VCPreLinkEventTool(){};
+    ~VCPreLinkEventTool(){}
 };
 
 class VCConfiguration
@@ -683,7 +681,7 @@ class VCConfiguration
 public:
     // Functions
     VCConfiguration();
-    ~VCConfiguration(){};
+    ~VCConfiguration(){}
 
     // Variables
     triState		ATLMinimizesCRunTimeLibraryUsage;
@@ -720,7 +718,7 @@ class VCFilter
 public:
     // Functions
     VCFilter();
-    ~VCFilter(){};
+    ~VCFilter(){}
     void generateMOC( QTextStream &strm, QString str ) const;
     void generateUIC( QTextStream &strm, const QString& str ) const;
 
@@ -739,7 +737,7 @@ class VCProject
 public:
     // Functions
     VCProject();
-    ~VCProject(){};
+    ~VCProject(){}
 
     // Variables
     QString		Name;
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index a2bb6e9..d2cbc31 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -5,7 +5,7 @@
 **
 ** Created : 970521
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the network module of the Qt GUI Toolkit.
 **
@@ -38,13 +38,55 @@
 #include "msvc_vcproj.h"
 #include "option.h"
 #include <qdir.h>
-#include <stdlib.h>
 #include <qregexp.h>
+#include <qdict.h>
+#include <quuid.h>
+#include <stdlib.h>
 
 #if defined(Q_OS_WIN32)
 #include <objbase.h>
+#ifndef GUID_DEFINED
+#define GUID_DEFINED
+typedef struct _GUID
+{
+    ulong   Data1;
+    ushort  Data2;
+    ushort  Data3;
+    uchar   Data4[8];
+} GUID;
+#endif
 #endif
 
+// Flatfile Tags ----------------------------------------------------
+const char* _snlHeader		= "Microsoft Visual Studio Solution File, Format Version 7.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* _snlMSVCvcprojGUID  = "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}";
+const char* _snlProjectBeg	= "\nProject(\"";
+const char* _snlProjectMid	= "\") = ";
+const char* _snlProjectEnd	= "\nEndProject";
+const char* _snlGlobalBeg	= "\nGlobal";
+const char* _snlGlobalEnd	= "\nEndGlobal";
+const char* _snlSolutionConf	= "\n\tGlobalSection(SolutionConfiguration) = preSolution"
+				  "\n\t\tConfigName.0 = Release"
+				  "\n\tEndGlobalSection";
+const char* _snlProjDepBeg	= "\n\tGlobalSection(ProjectDependencies) = postSolution";
+const char* _snlProjDepEnd	= "\n\tEndGlobalSection";
+const char* _snlProjConfBeg	= "\n\tGlobalSection(ProjectConfiguration) = postSolution";
+const char* _snlProjConfTag1	= ".Release.ActiveCfg = Release|Win32";
+const char* _snlProjConfTag2	= ".Release.Build.0 = Release|Win32";
+const char* _snlProjConfEnd	= "\n\tEndGlobalSection";
+const char* _snlExtSections	= "\n\tGlobalSection(ExtensibilityGlobals) = postSolution"
+				  "\n\tEndGlobalSection"
+				  "\n\tGlobalSection(ExtensibilityAddIns) = postSolution"
+				  "\n\tEndGlobalSection";
+// ------------------------------------------------------------------
+
 VcprojGenerator::VcprojGenerator(QMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE)
 {
 }
@@ -52,8 +94,7 @@ VcprojGenerator::VcprojGenerator(QMakeProject *p) : Win32MakefileGenerator(p), i
 /* \internal
     Generates a project file for the given profile.
     Options are either a Visual Studio projectfiles, or
-    recursive projectfiles.. Maybe we can make .sln files
-    someday?
+    solutionfiles by parsing recursive projectdirectories.
 */
 bool VcprojGenerator::writeMakefile(QTextStream &t)
 {
@@ -64,13 +105,15 @@ bool VcprojGenerator::writeMakefile(QTextStream &t)
 	return TRUE;
     }
 
-    // Generate full project file
+    // 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;
-    } else if(project->first("TEMPLATE") == "vcsubdirs") {    // Generate recursive project
+    }
+    // Generate solution file
+    else if(project->first("TEMPLATE") == "vcsubdirs") {
         debug_msg(1, "Generator: MSVC.NET: Writing solution file" );
 	writeSubDirs(t);
 	return TRUE;
@@ -80,10 +123,38 @@ bool VcprojGenerator::writeMakefile(QTextStream &t)
 }
 
 struct VcsolutionDepend {
+    QString uuid;
     QString vcprojFile, orig_target, target;
+    ::target targetType;
     QStringList dependencies;
 };
 
+QUuid VcprojGenerator::increaseUUID( const QUuid &id )
+{
+    QUuid result( id );
+    Q_LONG dataFirst = (result.data4[0] << 24) +
+		       (result.data4[1] << 16) +
+		       (result.data4[2] << 8) +
+                        result.data4[3];
+    Q_LONG dataLast =  (result.data4[4] << 24) +
+		       (result.data4[5] << 16) +
+		       (result.data4[6] <<  8) +
+		        result.data4[7];
+
+    if ( !(dataLast++) )
+	dataFirst++;
+
+    result.data4[0] = uchar((dataFirst >> 24) & 0xff);
+    result.data4[1] = uchar((dataFirst >> 16) & 0xff);
+    result.data4[2] = uchar((dataFirst >>  8) & 0xff);
+    result.data4[3] = uchar( dataFirst        & 0xff);
+    result.data4[4] = uchar((dataLast  >> 24) & 0xff);
+    result.data4[5] = uchar((dataLast  >> 16) & 0xff);
+    result.data4[6] = uchar((dataLast  >>  8) & 0xff);
+    result.data4[7] = uchar( dataLast         & 0xff);
+    return result;
+}
+
 void VcprojGenerator::writeSubDirs(QTextStream &t)
 {
     if(project->first("TEMPLATE") == "subdirs") {
@@ -92,8 +163,22 @@ void VcprojGenerator::writeSubDirs(QTextStream &t)
 	return;
     }
 
-    QPtrList<VcsolutionDepend> solution_depends;
-    solution_depends.setAutoDelete(TRUE);
+    t << _snlHeader;
+    QUuid solutionGUID;
+#if defined(Q_WS_WIN32)
+    GUID guid;
+    HRESULT h = CoCreateGuid( &guid );
+    if ( h == S_OK )
+	solutionGUID = QUuid( guid );
+#else
+    // Qt doesn't support GUID on other platforms yet,
+    // so we use the all-zero uuid, and increase that.
+#endif
+
+
+    QDict<VcsolutionDepend> solution_depends;
+    QPtrList<VcsolutionDepend> solution_cleanup;
+    solution_cleanup.setAutoDelete(TRUE);
     QStringList subdirs = project->variables()["SUBDIRS"];
     QString oldpwd = QDir::currentDirPath();
     for(QStringList::Iterator it = subdirs.begin(); it != subdirs.end(); ++it) {
@@ -116,72 +201,103 @@ void VcprojGenerator::writeSubDirs(QTextStream &t)
 		    if(tmp_proj.first("TEMPLATE") == "vcsubdirs") {
 			QStringList tmp_subdirs = fileFixify(tmp_proj.variables()["SUBDIRS"]);
 			subdirs += tmp_subdirs;
-		    } else if(tmp_proj.first("TEMPLATE") == "vcapp" ||
-			      tmp_proj.first("TEMPLATE") == "vclib") {
-			QString vcproj = fi.baseName() + project->first("VCPROJ_EXTENSION");
-			if(QFile::exists(vcproj) || 1) {
-			    VcprojGenerator tmp_dsp(&tmp_proj);
-			    tmp_dsp.setNoIO(TRUE);
-			    tmp_dsp.init();
-			    if(Option::debug_level) {
-				QMap<QString, QStringList> &vars = tmp_proj.variables();
-				for(QMap<QString, QStringList>::Iterator it = vars.begin(); 
-				    it != vars.end(); ++it) {
-				    if(it.key().left(1) != "." && !it.data().isEmpty())
-					debug_msg(1, "%s: %s === %s", fn.latin1(), it.key().latin1(), 
-						  it.data().join(" :: ").latin1());
-				}
+		    } else if(tmp_proj.first("TEMPLATE") == "vcapp" || tmp_proj.first("TEMPLATE") == "vclib") {
+			// Initialize a 'fake' project to get the correct variables
+			// and to be able to extract all the dependencies
+			VcprojGenerator tmp_vcproj(&tmp_proj);
+			tmp_vcproj.setNoIO(TRUE);
+			tmp_vcproj.init();
+			if(Option::debug_level) {
+			    QMap<QString, QStringList> &vars = tmp_proj.variables();
+			    for(QMap<QString, QStringList>::Iterator it = vars.begin();
+				it != vars.end(); ++it) {
+				if(it.key().left(1) != "." && !it.data().isEmpty())
+				    debug_msg(1, "%s: %s === %s", fn.latin1(), it.key().latin1(),
+						it.data().join(" :: ").latin1());
 			    }
-			    VcsolutionDepend *newDep = new VcsolutionDepend;
-			    newDep->vcprojFile = fileFixify(vcproj);
-			    newDep->orig_target = tmp_proj.first("QMAKE_ORIG_TARGET");
-			    newDep->target = tmp_proj.first("TARGET").section(Option::dir_sep, -1);
-			    if(newDep->target.endsWith(".dll"))
-				newDep->target = newDep->target.left(newDep->target.length()-3) + "lib";
-			    if(!tmp_proj.isEmpty("FORMS")) 
-				newDep->dependencies << "uic.exe";
-			    {
-				QStringList where("QMAKE_LIBS");
-				if(!tmp_proj.isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
-				    where = tmp_proj.variables()["QMAKE_INTERNAL_PRL_LIBS"];
-				for(QStringList::iterator wit = where.begin(); 
-				    wit != where.end(); ++wit) {
-				    QStringList &l = tmp_proj.variables()[(*wit)];
-				    for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
-					QString opt = (*it);
-					if(!opt.startsWith("/")) //Not a switch
-					    newDep->dependencies << opt.section(Option::dir_sep, -1);
-				    }
+			}
+
+			// We assume project filename is [QMAKE_ORIG_TARGET].vcproj
+			QString vcproj = fixFilename(tmp_vcproj.project->first("QMAKE_ORIG_TARGET")) + project->first("VCPROJ_EXTENSION");
+
+			// If file doesn't exsist, then maybe the users configuration
+			// doesn't allow it to be created. Skip to next...
+			if(!QFile::exists(QDir::currentDirPath() + Option::dir_sep + vcproj)) {
+			    qDebug( "Ignored (not found) '%s'",  QString(QDir::currentDirPath() + Option::dir_sep + vcproj).latin1() );
+			    goto nextfile; // # Dirty!
+			}
+
+			VcsolutionDepend *newDep = new VcsolutionDepend;
+			newDep->vcprojFile = fileFixify(vcproj);
+			newDep->orig_target = tmp_proj.first("QMAKE_ORIG_TARGET");
+			newDep->target = tmp_proj.first("TARGET").section(Option::dir_sep, -1);
+			newDep->targetType = tmp_vcproj.projectTarget;
+			{
+			    static QUuid uuid = solutionGUID;
+			    uuid = increaseUUID( uuid );
+			    newDep->uuid = uuid.toString().upper();
+			}
+			if(newDep->target.endsWith(".dll"))
+			    newDep->target = newDep->target.left(newDep->target.length()-3) + "lib";
+			if(!tmp_proj.isEmpty("FORMS"))
+			    newDep->dependencies << "uic.exe";
+			{
+			    QStringList where("QMAKE_LIBS");
+			    if(!tmp_proj.isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
+				where = tmp_proj.variables()["QMAKE_INTERNAL_PRL_LIBS"];
+			    for(QStringList::iterator wit = where.begin();
+				wit != where.end(); ++wit) {
+				QStringList &l = tmp_proj.variables()[(*wit)];
+				for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+				    QString opt = (*it);
+				    if(!opt.startsWith("/")) //Not a switch
+					newDep->dependencies << opt.section(Option::dir_sep, -1);
 				}
 			    }
-			    solution_depends.append(newDep);
 			}
+			solution_cleanup.append(newDep);
+  			solution_depends.insert(newDep->target, newDep);
+  			{
+  			    QRegExp libVersion("[0-9]{3,3}\\.lib$");
+    	  		    if(libVersion.search(newDep->target) != -1)
+	    			solution_depends.insert(newDep->target.left(newDep->target.length() -
+	    						libVersion.matchedLength()) + ".lib", newDep);
+			}
+			t << _snlProjectBeg << _snlMSVCvcprojGUID << _snlProjectMid
+			    << "\"" << newDep->orig_target << "\", \"" << newDep->vcprojFile
+			    << "\", \"" << newDep->uuid << "\"";
+			t << _snlProjectEnd;
 		    }
 		}
+nextfile:
 		QDir::setCurrent(oldpwd);
 	    }
 	}
     }
-
-    VcsolutionDepend *vc;
-    QMap<QString, int> uuids;
-    QRegExp libVersion("[0-9]{3,3}\\.lib$");
-    for(vc = solution_depends.first(); vc; vc = solution_depends.next()) {
-	static int uuid = 666;
-	uuids.insert(vc->target, uuid);
-	if(libVersion.match(vc->target) != -1) 
-	    uuids.insert(vc->target.left(vc->target.length() - libVersion.matchedLength()) + ".lib", 
-			 uuid);
-	t << "\"" << vc->orig_target << "\" \"" << vc->vcprojFile << "\" { " << uuid << " }" << endl;
-	uuid++;
-    }
-    for(vc = solution_depends.first(); vc; vc = solution_depends.next()) {
-	int uuid = uuids[vc->target], cnt = 0;
-	for(QStringList::iterator dit = vc->dependencies.begin(); dit != vc->dependencies.end(); ++dit) {
-	    if(uuids.contains((*dit)))
-		t << uuid << "." << cnt++ << " = " << uuids[(*dit)] << endl;
+    t << _snlGlobalBeg;
+    t << _snlSolutionConf;
+    t << _snlProjDepBeg;
+    for(solution_cleanup.first(); solution_cleanup.current(); solution_cleanup.next()) {
+	int cnt = 0;
+	for(QStringList::iterator dit = solution_cleanup.current()->dependencies.begin();
+	    dit != solution_cleanup.current()->dependencies.end();
+	    ++dit) {
+	    VcsolutionDepend *vc;
+	    if((vc=solution_depends[*dit])) {
+	    	if(solution_cleanup.current()->targetType != StaticLib || vc->targetType == Application)
+		    t << "\n\t\t" << solution_cleanup.current()->uuid << "." << cnt++ << " = " << vc->uuid;
+	    }
 	}
     }
+    t << _snlProjDepEnd;
+    t << _snlProjConfBeg;
+    for(solution_cleanup.first(); solution_cleanup.current(); solution_cleanup.next()) {
+	t << "\n\t\t" << solution_cleanup.current()->uuid << _snlProjConfTag1;
+	t << "\n\t\t" << solution_cleanup.current()->uuid << _snlProjConfTag2;
+    }
+    t << _snlProjConfEnd;
+    t << _snlExtSections;
+    t << _snlGlobalEnd;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -306,12 +422,12 @@ void VcprojGenerator::initConfiguration()
         vcProject.Configuration.ConfigurationType = typeApplication;
 	break;
     }
-    vcProject.Configuration.Name =  ( project->isActiveConfig( "release" ) ? "Release|" : "Debug|" );
+    vcProject.Configuration.Name =  ( project->isActiveConfig( "debug" ) ? "Debug|" : "Release|" );
     vcProject.Configuration.Name += ( vcProject.Configuration.idl.TargetEnvironment == midlTargetWin64 ? "Win64" : "Win32" );
     vcProject.Configuration.ATLMinimizesCRunTimeLibraryUsage = ( project->first("ATLMinimizesCRunTimeLibraryUsage").isEmpty() ? _False : _True );
-    vcProject.Configuration.BuildBrowserInformation = triState( temp.isEmpty() ? unset : temp.toShort() );
+    vcProject.Configuration.BuildBrowserInformation = triState( temp.isEmpty() ? (short)unset : temp.toShort() );
     temp = project->first("CharacterSet");
-    vcProject.Configuration.CharacterSet = charSet( temp.isEmpty() ? charSetNotSet : temp.toShort() );
+    vcProject.Configuration.CharacterSet = charSet( temp.isEmpty() ? (short)charSetNotSet : temp.toShort() );
     vcProject.Configuration.DeleteExtensionsOnClean = project->first("DeleteExtensionsOnClean");
     vcProject.Configuration.ImportLibrary = vcProject.Configuration.linker.ImportLibrary;
     vcProject.Configuration.IntermediateDirectory = project->first("OBJECTS_DIR");
@@ -338,7 +454,7 @@ void VcprojGenerator::initCompilerTool()
 {
     QString placement = project->first("OBJECTS_DIR");
     if ( placement.isEmpty() )
-	placement = project->isActiveConfig( "release" )? ".\\Release\\":".\\Debug\\";
+	placement = ".\\";
 
     vcProject.Configuration.compiler.AssemblerListingLocation = placement ;
     vcProject.Configuration.compiler.ProgramDataBaseFileName = placement ;
@@ -362,6 +478,7 @@ void VcprojGenerator::initCompilerTool()
 	vcProject.Configuration.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS"] );
 	vcProject.Configuration.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_RELEASE"] );
 	vcProject.Configuration.compiler.PreprocessorDefinitions += "QT_NO_DEBUG";
+	vcProject.Configuration.compiler.PreprocessorDefinitions += "NDEBUG";
 	if ( project->isActiveConfig("thread") ) {
 	    if ( (projectTarget == Application) || (projectTarget == StaticLib) )
 		vcProject.Configuration.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_MT"] );
@@ -375,7 +492,7 @@ void VcprojGenerator::initCompilerTool()
     // Common for both release and debug
     if ( project->isActiveConfig("warn_off") )
 	vcProject.Configuration.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_WARN_OFF"] );
-    else
+    else if ( project->isActiveConfig("warn_on") )
 	vcProject.Configuration.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_WARN_ON"] );
     if ( project->isActiveConfig("windows") )
 	vcProject.Configuration.compiler.PreprocessorDefinitions += project->variables()["MSVCPROJ_WINCONDEF"];
@@ -408,13 +525,15 @@ void VcprojGenerator::initLinkerTool()
     vcProject.Configuration.linker.AdditionalDependencies += project->variables()["MSVCPROJ_LIBS"];
 
     switch ( projectTarget ) {
-	case Application:
-	    vcProject.Configuration.linker.OutputFile = project->first( "DESTDIR" );
-	    break;
-	case SharedLib:
-	    vcProject.Configuration.linker.parseOptions( project->variables()["MSVCPROJ_LIBOPTIONS"] );
-	    vcProject.Configuration.linker.OutputFile = project->first( "DLLDESTDIR" );
-	    break;
+    case Application:
+	vcProject.Configuration.linker.OutputFile = project->first( "DESTDIR" );
+	break;
+    case SharedLib:
+	vcProject.Configuration.linker.parseOptions( project->variables()["MSVCPROJ_LIBOPTIONS"] );
+	vcProject.Configuration.linker.OutputFile = project->first( "DLLDESTDIR" );
+	break;
+    case StaticLib: //unhandled - added to remove warnings..
+	break;
     }
 
     if( vcProject.Configuration.linker.OutputFile.isEmpty() )
@@ -459,7 +578,17 @@ void VcprojGenerator::initPreBuildEventTools()
         QStringList& list = project->variables()["IMAGES"];
 	vcProject.Configuration.preBuild.Description = "Generate imagecollection";
 	//vcProject.Configuration.preBuild.AdditionalDependencies += list;
-	vcProject.Configuration.preBuild.CommandLine = project->first("QMAKE_UIC") + " -embed " + project->first("QMAKE_ORIG_TARGET") + " " + list.join(" ") + " -o " + collectionName;
+
+	QFile imgs( ".imgcol" );
+	imgs.open( IO_WriteOnly );
+	QTextStream s( &imgs );
+	QStringList::ConstIterator it = list.begin();
+	while( it!=list.end() ) {
+	    s << *it << " ";
+	    it++;
+	}
+
+	vcProject.Configuration.preBuild.CommandLine = project->first("QMAKE_UIC") + " -embed " + project->first("QMAKE_ORIG_TARGET") + " -f .imgcol -o " + collectionName;
 	//vcProject.Configuration.preBuild.Outputs = collectionName;
 
     }
@@ -467,6 +596,10 @@ void VcprojGenerator::initPreBuildEventTools()
 
 void VcprojGenerator::initPostBuildEventTools()
 {
+    if ( !project->variables()["QMAKE_POST_LINK"].isEmpty() ) {
+	vcProject.Configuration.postBuild.Description = var("QMAKE_POST_LINK");
+	vcProject.Configuration.postBuild.CommandLine = var("QMAKE_POST_LINK");
+    }
     if( project->isActiveConfig( "activeqt" ) ) {
 	QString name = project->first( "QMAKE_ORIG_TARGET" );
 	QString nameext = project->first( "TARGET" );
@@ -474,9 +607,11 @@ void VcprojGenerator::initPostBuildEventTools()
 	QString idc = project->first( "QMAKE_IDC" );
 
 	vcProject.Configuration.postBuild.Description = "Finalizing ActiveQt server...";
+	if ( !vcProject.Configuration.postBuild.CommandLine.isEmpty() )
+	    vcProject.Configuration.postBuild.CommandLine += " &amp;&amp; ";
 
 	if( project->isActiveConfig( "dll" ) ) { // In process
-	    vcProject.Configuration.postBuild.CommandLine =
+	    vcProject.Configuration.postBuild.CommandLine +=
 		// call idc to generate .idl file from .dll
 		idc + " " + vcProject.Configuration.OutputDirectory + "\\" + nameext + " -idl " + objdir + name + ".idl -version 1.0 &amp;&amp; " +
 		// call midl to create implementations of the .idl file
@@ -602,21 +737,6 @@ void VcprojGenerator::initResourceFiles()
     vcProject.ResourceFiles.CustomBuild = none;
 }
 
-/*
-// $$MSVCPROJ_IDLSOURCES ---------------------------------------------
-void VcprojGenerator::writeIDLs( QTextStream &t )
-{
-	QStringList &l = project->variables()["MSVCPROJ_IDLSOURCES"];
-	for(QStringList::Iterator it = l.begin(); it != l.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;
-	}
-    debug_msg(3, "Generator: MSVC.NET: Added IDLs" );
-}
-*/
-
 /* \internal
     Sets up all needed variables from the environment and all the different caches and .conf files
 */
@@ -629,6 +749,28 @@ void VcprojGenerator::initOld()
     init_flag = TRUE;
     QStringList::Iterator it;
 
+    if ( project->isActiveConfig("stl") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_ON"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_OFF"];
+    }
+    if ( project->isActiveConfig("exceptions") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_ON"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_OFF"];
+    }
+    if ( project->isActiveConfig("rtti") ) {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_ON"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_ON"];
+    } else {
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_OFF"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_OFF"];
+    }
+
     // this should probably not be here, but I'm using it to wrap the .t files
     if(project->first("TEMPLATE") == "vcapp" )
 	project->variables()["QMAKE_APP_FLAG"].append("1");
@@ -788,7 +930,7 @@ void VcprojGenerator::initOld()
 
     // INCREMENTAL:NO ------------------------------------------------
     if(!project->isActiveConfig("incremental")) {
-	project->variables()["QMAKE_LFLAGS"].append(QString("/incremental:no"));
+	project->variables()["QMAKE_LFLAGS"].append(QString("/INCREMENTAL:no"));
         if ( is_qt )
 	    project->variables()["MSVCPROJ_DEBUG_OPT"] = "/GZ /Zi";
     }
@@ -799,6 +941,19 @@ void VcprojGenerator::initOld()
 
 
     project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
+    // Update -lname to name.lib, and -Ldir to
+    QStringList &libList = project->variables()["QMAKE_LIBS"];
+    for( it = libList.begin(); it != libList.end(); ) {
+	QString s = *it;
+	if( s.startsWith( "-l" ) ) {
+	    it = libList.remove( it );
+	    it = libList.insert( it, s.mid( 2 ) + ".lib" );
+	} else if( s.startsWith( "-L" ) ) {
+	    it = libList.remove( it );
+	} else {
+	    it++;
+	}
+    }
 
     // Run through all variables containing filepaths, and -----------
     // slash-slosh them correctly depending on current OS  -----------
@@ -821,8 +976,8 @@ void VcprojGenerator::initOld()
     // Save filename w/o extention in $$QMAKE_ORIG_TARGET ------------
     project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
 
-    // TARGET (add extention to $$TARGET) ----------------------------
-    project->variables()["TARGET"].first() += project->first("TARGET_EXT");
+    // TARGET (add extention to $$TARGET)
+    //project->variables()["MSVCPROJ_DEFINES"].append(varGlue(".first() += project->first("TARGET_EXT");
 
     // Init base class too -------------------------------------------
     MakefileGenerator::init();
@@ -867,8 +1022,15 @@ void VcprojGenerator::initOld()
     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() )
-	project->variables()["MSVCPROJ_LFLAGS" ].append(varGlue("QMAKE_LIBDIR","/LIBPATH:"," /LIBPATH:",""));
+    if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() ) {
+	QStringList strl = project->variables()["QMAKE_LIBDIR"];
+	QStringList::iterator stri;
+	for ( stri = strl.begin(); stri != strl.end(); ++stri ) {
+	    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 ",""));
@@ -883,19 +1045,18 @@ void VcprojGenerator::initOld()
 
     QString dest;
     project->variables()["MSVCPROJ_TARGET"] = project->first("TARGET");
-    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( QRegExp("\\$\\(QTDIR\\)"), getenv("QTDIR") );
-	project->variables()["MSVCPROJ_TARGET"].append(
-	    QString("/OUT:") + dest );
-	if ( project->isActiveConfig("dll") ) {
-	    QString imp = dest;
-	    imp.replace(QRegExp("\\.dll"), ".lib");
-	    project->variables()["MSVCPROJ_LIBOPTIONS"] += (QString("/IMPLIB:") + imp );
-	}
+    Option::fixPathToTargetOS(project->first("TARGET"));
+    dest = project->first("TARGET") + project->first( "TARGET_EXT" );
+    if ( project->first("TARGET").startsWith("$(QTDIR)") )
+	dest.replace( QRegExp("\\$\\(QTDIR\\)"), getenv("QTDIR") );
+    project->variables()["MSVCPROJ_TARGET"] = dest;
+    if ( project->isActiveConfig("dll") ) {
+	QString imp = project->first( "DESTDIR" );
+	if( !imp.isNull() && !imp.endsWith( "\\" ) )
+	    imp += "\\";
+	imp += dest;
+	imp.replace(QRegExp("\\.dll"), ".lib");
+	project->variables()["MSVCPROJ_LIBOPTIONS"] += QString("/IMPLIB:") + imp;
     }
 
     // DLL COPY ------------------------------------------------------
@@ -996,23 +1157,26 @@ bool VcprojGenerator::openOutput(QFile &file) const
 	file.setName(outdir + project->first("TARGET") + ext);
     }
     if(QDir::isRelativePath(file.name())) {
-	QString ofile;
-	ofile = file.name();
-	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);
-	    }
-	}
-	file.setName(Option::fixPathToLocalOS(QDir::currentDirPath() + Option::dir_sep + ofile));
+	file.setName( Option::fixPathToLocalOS(QDir::currentDirPath() + Option::dir_sep + fixFilename(file.name())) );
     }
     return Win32MakefileGenerator::openOutput(file);
 }
 
+QString VcprojGenerator::fixFilename(QString ofile) const
+{
+    int slashfind = ofile.findRev('\\');
+    if (slashfind == -1) {
+	ofile = ofile.replace('-', '_');
+    } else {
+	int hypenfind = ofile.find('-', slashfind);
+	while (hypenfind != -1 && slashfind < hypenfind) {
+	    ofile = ofile.replace(hypenfind, 1, '_');
+	    hypenfind = ofile.find('-', hypenfind + 1);
+	}
+    }
+    return ofile;
+}
+
 QString VcprojGenerator::findTemplate(QString file)
 {
     QString ret;
@@ -1042,9 +1206,9 @@ void VcprojGenerator::processPrlVariable(const QString &var, const QStringList &
 void VcprojGenerator::outputVariables()
 {
 #if 0
-    debug_msg(3, "Generator: MSVC.NET: List of current variables:" );
+    qDebug( "Generator: MSVC.NET: List of current variables:" );
     for ( QMap<QString, QStringList>::ConstIterator it = project->variables().begin(); it != project->variables().end(); ++it) {
-	debug_msg(3, "Generator: MSVC.NET: %s => %s", it.key().latin1(), it.data().join(" | ").latin1() );
+	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
index 583b164..69e0c02 100644
--- a/qmake/generators/win32/msvc_vcproj.h
+++ b/qmake/generators/win32/msvc_vcproj.h
@@ -5,7 +5,7 @@
 **
 ** Created : 970521
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the network module of the Qt GUI Toolkit.
 **
@@ -34,8 +34,8 @@
 ** not clear to you.
 **
 **********************************************************************/
-#ifndef __VCPROJMAKE_H__
-#define __VCPROJMAKE_H__
+#ifndef __MSVC_VCPROJ_H__
+#define __MSVC_VCPROJ_H__
 
 #include "winmakefile.h"
 #include "msvc_objectmodel.h"
@@ -46,6 +46,7 @@ enum target {
     StaticLib
 };
 
+struct QUuid;
 class VcprojGenerator : public Win32MakefileGenerator
 {
     bool init_flag;
@@ -68,6 +69,7 @@ protected:
     virtual void processPrlVariable(const QString &, const QStringList &);
     virtual bool findLibraries();
     virtual void outputVariables();
+    QString fixFilename(QString ofile) const;
     
     void initOld();
     void initProject();
@@ -89,27 +91,11 @@ protected:
     void initLexYaccFiles();
     void initResourceFiles();
 
-    /*
-    void writeGuid( QTextStream &t );
-    void writeAdditionalOptions( QTextStream &t );
-    void writeHeaders( QTextStream &t );
-    void writeSources( QTextStream &t );
-    void writeMocs( QTextStream &t );
-    void writeLexs( QTextStream &t );
-    void writeYaccs( QTextStream &t );
-    void writePictures( QTextStream &t );
-    void writeImages( QTextStream &t );
-    void writeIDLs( QTextStream &t );
-
-    void writeForms( QTextStream &t );
-    void writeFormsSourceHeaders( QString &variable, QTextStream &t );
-    void writeTranslations( QTextStream &t );
-    void writeStrippedTranslations( QTextStream &t );
-    */
-
     VCProject vcProject;
     target projectTarget;
 
+private:
+    QUuid increaseUUID(const QUuid &id);
     friend class VCFilter;
 };
 
@@ -126,4 +112,4 @@ inline bool VcprojGenerator::findLibraries()
     return Win32MakefileGenerator::findLibraries("MSVCVCPROJ_LIBS");
 }
 
-#endif /* __VCPROJMAKE_H__ */
+#endif /* __MSVC_VCPROJ_H__ */
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index a07c921..bc3fed9 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -101,7 +101,7 @@ Win32MakefileGenerator::writeSubDirs(QTextStream &t)
 	t << "MAKEFILE=	" << var("MAKEFILE") << endl;
     t << "QMAKE =	" << (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : var("QMAKE_QMAKE")) << endl;
     t << "SUBTARGETS	= ";
-    for( it.toFirst(); it.current(); ++it) 
+    for( it.toFirst(); it.current(); ++it)
 	t << " \\\n\t\t" << it.current()->target;
     t << endl << endl;
     t << "all: qmake_all $(SUBTARGETS)" << endl << endl;
@@ -116,11 +116,10 @@ Win32MakefileGenerator::writeSubDirs(QTextStream &t)
 	t << mkfile << ":";
 	if(project->variables()["QMAKE_NOFORCE"].isEmpty())
 	    t << " FORCE";
-	if(have_dir) 
+	if(have_dir)
 	    t << "\n\t" << "cd " << (*it)->directory;
 	t << "\n\t" << "$(QMAKE) " << (*it)->profile << " " << buildArgs();
-	if((*it)->makefile != "$(MAKEFILE)")
-	    t << " -o " << (*it)->makefile;
+	t << " -o " << (*it)->makefile;
 	if(have_dir) {
 	    int subLevels = it.current()->directory.contains(Option::dir_sep) + 1;
 	    t << "\n\t" << "@cd ..";
@@ -133,11 +132,10 @@ Win32MakefileGenerator::writeSubDirs(QTextStream &t)
 	t << (*it)->target << ": " << mkfile;
 	if(project->variables()["QMAKE_NOFORCE"].isEmpty())
 	    t << " FORCE";
-	if(have_dir) 
+	if(have_dir)
 	    t << "\n\t" << "cd " << (*it)->directory;
 	t << "\n\t" << "$(MAKE)";
-	if((*it)->makefile != "$(MAKEFILE)")
-	    t << " -f " << (*it)->makefile;
+        t << " -f " << (*it)->makefile;
 	if(have_dir) {
 	    int subLevels = it.current()->directory.contains(Option::dir_sep) + 1;
 	    t << "\n\t" << "@cd ..";
@@ -155,14 +153,16 @@ Win32MakefileGenerator::writeSubDirs(QTextStream &t)
     if ( !subdirs.isEmpty() ) {
 	for( it.toFirst(); it.current(); ++it) {
 	    QString subdir = (*it)->directory;
+	    QString profile = (*it)->profile;
 	    int subLevels = subdir.contains(Option::dir_sep) + 1;
 	    t << "\n\t"
 	      << "cd " << subdir << "\n\t";
 	    int lastSlash = subdir.findRev(Option::dir_sep);
 	    if(lastSlash != -1)
 		subdir = subdir.mid( lastSlash + 1 );
-	    t << "$(QMAKE) " << subdir << ".pro"
-	      << (!project->isEmpty("MAKEFILE") ? QString(" -o ") + var("MAKEFILE") : QString(""))
+	    t << "$(QMAKE) "
+	      << ( !profile.isEmpty() ? profile : subdir + ".pro" )
+	      << " -o " << (*it)->makefile
 	      << " " << buildArgs() << "\n\t"
 	      << "@cd ..";
 	    for(int i = 1; i < subLevels; i++ )
@@ -186,13 +186,11 @@ Win32MakefileGenerator::writeSubDirs(QTextStream &t)
 		bool have_dir = !(*it)->directory.isEmpty();
 		if(have_dir)
 		    t << "\n\t" << "cd " << (*it)->directory;
-		QString in_file;
-		if((*it)->makefile != "$(MAKEFILE)")
-		    in_file = " -f " + (*it)->makefile;
+		QString in_file = " -f " + (*it)->makefile;
 		t << "\n\t" << "$(MAKE) " << in_file << " " << targs[x];
 		if(have_dir) {
 		    t << "\n\t" << "@cd ..";
-		    for(int i = 1; i < subLevels; i++ ) 
+		    for(int i = 1; i < subLevels; i++ )
 			t << Option::dir_sep << "..";
 		}
 	    }
@@ -210,26 +208,30 @@ Win32MakefileGenerator::writeSubDirs(QTextStream &t)
 
 
 int
-Win32MakefileGenerator::findHighestVersion(const QString &d, const
-					   QString &stem)
+Win32MakefileGenerator::findHighestVersion(const QString &d, const QString &stem)
 {
-    if(!QFile::exists(Option::fixPathToLocalOS(d)))
+    QString bd = Option::fixPathToLocalOS(d, TRUE);
+    if(!QFile::exists(bd))
 	return -1;
-    if(!project->variables()["QMAKE_" + stem.upper() +
-	"_VERSION_OVERRIDE"].isEmpty())
-	return project->variables()["QMAKE_" + stem.upper() +
-	"_VERSION_OVERRIDE"].first().toInt();
-    QString bd = d;
-    fixEnvVariables(bd);
+    if(!project->variables()["QMAKE_" + stem.upper() + "_VERSION_OVERRIDE"].isEmpty())
+	return project->variables()["QMAKE_" + stem.upper() + "_VERSION_OVERRIDE"].first().toInt();
+
     QDir dir(bd);
     int biggest=-1;
     QStringList entries = dir.entryList();
-    QRegExp regx( "(" + stem + "([0-9]*)).lib", FALSE );
-    for(QStringList::Iterator it = entries.begin(); it != entries.end();
-    ++it) {
+    QString dllStem = stem + QTDLL_POSTFIX;
+    QRegExp regx( "(" + dllStem + "([0-9]*)).lib", FALSE );
+    for(QStringList::Iterator it = entries.begin(); it != entries.end(); ++it) {
 	if(regx.exactMatch((*it)))
-	    biggest = QMAX(biggest, (regx.cap(1) == stem ||
-	    regx.cap(2).isEmpty()) ? -1 : regx.cap(2).toInt());
+	    biggest = QMAX(biggest, (regx.cap(1) == dllStem ||
+				     regx.cap(2).isEmpty()) ? -1 : regx.cap(2).toInt());
+    }
+    if(dir.exists(dllStem + Option::prl_ext)) {
+	QMakeProject proj;
+	if(proj.read(bd + dllStem + Option::prl_ext, QDir::currentDirPath(), TRUE)) {
+	    if(!proj.isEmpty("QMAKE_PRL_VERSION"))
+		biggest = QMAX(biggest, proj.first("QMAKE_PRL_VERSION").replace(".", "").toInt());
+	}
     }
     return biggest;
 }
@@ -241,60 +243,98 @@ Win32MakefileGenerator::findLibraries(const QString &where)
 
     QStringList &l = project->variables()[where];
     QPtrList<MakefileDependDir> dirs;
+    {
+	QStringList &libpaths = project->variables()["QMAKE_LIBDIR"];
+	for(QStringList::Iterator libpathit = libpaths.begin(); libpathit != libpaths.end(); ++libpathit) {
+	    QString r = (*libpathit), l = r;
+	    fixEnvVariables(l);
+	    dirs.append(new MakefileDependDir(r.replace("\"",""), l.replace("\"","")));
+	}
+    }
     dirs.setAutoDelete(TRUE);
     for(QStringList::Iterator it = l.begin(); it != l.end(); ) {
-	QString opt = (*it);
-        bool remove = FALSE;
-        if(opt.startsWith("-L") || opt.startsWith("/L")) {
-            QString r = opt.right(opt.length() - 2), l = Option::fixPathToLocalOS(r);
+	QChar quote;
+	bool modified_opt = FALSE, remove = FALSE;
+	QString opt = (*it).stripWhiteSpace();
+	if((opt[0] == '\'' || opt[0] == '"') && opt[(int)opt.length()-1] == opt[0]) {
+	    quote = opt[0];
+	    opt = opt.mid(1, opt.length()-2);
+	}
+	if(opt.startsWith("/LIBPATH:")) {
+            QString r = opt.mid(9), l = Option::fixPathToLocalOS(r);
+            dirs.append(new MakefileDependDir(r.replace("\"",""),
+                                              l.replace("\"","")));
+        } else if(opt.startsWith("-L") || opt.startsWith("/L")) {
+            QString r = opt.mid(2), l = Option::fixPathToLocalOS(r);
             dirs.append(new MakefileDependDir(r.replace("\"",""),
                                               l.replace("\"","")));
-            remove = TRUE;
+            remove = TRUE; //we eat this switch
         } else if(opt.startsWith("-l") || opt.startsWith("/l")) {
             QString lib = opt.right(opt.length() - 2), out;
             if(!lib.isEmpty()) {
                 for(MakefileDependDir *mdd = dirs.first(); mdd; mdd = dirs.next() ) {
+		    QString extension;
                     int ver = findHighestVersion(mdd->local_dir, lib);
 		    if(ver > 0)
-			lib += QString::number(ver);
-		    lib += ".lib";
-		    if(QFile::exists(mdd->local_dir + Option::dir_sep + lib)) {
-			out = mdd->real_dir + Option::dir_sep + lib;
+			extension += QString::number(ver);
+		    extension += ".lib";
+		    if(QFile::exists(mdd->local_dir + Option::dir_sep + lib + Option::prl_ext) ||
+		       QFile::exists(mdd->local_dir + Option::dir_sep + lib + extension)) {
+			out = mdd->real_dir + Option::dir_sep + lib + extension;
 			break;
 		    }
                 }
             }
-            if(out.isEmpty())
-                remove = TRUE;
-            else
+            if(out.isEmpty()) {
+                remove = TRUE; //just eat it since we cannot find one..
+            } else {
+		modified_opt = TRUE;
                 (*it) = out;
+	    }
         } else if(!QFile::exists(Option::fixPathToLocalOS(opt))) {
-	    QString dir, file = opt;
+	    QPtrList<MakefileDependDir> lib_dirs;
+	    QString file = opt;
             int slsh = file.findRev(Option::dir_sep);
             if(slsh != -1) {
-                dir = file.left(slsh+1);
+                QString r = file.left(slsh+1), l = r;
+		fixEnvVariables(l);
+		lib_dirs.append(new MakefileDependDir(r.replace("\"",""), l.replace("\"","")));
                 file = file.right(file.length() - slsh - 1);
-            }
-	    if ( !(project->variables()["QMAKE_QT_DLL"].isEmpty() && (file == "qt.lib" || file == "qt-mt.lib")) ) {
-		if(file.endsWith(".lib")) {
-		    file = file.left(file.length() - 4);
-		    if(!file.at(file.length()-1).isNumber()) {
-			int ver = findHighestVersion(dir, file);
+            } else {
+		lib_dirs = dirs;
+	    }
+	    if(file.endsWith(".lib")) {
+		file = file.left(file.length() - 4);
+		if(!file.at(file.length()-1).isNumber()) {
+		    for(MakefileDependDir *mdd = lib_dirs.first(); mdd; mdd = lib_dirs.next() ) {
+			QString lib_tmpl(file + "%1" + ".lib");
+			int ver = findHighestVersion(mdd->local_dir, file);
 			if(ver != -1) {
-			    file = QString(dir + file + "%1" + ".lib");
 			    if(ver)
-				(*it) = file.arg(ver);
+				lib_tmpl = lib_tmpl.arg(ver);
 			    else
-				(*it) = file.arg("");
+				lib_tmpl = lib_tmpl.arg("");
+			    if(slsh != -1) {
+				QString dir = mdd->real_dir;
+				if(!dir.endsWith(Option::dir_sep))
+				    dir += Option::dir_sep;
+				lib_tmpl.prepend(dir);
+			    }
+			    modified_opt = TRUE;
+			    (*it) = lib_tmpl;
+			    break;
 			}
 		    }
 		}
 	    }
         }
-        if(remove)
+        if(remove) {
             it = l.remove(it);
-        else
+        } else {
+	    if(!quote.isNull() && modified_opt)
+		(*it) = quote + (*it) + quote;
             ++it;
+	}
     }
     return TRUE;
 }
@@ -323,8 +363,8 @@ Win32MakefileGenerator::processPrlFiles()
 	QStringList &l = project->variables()[where];
 	for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
 	    QString opt = (*it);
-	    if(opt.left(1) == "/") {
-		if(opt.left(9) == "/LIBPATH:") {
+	    if(opt.startsWith("/")) {
+		if(opt.startsWith("/LIBPATH:")) {
 		    QString r = opt.mid(9), l = r;
 		    fixEnvVariables(l);
 		    libdirs.append(new MakefileDependDir(r.replace("\"",""),