update qmake to 1.05a

111 files changed, 4259 insertions, 1883 deletions

diff --git a/qmake/Makefile b/qmake/Makefile
index 90b0f07..01bb1a1 100644
--- a/qmake/Makefile
+++ b/qmake/Makefile
@@ -10,3 +10,3 @@ CXX		= g++
 OBJS=project.o main.o makefile.o unixmake2.o unixmake.o borland_bmake.o \
-     msvc_nmake.o msvc_dsp.o msvc_vcproj.o option.o winmakefile.o \
+     mingw_make.o msvc_nmake.o msvc_dsp.o msvc_vcproj.o option.o winmakefile.o \
      projectgenerator.o metrowerks_xml.o  pbuilder_pbx.o msvc_objectmodel.o
@@ -16,3 +16,3 @@ QOBJS=qstring.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o \
       qdatastream.o qgarray.o qbuffer.o qglist.o qptrcollection.o qfile.o \
-      qfile_unix.o qregexp.o qgvector.o qgcache.o qbitarray.o qdir.o \
+      qfile_unix.o qregexp.o qgvector.o qgcache.o qbitarray.o qdir.o quuid.o \
       qfileinfo_unix.o qdir_unix.o qfileinfo.o qdatetime.o qstringlist.o qmap.o \
@@ -100,2 +100,5 @@ qdir.o: $(OPIEDIR)/qmake/tools/qdir.cpp
 
+quuid.o: $(OPIEDIR)/qmake/tools/quuid.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/quuid.cpp
+
 qfileinfo_unix.o: $(OPIEDIR)/qmake/tools/qfileinfo_unix.cpp
@@ -145,2 +148,5 @@ borland_bmake.o: generators/win32/borland_bmake.cpp
 
+mingw_make.o: generators/win32/mingw_make.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) generators/win32/mingw_make.cpp
+
 msvc_objectmodel.o: generators/win32/msvc_objectmodel.cpp
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
@@ -7,3 +7,3 @@
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
@@ -61,4 +61,18 @@
 
+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;
@@ -79,4 +93,4 @@ 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)
@@ -90,3 +104,3 @@ static char *gimme_buffer(off_t s)
     if(!big_buffer || big_buffer_size < s)
- 	big_buffer = (char *)realloc(big_buffer, s);
+	big_buffer = (char *)realloc(big_buffer, s);
     return big_buffer;
@@ -95,3 +109,3 @@ static char *gimme_buffer(off_t s)
 bool
-MakefileGenerator::generateMocList(QString fn_target)
+MakefileGenerator::generateMocList(const QString &fn_target)
 {
@@ -175,3 +189,4 @@ MakefileGenerator::generateMocList(QString fn_target)
 		*(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);
 
@@ -187,3 +202,4 @@ MakefileGenerator::generateMocList(QString fn_target)
 		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))))
@@ -193,6 +209,6 @@ MakefileGenerator::generateMocList(QString fn_target)
 		    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))) {
@@ -227,9 +243,8 @@ 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);
@@ -290,4 +305,6 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
 		    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');
@@ -330,3 +347,3 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
 	    while(x < total_size_read &&
-		  (*(big_buffer+x) == ' ' || *(big_buffer+x) == '\t')) 
+		  (*(big_buffer+x) == ' ' || *(big_buffer+x) == '\t'))
 		x++;
@@ -344,3 +361,3 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
 		    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)) {
@@ -371,3 +388,3 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
 				QString cpp = fn.left(fn.length() - Option::ui_ext.length()) +
-					              Option::cpp_ext.first();
+						      Option::cpp_ext.first();
 				outdeps = &findDependencies(cpp);
@@ -385,2 +402,3 @@ 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(),
@@ -406,2 +424,3 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
 		fqn = fndir + inc;
+		goto handle_fqn;
 	    } else {
@@ -417,3 +436,3 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
 			    fqn = mdd->real_dir + QDir::separator() + inc;
-			    break;
+			    goto handle_fqn;
 			}
@@ -422,3 +441,3 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
 	    }
-	    if(fqn.isEmpty()) {
+	    if(fqn.isEmpty() && Option::mkfile::do_dep_heuristics) {
 		//these are some hacky heuristics it will try to do on an include
@@ -427,3 +446,3 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
 		//and see if they go away..
-		if(Option::mkfile::do_dep_heuristics && depHeuristics.contains(inc)) {
+		if(depHeuristics.contains(inc)) {
 		    fqn = depHeuristics[inc];
@@ -449,3 +468,26 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
 				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;
+				}
 			    }
@@ -453,3 +495,3 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
 		    }
-		    if(fqn.isEmpty()) { //is it from a .y?
+		    { //is it from a .y?
 			QString rhs = Option::yacc_mod + Option::h_ext.first();
@@ -469,3 +511,30 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
 				    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;
 				}
@@ -476,8 +545,10 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
 		}
-		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)
@@ -499,3 +570,3 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
     }
-    debug_msg(2, "Dependancies: %s -> %s", fn.latin1(), fndeps.join(" :: ").latin1());
+    debug_msg(2, "Dependencies: %s -> %s", fn.latin1(), fndeps.join(" :: ").latin1());
     return TRUE;
@@ -615,3 +686,7 @@ MakefileGenerator::init()
     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 ||
@@ -630,3 +705,3 @@ MakefileGenerator::init()
 	    }
-	    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")) {
@@ -685,3 +760,3 @@ 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());
@@ -745,2 +820,3 @@ MakefileGenerator::init()
 			QString file = Option::fixPathToLocalOS((*val_it));
+			QStringList file_list(file);
 			if(!QFile::exists(file)) {
@@ -771,3 +847,3 @@ MakefileGenerator::init()
 				    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);
@@ -784,5 +860,10 @@ MakefileGenerator::init()
 				    } 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]);
+					}
 				    }
@@ -797,35 +878,39 @@ 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));
 			}
@@ -855,7 +940,8 @@ MakefileGenerator::init()
 			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;
 			    }
@@ -948,6 +1034,7 @@ MakefileGenerator::init()
     {
+	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"];
@@ -962,5 +1049,5 @@ MakefileGenerator::init()
 		    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 {
@@ -968,3 +1055,4 @@ MakefileGenerator::init()
 		    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();
@@ -972,5 +1060,5 @@ MakefileGenerator::init()
 			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);
 		}
@@ -985,3 +1073,17 @@ MakefileGenerator::init()
 	    }
-	    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();
@@ -1032,5 +1134,5 @@ MakefileGenerator::init()
     }
-
-    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));
 
@@ -1068,3 +1170,3 @@ MakefileGenerator::processPrlFile(QString &file)
     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")) {
@@ -1106,3 +1208,3 @@ MakefileGenerator::processPrlFile(QString &file)
 	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());
@@ -1198,2 +1300,4 @@ MakefileGenerator::writePrlFile(QTextStream &t)
 	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")) {
@@ -1230,4 +1334,3 @@ MakefileGenerator::write()
 	    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);
@@ -1242,3 +1345,3 @@ 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();
@@ -1304,3 +1407,3 @@ MakefileGenerator::writeObj(QTextStream &t, const QString &obj, const QString &s
 	}
-	if (!use_implicit_rule) {
+	if (!use_implicit_rule && !project->isEmpty(comp)) {
 	    QString p = var(comp);
@@ -1322,16 +1425,32 @@ MakefileGenerator::writeUicSrc(QTextStream &t, const QString &ui)
 	{
-	    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);
 	}
@@ -1372,3 +1491,3 @@ MakefileGenerator::writeMocObj(QTextStream &t, const QString &obj, const QString
 	}
-	if (!use_implicit_rule) {
+	if (!use_implicit_rule && !project->isEmpty("QMAKE_RUN_CXX")) {
 	    QString p = var("QMAKE_RUN_CXX");
@@ -1415,5 +1534,9 @@ MakefileGenerator::writeYaccSrc(QTextStream &t, const QString &src)
 	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();
@@ -1425,3 +1548,3 @@ MakefileGenerator::writeYaccSrc(QTextStream &t, const QString &src)
 	    yaccflags += " -p " + mangle;
-	} 
+	}
 	QString out_h = default_out_h, out_c = default_out_c;
@@ -1454,3 +1577,6 @@ MakefileGenerator::writeLexSrc(QTextStream &t, const QString &src)
 	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)
@@ -1465,3 +1591,3 @@ MakefileGenerator::writeLexSrc(QTextStream &t, const QString &src)
 	QString out_c = default_out_c;
-	if(!stub.isEmpty()) 
+	if(!stub.isEmpty())
 	    out_c.replace(stringBase, stub);
@@ -1496,3 +1622,3 @@ MakefileGenerator::writeImageObj(QTextStream &t, const QString &obj)
 	}
-	if(!use_implicit_rule) {
+	if(!use_implicit_rule && !project->isEmpty("QMAKE_RUN_CXX")) {
 	    QString p = var("QMAKE_RUN_CXX");
@@ -1543,19 +1669,22 @@ 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;
@@ -1563,25 +1692,32 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs)
 		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++) {
@@ -1590,13 +1726,24 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs)
 			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)
@@ -1605,5 +1752,13 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs)
 	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) + " ";
@@ -1611,4 +1766,4 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs)
 		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) + " ";
@@ -1789,3 +1944,3 @@ MakefileGenerator::writeHeader(QTextStream &t)
     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;
@@ -1804,3 +1959,3 @@ 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")) {
@@ -1848,5 +2003,11 @@ MakefileGenerator::fileFixify(const QString& file0, const QString &out_d, 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;
@@ -1892,2 +2053,8 @@ MakefileGenerator::fileFixify(const QString& file0, const QString &out_d, const
 	    }
+	    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;
 	}
@@ -1901,2 +2068,7 @@ MakefileGenerator::fileFixify(const QString& file0, const QString &out_d, const
 	    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);
@@ -1931,2 +2103,4 @@ MakefileGenerator::fileFixify(const QString& file0, const QString &out_d, const
     file = Option::fixPathToTargetOS(file, FALSE);
+    if(file.isEmpty())
+	file = ".";
     if(!quote.isNull())
@@ -1934,2 +2108,3 @@ MakefileGenerator::fileFixify(const QString& file0, const QString &out_d, const
     debug_msg(3, "Fixed %s :: to :: %s (%d)", orig_file.latin1(), file.latin1(), depth);
+    ((MakefileGenerator*)this)->fileFixed.insert(key, file);
     return file;
@@ -2041,4 +2216,5 @@ MakefileGenerator::openOutput(QFile &file) const
 #include "unixmake.h"
-#include "borland_bmake.h"
 #include "msvc_nmake.h"
+#include "borland_bmake.h"
+#include "mingw_make.h"
 #include "msvc_dsp.h"
@@ -2063,3 +2239,3 @@ MakefileGenerator::create(QMakeProject *proj)
     } else if(gen == "MSVC") {
-    	// Visual Studio =< v6.0
+	// Visual Studio =< v6.0
 	if(proj->first("TEMPLATE").find(QRegExp("^vc.*")) != -1)
@@ -2069,3 +2245,3 @@ MakefileGenerator::create(QMakeProject *proj)
     } else if(gen == "MSVC.NET") {
-    	// Visual Studio >= v7.0
+	// Visual Studio >= v7.0
 	if(proj->first("TEMPLATE").find(QRegExp("^vc.*")) != -1)
@@ -2076,2 +2252,4 @@ MakefileGenerator::create(QMakeProject *proj)
 	mkfile = new BorlandMakefileGenerator(proj);
+    } else if(gen == "MINGW") {
+	mkfile = new MingwMakefileGenerator(proj);
     } else if(gen == "METROWERKS") {
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
@@ -7,3 +7,3 @@
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
@@ -49,3 +49,3 @@ class MakefileGenerator
     QString build_args();
-    QMap<QString, QString> depHeuristics, depKeyMap;
+    QMap<QString, QString> depHeuristics, depKeyMap, fileFixed;
     QMap<QString, QString> mocablesToMOC, mocablesFromMOC;
@@ -70,6 +70,6 @@ protected:
     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);
 
@@ -79,3 +79,3 @@ protected:
     QString cleanFilePath(const QString &file) const;
-    bool generateMocList(QString fn);
+    bool generateMocList(const QString &fn);
 
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
@@ -44,2 +44,18 @@
 
+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;
+}
+
+
 
@@ -69,17 +85,9 @@ ProjectGenerator::init()
     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());
+	}
 
@@ -142,5 +150,4 @@ ProjectGenerator::init()
 		QFileInfo fi(dir);
-		if(fi.absFilePath() != QDir::currentDirPath()) {
+		if(fi.absFilePath() != QDir::currentDirPath()) 
 		    v["DEPENDPATH"] += fileFixify(dir);
-		}
 	    }
@@ -243,4 +250,10 @@ ProjectGenerator::init()
 		    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)
@@ -248,3 +261,4 @@ ProjectGenerator::init()
 			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))) {
@@ -262,3 +276,4 @@ ProjectGenerator::init()
 				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)) {
@@ -266,3 +281,4 @@ ProjectGenerator::init()
 				    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()) {
@@ -339,3 +355,4 @@ ProjectGenerator::writeMakefile(QTextStream &t)
 	  << getWritableVar("CONFIG_REMOVE", FALSE)
-	  << getWritableVar("DEPENDPATH") << endl;
+	  << getWritableVar("DEPENDPATH")
+	  << getWritableVar("INCLUDEPATH") << endl;
 
@@ -346,3 +363,4 @@ ProjectGenerator::writeMakefile(QTextStream &t)
 	  << getWritableVar("YACCSOURCES") 
-	  << getWritableVar("SOURCES");
+	  << getWritableVar("SOURCES")
+	  << getWritableVar("TRANSLATIONS");
     }
@@ -405,2 +423,4 @@ ProjectGenerator::addFile(QString file)
 	    where = "YACCSOURCES";
+	else if(file.endsWith(".ts"))
+	    where = "TRANSLATIONS";
     }
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
@@ -7,3 +7,3 @@
 **
-** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
 **
@@ -74,7 +74,6 @@ 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" );
 	}
@@ -85,3 +84,3 @@ UnixMakefileGenerator::init()
 	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")) {
@@ -140,3 +139,3 @@ UnixMakefileGenerator::init()
 	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"), "");
@@ -168,3 +167,3 @@ UnixMakefileGenerator::init()
 		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"), "");
@@ -178,17 +177,5 @@ UnixMakefileGenerator::init()
     }
-    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", "");
@@ -201,6 +188,2 @@ UnixMakefileGenerator::init()
 	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") )
@@ -212,2 +195,18 @@ UnixMakefileGenerator::init()
     }
+    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") )
@@ -342,3 +341,3 @@ UnixMakefileGenerator::uniqueSetLFlags(const QStringList &list1, QStringList &li
 	    unique = (list2.findIndex((*it)) == -1);
-	} 
+	}
 	if(unique)
@@ -353,3 +352,3 @@ UnixMakefileGenerator::processPrlVariable(const QString &var, const QStringList
 {
-    if(var == "QMAKE_PRL_LIBS") 
+    if(var == "QMAKE_PRL_LIBS")
 	project->variables()["QMAKE_CURRENT_PRL_LIBS"] += uniqueSetLFlags(l, project->variables()["QMAKE_LIBS"]);
@@ -359,2 +358,86 @@ UnixMakefileGenerator::processPrlVariable(const QString &var, const QStringList
 
+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
@@ -404,3 +487,3 @@ UnixMakefileGenerator::processPrlFiles()
 				      ".framework/" + opt + Option::prl_ext;
-			if(processPrlFile(prl)) 
+			if(processPrlFile(prl))
 			    ret = TRUE;
@@ -436,4 +519,5 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
     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);
@@ -441,3 +525,3 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
 	destdir += Option::dir_sep;
-    targetdir = "$(INSTALL_ROOT)" + Option::fixPathToTargetOS(targetdir, FALSE);
+    targetdir = fileFixify(targetdir);
     if(targetdir.right(1) != Option::dir_sep)
@@ -460,4 +544,4 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
 		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())
@@ -466,9 +550,8 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
 	}
-	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)";
 	        }
@@ -480,3 +563,3 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
 	src_targ = Option::fixPathToTargetOS(destdir + target, FALSE);
-    QString dst_targ = fileFixify(targetdir + target);
+    QString dst_targ = root + fileFixify(targetdir + target);
     if(!ret.isEmpty())
@@ -485,6 +568,8 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
 	   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
@@ -508,3 +593,3 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
 		    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 + "\"";
@@ -519,2 +604 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
 
-
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
@@ -57,2 +57,3 @@ protected:
 
+    virtual bool findLibraries();
     virtual void init();
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
@@ -81,5 +81,4 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 			   (!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 );
 
@@ -110,3 +109,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
     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;
 
@@ -138,3 +144,4 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
     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;
@@ -214,4 +221,3 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	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;
@@ -223,7 +229,3 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	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;
@@ -232,2 +234,5 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	    t << "TARGET2	= " << var("TARGET_x.y") << endl;
+	} else {
+	    t << "TARGETD	= " << var("TARGET_x") << endl;
+	    t << "TARGET0	= " << var("TARGET_") << endl;
 	}
@@ -263,3 +268,3 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	    odir = project->first("OBJECTS_DIR");
-	t << "###### Dependancies" << endl << endl;
+	t << "###### Dependencies" << endl << endl;
 	t << odir << ".deps/%.d: %.cpp\n\t"
@@ -388,3 +393,4 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	    //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())
@@ -401,3 +407,4 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 
-	    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())
@@ -462,4 +469,4 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	    //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 {
@@ -467,4 +474,4 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 		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");
 	}
@@ -485,16 +492,3 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &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"
@@ -515,2 +509,15 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	    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;
 	}
@@ -520,6 +527,6 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	    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"
@@ -533,3 +540,3 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
     } 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"
@@ -537,3 +544,4 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	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")) {
@@ -548,3 +556,3 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 		t << "\t" << "$(RANLIB) $(TARGET)" << "\n";
-	    if(!project->isEmpty("DESTDIR"))
+	    if(!project->isEmpty("DESTDIR")) 
 		t << "\t" << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET)" << "\n"
@@ -552,3 +560,3 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	} 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"],
@@ -556,6 +564,6 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	    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);
@@ -563,6 +571,6 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 		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(" "));
@@ -582,3 +590,3 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 		    t << "\t" << "$(RANLIB) " << (*libit) << "\n";
-		if(!project->isEmpty("DESTDIR"))
+		if(!project->isEmpty("DESTDIR")) 
 		    t << "\t" << "-$(DEL_FILE) " << var("DESTDIR") << (*libit) << "\n"
@@ -594,3 +602,3 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	//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.
@@ -599,3 +607,3 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	fixEnvVariables(moc);
-	if(target != moc)
+	if(target != moc) 
 	    t << "$(MOC): \n\t"
@@ -645,3 +653,3 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	    QString ui_h = fileFixify((*formit) + Option::h_ext.first());
-	    if(QFile::exists(ui_h) )
+	    if(QFile::exists(ui_h) ) 
 	       ui_headers << ui_h;
@@ -655,3 +663,3 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
       << "$(MOVE) `dirname " << ddir_c << "`" << Option::dir_sep << var("QMAKE_ORIG_TARGET") << ".tar.gz . && "
-      << "$(DEL_DIR) " << ddir_c
+      << "$(DEL_FILE) -r " << ddir_c
       << endl << endl;
@@ -679,2 +687,41 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 
+    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) {
@@ -712,4 +759,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	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() &&
@@ -808,3 +859,3 @@ UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
     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;
@@ -837,3 +888,3 @@ UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
 	    ++it;
-	    if (it.current())
+	    if (it.current()) 
 		t << it.current()->target << ": " << tar << endl;
@@ -846,3 +897,3 @@ UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
     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 {
@@ -860,3 +911,3 @@ UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
 		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";
@@ -864,3 +915,3 @@ UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
 	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) {
@@ -908,2 +959,4 @@ void UnixMakefileGenerator::init2()
 	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") ) {
@@ -919,3 +972,2 @@ void UnixMakefileGenerator::init2()
 	    project->variables()["QMAKE_AR_CMD"].append("$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)");
-	QString os = project->variables()["QMAKESPEC"].first().section( '-', 0, 0 );
 	if( project->isActiveConfig("plugin") ) {
@@ -925,3 +977,3 @@ void UnixMakefileGenerator::init2()
 		project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
-							project->first("VER_MAJ") + "." +
+							project->first("VER_MAJ") + "." + 
 							project->first("QMAKE_EXTENSION_SHLIB"));
@@ -935,12 +987,12 @@ void UnixMakefileGenerator::init2()
 		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");
@@ -1013,4 +1065,11 @@ void UnixMakefileGenerator::init2()
 	    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() )
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
@@ -134,2 +134,4 @@ BorlandMakefileGenerator::writeBorlandParts(QTextStream &t)
     t << "MOVE  =       " << var("QMAKE_MOVE") << endl;
+    t << "CHK_DIR_EXISTS =	" << var("QMAKE_CHK_DIR_EXISTS") << endl;
+    t << "MKDIR		=	" << var("QMAKE_MKDIR") << endl;
     t << endl;
@@ -152,7 +154,10 @@ BorlandMakefileGenerator::writeBorlandParts(QTextStream &t)
     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;
 
@@ -160,3 +165,4 @@ BorlandMakefileGenerator::writeBorlandParts(QTextStream &t)
     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()) {
@@ -171,2 +177,6 @@ BorlandMakefileGenerator::writeBorlandParts(QTextStream &t)
     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()) {
@@ -215,3 +225,2 @@ BorlandMakefileGenerator::writeBorlandParts(QTextStream &t)
       << varGlue("UICIMPLS" ,"\n\t-del ","\n\t-del ","")
-      << "\n\t-del $(TARGET)"
       << varGlue("QMAKE_CLEAN","\n\t-del ","\n\t-del ","")
@@ -222,4 +231,2 @@ BorlandMakefileGenerator::writeBorlandParts(QTextStream &t)
     }
-    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"))
@@ -246,2 +253,6 @@ BorlandMakefileGenerator::writeBorlandParts(QTextStream &t)
     t << endl << endl;
+
+    t << "distclean: clean"
+      << "\n\t-del $(TARGET)"
+      << endl << endl;
 }
@@ -366,3 +377,3 @@ BorlandMakefileGenerator::init()
 		if ( hver == -1 )
-		    hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt-mt");
+		    hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qtmt");
 		if(hver != -1) {
@@ -428,2 +439,24 @@ BorlandMakefileGenerator::init()
     }
+    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") ) {
@@ -454,3 +487,3 @@ BorlandMakefileGenerator::init()
 	project->variables()["RES_FILE"].first().replace(".rc",".res");
-	project->variables()["TARGETDEPS"] += project->variables()["RES_FILE"];
+	project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"];
     }
@@ -476,2 +509 @@ BorlandMakefileGenerator::init()
 }
-
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
@@ -7,3 +7,3 @@
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
@@ -36,4 +36,4 @@
 **********************************************************************/
-#ifndef __BORLANDMAKE_H__
-#define __BORLANDMAKE_H__
+#ifndef __BORLAND_BMAKE_H__
+#define __BORLAND_BMAKE_H__
 
@@ -57,3 +57,2 @@ 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
@@ -510,2 +510,26 @@ DspMakefileGenerator::init()
 
+    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 */
@@ -570,3 +594,3 @@ DspMakefileGenerator::init()
 	} else {
-	    if(project->isActiveConfig("thread"))
+	    if( thread )
 		project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"];
@@ -580,3 +604,3 @@ DspMakefileGenerator::init()
 		    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"];
@@ -624,3 +648,3 @@ DspMakefileGenerator::init()
     }
-    if ( project->isActiveConfig("thread") ) {
+    if ( thread ) {
 	if(project->isActiveConfig("qt"))
@@ -734,2 +758,3 @@ DspMakefileGenerator::init()
 
+    processPrlFiles();
     QStringList &libs = project->variables()["QMAKE_LIBS"];
@@ -756,2 +781,14 @@ 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() ) {
@@ -772,16 +809,9 @@ DspMakefileGenerator::init()
 	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") ) {
@@ -797,35 +827,30 @@ DspMakefileGenerator::init()
 	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);
 	}
@@ -833,2 +858,19 @@ DspMakefileGenerator::init()
     }
+
+    
+    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() ) {
@@ -846,3 +888,3 @@ DspMakefileGenerator::init()
 QString
-DspMakefileGenerator::findTemplate(QString file)
+DspMakefileGenerator::findTemplate(const QString &file)
 {
@@ -873,8 +915,8 @@ 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;
 
@@ -885,3 +927,3 @@ DspMakefileGenerator::beginGroupForFile(QString file, QTextStream &t,
     if(file == currentGroup)
-	return 0;
+	return;
 
@@ -889,3 +931,3 @@ DspMakefileGenerator::beginGroupForFile(QString file, QTextStream &t,
 	endGroups(t);
-	return 0;
+	return;
     }
@@ -893,17 +935,19 @@ DspMakefileGenerator::beginGroupForFile(QString file, QTextStream &t,
 	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;
 }
@@ -911,3 +955,3 @@ DspMakefileGenerator::beginGroupForFile(QString file, QTextStream &t,
 
-int
+void
 DspMakefileGenerator::endGroups(QTextStream &t)
@@ -915,5 +959,5 @@ DspMakefileGenerator::endGroups(QTextStream &t)
     if(project->isActiveConfig("flat"))
-	return 0;
+	return;
     else if(currentGroup.isEmpty())
-	return 0;
+	return;
 
@@ -924,3 +968,2 @@ DspMakefileGenerator::endGroups(QTextStream &t)
     currentGroup = "";
-    return dirs.count();
 }
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
@@ -7,3 +7,3 @@
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
@@ -36,4 +36,4 @@
 **********************************************************************/
-#ifndef __DSPMAKE_H__
-#define __DSPMAKE_H__
+#ifndef __MSVC_DSP_H__
+#define __MSVC_DSP_H__
 
@@ -45,4 +45,4 @@ 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 &);
 
@@ -52,3 +52,3 @@ class DspMakefileGenerator : public Win32MakefileGenerator
     bool writeMakefile(QTextStream &);
-    QString findTemplate(QString file);
+    QString findTemplate(const QString &file);
     void init();
@@ -72,2 +72,2 @@ inline bool DspMakefileGenerator::findLibraries()
 
-#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
@@ -7,3 +7,3 @@
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
@@ -40,2 +40,3 @@
 #include <qregexp.h>
+#include <qdict.h>
 #include <qdir.h>
@@ -137,2 +138,4 @@ NmakeMakefileGenerator::writeNmakeParts(QTextStream &t)
     t << "MOVE		=       " << var("QMAKE_MOVE") << endl;
+    t << "CHK_DIR_EXISTS =	" << var("QMAKE_CHK_DIR_EXISTS") << endl;
+    t << "MKDIR		=	" << var("QMAKE_MKDIR") << endl;
     t << endl;
@@ -158,7 +161,47 @@ NmakeMakefileGenerator::writeNmakeParts(QTextStream &t)
     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;
+    }
 
@@ -166,3 +209,4 @@ NmakeMakefileGenerator::writeNmakeParts(QTextStream &t)
     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()) {
@@ -175,2 +219,4 @@ NmakeMakefileGenerator::writeNmakeParts(QTextStream &t)
     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()) {
@@ -222,2 +268,3 @@ NmakeMakefileGenerator::writeNmakeParts(QTextStream &t)
       << varGlue("CLEAN_FILES","\n\t-del ","\n\t-del ","");
+    
     if ( project->isActiveConfig("activeqt")) {
@@ -248,2 +295,6 @@ NmakeMakefileGenerator::writeNmakeParts(QTextStream &t)
     t << endl << endl;
+
+    t << "distclean: clean"
+      << "\n\t-del $(TARGET)"
+      << endl << endl;
 }
@@ -433,2 +484,24 @@ NmakeMakefileGenerator::init()
     }
+    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"];
+    }
+
 
@@ -467,3 +540,3 @@ NmakeMakefileGenerator::init()
 	project->variables()["RES_FILE"].first().replace(".rc",".res");
-	project->variables()["TARGETDEPS"] += project->variables()["RES_FILE"];
+	project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"];
     }
@@ -478,9 +551,10 @@ NmakeMakefileGenerator::init()
     }
+
+    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
@@ -7,3 +7,3 @@
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
@@ -36,4 +36,4 @@
 **********************************************************************/
-#ifndef __NMAKEMAKE_H__
-#define __NMAKEMAKE_H__
+#ifndef __MSVC_NMAKE_H__
+#define __MSVC_NMAKE_H__
 
@@ -58,2 +58,2 @@ 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
@@ -256,23 +256,23 @@ 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;
@@ -385,3 +385,3 @@ QTextStream &operator<<( QTextStream &strm, const VCCLCompilerTool &tool )
     strm << XPair( _AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories );
-    strm << XPair( _AdditionalOptions, tool.AdditionalOptions );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
     strm << XPair( _AdditionalUsingDirectories, tool.AdditionalUsingDirectories );
@@ -444,3 +444,3 @@ QTextStream &operator<<( QTextStream &strm, const VCCLCompilerTool &tool )
     strm << EPair( _WarningLevel, tool.WarningLevel );
-    strm << TPair( _WholeProgramOptimization, tool.WholeProgramOptimization ); 
+    strm << TPair( _WholeProgramOptimization, tool.WholeProgramOptimization );
     strm << "/>";
@@ -452,3 +452,3 @@ bool VCCLCompilerTool::parseOption( const char* option )
     // skip index 0 ('/' or '-')
-    char first  = option[1]; 
+    char first  = option[1];
     char second = option[2];
@@ -456,2 +456,3 @@ bool VCCLCompilerTool::parseOption( const char* option )
     char fourth = option[4];
+    bool found = TRUE;
 
@@ -461,13 +462,16 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	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;
@@ -489,3 +493,3 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    }
-	    return FALSE;
+	    found = FALSE; break;
 	}
@@ -546,3 +550,3 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    default:
-		return FALSE;
+		found = FALSE; break;
 	    }
@@ -555,3 +559,3 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    qWarning( "Option '/G3' and '/G4' were phased out in Visual C++ 5.0" );
-	    return FALSE;
+	    found = FALSE; break;
         case '5':
@@ -621,3 +625,3 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	default:
-	    return FALSE;
+	    found = FALSE; break;
 	}
@@ -635,3 +639,3 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	}
-	return FALSE;
+	found = FALSE; break;
     case 'M':
@@ -653,3 +657,3 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	}
-	return FALSE;
+	found = FALSE; break;
     case 'O':
@@ -673,3 +677,3 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    else
-		return FALSE;
+		found = FALSE;
 	    break;
@@ -707,3 +711,3 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	default:
-	    return FALSE;
+	    found = FALSE; break;
 	}
@@ -718,3 +722,3 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	}
-	return FALSE;
+	found = FALSE; break;
     case 'R':
@@ -730,3 +734,3 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    else
-		return FALSE;
+		found = FALSE; break;
 	}
@@ -740,3 +744,3 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    qWarning( "Generator: Options '/Tp<filename>' and '/Tc<filename>' are not supported by qmake" );
-	    return FALSE;
+	    found = FALSE; break;
 	}
@@ -780,3 +784,3 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	default:
-	    return FALSE;
+	    found = FALSE; break;
 	}
@@ -809,3 +813,3 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	default:
-	    return FALSE;
+	    found = FALSE; break;
 	}
@@ -842,5 +846,5 @@ bool VCCLCompilerTool::parseOption( const char* option )
 		else
-		    return FALSE;
+		    found = FALSE;
 	    } else {
-		return FALSE;
+		found = FALSE; break;
 	    }
@@ -871,3 +875,3 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	    default:
-		return FALSE;
+		found = FALSE; break;
 	    }
@@ -875,3 +879,3 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	default:
-	    return FALSE;
+	    found = FALSE; break;
 	}
@@ -889,3 +893,3 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	} else {
-	    return FALSE;
+	    found = FALSE; break;
 	}
@@ -893,4 +897,5 @@ bool VCCLCompilerTool::parseOption( const char* option )
     case 'd':
-	if ( second != 'r' )
-	    return FALSE;
+	if ( second != 'r' ) {
+	    found = FALSE; break;
+	}
         CompileAsManaged = managedAssembly;
@@ -906,3 +911,3 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	}
-	return FALSE;
+	found = FALSE; break;
     case 's':
@@ -912,3 +917,3 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	}
-	return FALSE;
+	found = FALSE; break;
     case 'u':
@@ -921,3 +926,3 @@ bool VCCLCompilerTool::parseOption( const char* option )
 	}
-	return FALSE;
+	found = FALSE; break;
     case 'w':
@@ -935,4 +940,6 @@ bool VCCLCompilerTool::parseOption( const char* option )
     default:
-	return FALSE;
+	found = FALSE; break;
     }
+    if( !found )
+	warn_msg( WarnLogic, "Could not parse Compiler option: %s", option );
     return TRUE;
@@ -982,3 +989,3 @@ QTextStream &operator<<( QTextStream &strm, const VCLinkerTool &tool )
     strm << XPair( _AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories );
-    strm << XPair( _AdditionalOptions, tool.AdditionalOptions );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
     strm << XPair( _AddModuleNamesToAssembly, tool.AddModuleNamesToAssembly );
@@ -1048,4 +1055,4 @@ static uint elfHash( const char* name )
 	k = (const uchar *) name;
-	while ( (*k) && 
-		(*k)!= ':' && 
+	while ( (*k) &&
+		(*k)!= ':' &&
 		(*k)!=',' &&
@@ -1062,2 +1069,5 @@ static uint elfHash( const char* name )
 }
+
+//#define USE_DISPLAY_HASH
+#ifdef USE_DISPLAY_HASH
 static void displayHash( const char* str )
@@ -1066,2 +1076,3 @@ static void displayHash( const char* str )
 }
+#endif
 
@@ -1069,34 +1080,34 @@ 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) ) {
@@ -1143,3 +1154,3 @@ bool VCLinkerTool::parseOption( const char* option )
     // case 0x003390c: // /DLL
-    // This option is not used for vcproj files 
+    // This option is not used for vcproj files
     //	break;
@@ -1194,3 +1205,3 @@ bool VCLinkerTool::parseOption( const char* option )
 	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...
@@ -1218,3 +1229,3 @@ bool VCLinkerTool::parseOption( const char* option )
 	default:
-	    return FALSE;
+	    found = FALSE;
 	}
@@ -1277,3 +1288,3 @@ bool VCLinkerTool::parseOption( const char* option )
 	    default:
-		return FALSE;
+		found = FALSE;
 	    }
@@ -1326,3 +1337,3 @@ bool VCLinkerTool::parseOption( const char* option )
 	    default:
-		return FALSE;
+		found = FALSE;
 	    }
@@ -1336,3 +1347,3 @@ bool VCLinkerTool::parseOption( const char* option )
 	else
-	    return FALSE;
+	    found = FALSE;
 	break;
@@ -1362,5 +1373,7 @@ bool VCLinkerTool::parseOption( const char* option )
     default:
-	return FALSE;
+	found = FALSE;
     }
-    return TRUE;
+    if( !found )
+	warn_msg( WarnLogic, "Could not parse Linker options: %s", option );
+    return found;
 }
@@ -1394,3 +1407,3 @@ QTextStream &operator<<( QTextStream &strm, const VCMIDLTool &tool )
     strm << XPair( _AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories );
-    strm << XPair( _AdditionalOptions, tool.AdditionalOptions );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
     strm << XPair( _CPreprocessOptions, tool.CPreprocessOptions );
@@ -1429,3 +1442,3 @@ bool VCMIDLTool::parseOption( const char* option )
 {
-#if 0
+#ifdef USE_DISPLAY_HASH
     displayHash( "/D name[=def]" ); displayHash( "/I directory-list" ); displayHash( "/Oi" );
@@ -1437,3 +1450,3 @@ bool VCMIDLTool::parseOption( const char* option )
     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" );
@@ -1447,3 +1460,3 @@ bool VCMIDLTool::parseOption( const char* option )
     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}" );
@@ -1457,2 +1470,3 @@ bool VCMIDLTool::parseOption( const char* option )
 #endif
+    bool found = TRUE;
     int offset = 0;
@@ -1492,3 +1506,3 @@ bool VCMIDLTool::parseOption( const char* option )
 	default:
-	    return FALSE;
+	    found = FALSE;
 	}
@@ -1507,3 +1521,3 @@ bool VCMIDLTool::parseOption( const char* option )
 	default:
-	    return FALSE;
+	    found = FALSE;
 	}
@@ -1538,9 +1552,9 @@ bool VCMIDLTool::parseOption( const char* option )
 	case 'r':
-	    break;
 	    ErrorCheckRefPointers = _True;
-	case 's':
 	    break;
+	case 's':
 	    ErrorCheckStubData = _True;
+	    break;
 	default:
-	    return FALSE;
+	    found = FALSE;
 	}
@@ -1649,3 +1663,3 @@ bool VCMIDLTool::parseOption( const char* option )
 	    default:
-		return FALSE;
+		found = FALSE;
 	    }
@@ -1654,2 +1668,4 @@ bool VCMIDLTool::parseOption( const char* option )
     }
+    if( !found )
+	warn_msg( WarnLogic, "Could not parse MIDL option: %s", option );
     return TRUE;
@@ -1670,3 +1686,3 @@ QTextStream &operator<<( QTextStream &strm, const VCLibrarianTool &tool )
     strm << XPair( _AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories );
-    strm << XPair( _AdditionalOptions, tool.AdditionalOptions );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
     strm << XPair( _ExportNamedFunctions, tool.ExportNamedFunctions );
@@ -1716,3 +1732,3 @@ QTextStream &operator<<( QTextStream &strm, const VCResourceCompilerTool &tool )
     strm << XPair( _AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories );
-    strm << XPair( _AdditionalOptions, tool.AdditionalOptions );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
     if ( tool.Culture != rcUseDefault )			    strm << EPair( _Culture, tool.Culture );
@@ -1853,9 +1869,30 @@ void VCFilter::generateUIC( QTextStream &strm, const QString& str ) const
     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;
@@ -1869,5 +1906,5 @@ void VCFilter::generateUIC( QTextStream &strm, const QString& str ) const
     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;
@@ -1875,3 +1912,3 @@ void VCFilter::generateUIC( QTextStream &strm, const QString& str ) const
     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 << "/>";
@@ -1908,5 +1945,5 @@ VCProject::VCProject()
 {
-    QUuid uniqueId;
 #if defined(Q_WS_WIN32)
     GUID guid;
+    QUuid uniqueId;
     HRESULT h = CoCreateGuid( &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
@@ -42,3 +42,3 @@
 /*
-    This Object model is of course VERY simplyfied, 
+    This Object model is of course VERY simplyfied,
     and does not actually follow the original MSVC
@@ -49,5 +49,5 @@
 /*
-    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...
@@ -85,3 +85,3 @@ enum browseInfoOption {
     brInfoNone,
-    brAllInfo, 
+    brAllInfo,
     brNoLocalSymbols
@@ -120,3 +120,3 @@ enum debugOption {
     debugEnabled,
-    debugEditAndContinue 
+    debugEditAndContinue
 };
@@ -126,3 +126,3 @@ enum eAppProtectionOption {
     eAppProtectMedium,
-    eAppProtectHigh 
+    eAppProtectHigh
 };
@@ -233,3 +233,3 @@ enum favorSizeOrSpeedOption {
     favorSpeed,
-    favorSize 
+    favorSize
 };
@@ -247,3 +247,3 @@ enum linkIncrementalType {
     linkIncrementalNo,
-    linkIncrementalYes 
+    linkIncrementalYes
 };
@@ -252,3 +252,3 @@ enum linkProgressOption {
     linkProgressAll,
-    linkProgressLibs 
+    linkProgressLibs
 };
@@ -266,3 +266,3 @@ enum midlErrorCheckOption {
     midlDisableAll,
-    midlEnableAll 
+    midlEnableAll
 };
@@ -286,3 +286,3 @@ enum midlWarningLevelOption {
     midlWarningLevel_3,
-    midlWarningLevel_4 
+    midlWarningLevel_4
 };
@@ -298,3 +298,3 @@ enum optimizeOption {
     optimizeFull,
-    optimizeCustom 
+    optimizeCustom
 };
@@ -314,3 +314,3 @@ enum pchOption {
     pchGenerateAuto,
-    pchUseUsingSpecific 
+    pchUseUsingSpecific
 };
@@ -319,3 +319,3 @@ enum preprocessOption {
     preprocessYes,
-    preprocessNoLineNumbers 
+    preprocessNoLineNumbers
 };
@@ -324,3 +324,3 @@ enum ProcessorOptimizeOption {
     procOptimizePentium,
-    procOptimizePentiumProAndAbove 
+    procOptimizePentiumProAndAbove
 };
@@ -329,3 +329,3 @@ enum RemoteDebuggerType {
     DbgRemote,
-    DbgRemoteTCPIP 
+    DbgRemoteTCPIP
 };
@@ -337,3 +337,3 @@ enum runtimeLibraryOption {
     rtSingleThreaded,
-    rtSingleThreadedDebug 
+    rtSingleThreadedDebug
 };
@@ -345,3 +345,3 @@ enum structMemberAlignOption {
     alignEightBytes,
-    alignSixteenBytes 
+    alignSixteenBytes
 };
@@ -368,3 +368,3 @@ enum TypeOfDebugger {
     DbgMixed,
-    DbgAuto 
+    DbgAuto
 };
@@ -373,3 +373,3 @@ enum useOfATL {
     useATLStatic,
-    useATLDynamic 
+    useATLDynamic
 };
@@ -378,3 +378,3 @@ enum useOfMfc {
     useMfcStatic,
-    useMfcDynamic 
+    useMfcDynamic
 };
@@ -392,10 +392,8 @@ protected:
     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() );
     }
@@ -411,5 +409,5 @@ public:
     VCCLCompilerTool();
-    ~VCCLCompilerTool(){};
-    virtual bool parseOption( const char* option );
-    
+    virtual ~VCCLCompilerTool(){}
+    bool parseOption( const char* option );
+
     // Variables
@@ -482,4 +480,4 @@ public:
     VCLinkerTool();
-    ~VCLinkerTool(){};
-    virtual bool parseOption( const char* option );
+    virtual ~VCLinkerTool(){}
+    bool parseOption( const char* option );
 
@@ -547,4 +545,4 @@ public:
     VCMIDLTool();
-    ~VCMIDLTool(){};
-    virtual bool parseOption( const char* option );
+    virtual ~VCMIDLTool(){}
+    bool parseOption( const char* option );
 
@@ -589,4 +587,4 @@ public:
     VCLibrarianTool();
-    ~VCLibrarianTool(){};
-    virtual bool parseOption( const char* option ){ return FALSE; };
+    virtual ~VCLibrarianTool(){}
+    bool parseOption( const char* ){ return FALSE; };
 
@@ -610,4 +608,4 @@ public:
     VCCustomBuildTool();
-    ~VCCustomBuildTool(){};
-    virtual bool parseOption( const char* option ){ return FALSE; };
+    virtual ~VCCustomBuildTool(){}
+    bool parseOption( const char* ){ return FALSE; };
 
@@ -627,4 +625,4 @@ public:
     VCResourceCompilerTool();
-    ~VCResourceCompilerTool(){};
-    virtual bool parseOption( const char* option ){ return FALSE; };
+    virtual ~VCResourceCompilerTool(){}
+    bool parseOption( const char* ){ return FALSE; };
 
@@ -647,4 +645,4 @@ protected:
     VCEventTool() : ExcludedFromBuild( unset ){};
-    ~VCEventTool(){};
-    virtual bool parseOption( const char* option ){ return FALSE; };
+    virtual ~VCEventTool(){}
+    bool parseOption( const char* ){ return FALSE; };
 
@@ -659,3 +657,3 @@ public:
 
-class VCPostBuildEventTool : public VCEventTool 
+class VCPostBuildEventTool : public VCEventTool
 {
@@ -663,6 +661,6 @@ public:
     VCPostBuildEventTool();
-    ~VCPostBuildEventTool(){};
+    ~VCPostBuildEventTool(){}
 };
 
-class VCPreBuildEventTool : public VCEventTool 
+class VCPreBuildEventTool : public VCEventTool
 {
@@ -670,6 +668,6 @@ public:
     VCPreBuildEventTool();
-    ~VCPreBuildEventTool(){};
+    ~VCPreBuildEventTool(){}
 };
 
-class VCPreLinkEventTool : public VCEventTool 
+class VCPreLinkEventTool : public VCEventTool
 {
@@ -677,3 +675,3 @@ public:
     VCPreLinkEventTool();
-    ~VCPreLinkEventTool(){};
+    ~VCPreLinkEventTool(){}
 };
@@ -685,3 +683,3 @@ public:
     VCConfiguration();
-    ~VCConfiguration(){};
+    ~VCConfiguration(){}
 
@@ -722,3 +720,3 @@ public:
     VCFilter();
-    ~VCFilter(){};
+    ~VCFilter(){}
     void generateMOC( QTextStream &strm, QString str ) const;
@@ -741,3 +739,3 @@ public:
     VCProject();
-    ~VCProject(){};
+    ~VCProject(){}
 
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
@@ -7,3 +7,3 @@
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
@@ -40,4 +40,6 @@
 #include <qdir.h>
-#include <stdlib.h>
 #include <qregexp.h>
+#include <qdict.h>
+#include <quuid.h>
+#include <stdlib.h>
 
@@ -45,4 +47,44 @@
 #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)
@@ -54,4 +96,3 @@ VcprojGenerator::VcprojGenerator(QMakeProject *p) : Win32MakefileGenerator(p), i
     Options are either a Visual Studio projectfiles, or
-    recursive projectfiles.. Maybe we can make .sln files
-    someday?
+    solutionfiles by parsing recursive projectdirectories.
 */
@@ -66,3 +107,3 @@ bool VcprojGenerator::writeMakefile(QTextStream &t)
 
-    // Generate full project file
+    // Generate project file
     if(project->first("TEMPLATE") == "vcapp" ||
@@ -72,3 +113,5 @@ bool VcprojGenerator::writeMakefile(QTextStream &t)
 	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" );
@@ -82,3 +125,5 @@ bool VcprojGenerator::writeMakefile(QTextStream &t)
 struct VcsolutionDepend {
+    QString uuid;
     QString vcprojFile, orig_target, target;
+    ::target targetType;
     QStringList dependencies;
@@ -86,2 +131,28 @@ struct VcsolutionDepend {
 
+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)
@@ -94,4 +165,18 @@ void VcprojGenerator::writeSubDirs(QTextStream &t)
 
-    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"];
@@ -118,44 +203,71 @@ void VcprojGenerator::writeSubDirs(QTextStream &t)
 			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);
@@ -164,22 +276,26 @@ void VcprojGenerator::writeSubDirs(QTextStream &t)
     }
-
-    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;
 }
@@ -308,8 +424,8 @@ void VcprojGenerator::initConfiguration()
     }
-    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");
@@ -340,3 +456,3 @@ void VcprojGenerator::initCompilerTool()
     if ( placement.isEmpty() )
-	placement = project->isActiveConfig( "release" )? ".\\Release\\":".\\Debug\\";
+	placement = ".\\";
 
@@ -364,2 +480,3 @@ void VcprojGenerator::initCompilerTool()
 	vcProject.Configuration.compiler.PreprocessorDefinitions += "QT_NO_DEBUG";
+	vcProject.Configuration.compiler.PreprocessorDefinitions += "NDEBUG";
 	if ( project->isActiveConfig("thread") ) {
@@ -377,3 +494,3 @@ void VcprojGenerator::initCompilerTool()
 	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"] );
@@ -410,9 +527,11 @@ void VcprojGenerator::initLinkerTool()
     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;
     }
@@ -461,3 +580,13 @@ void VcprojGenerator::initPreBuildEventTools()
 	//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;
@@ -469,2 +598,6 @@ 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" ) ) {
@@ -476,5 +609,7 @@ void VcprojGenerator::initPostBuildEventTools()
 	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
@@ -604,17 +739,2 @@ void VcprojGenerator::initResourceFiles()
 
-/*
-// $$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
@@ -631,2 +751,24 @@ void VcprojGenerator::initOld()
 
+    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
@@ -790,3 +932,3 @@ void VcprojGenerator::initOld()
     if(!project->isActiveConfig("incremental")) {
-	project->variables()["QMAKE_LFLAGS"].append(QString("/incremental:no"));
+	project->variables()["QMAKE_LFLAGS"].append(QString("/INCREMENTAL:no"));
         if ( is_qt )
@@ -801,2 +943,15 @@ 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++;
+	}
+    }
 
@@ -823,4 +978,4 @@ void VcprojGenerator::initOld()
 
-    // 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");
 
@@ -869,4 +1024,11 @@ void VcprojGenerator::initOld()
     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"];
@@ -885,15 +1047,14 @@ void VcprojGenerator::initOld()
     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;
     }
@@ -998,15 +1159,3 @@ bool VcprojGenerator::openOutput(QFile &file) const
     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())) );
     }
@@ -1015,2 +1164,17 @@ bool VcprojGenerator::openOutput(QFile &file) const
 
+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)
@@ -1044,5 +1208,5 @@ 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() );
     }
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
@@ -7,3 +7,3 @@
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
@@ -36,4 +36,4 @@
 **********************************************************************/
-#ifndef __VCPROJMAKE_H__
-#define __VCPROJMAKE_H__
+#ifndef __MSVC_VCPROJ_H__
+#define __MSVC_VCPROJ_H__
 
@@ -48,2 +48,3 @@ enum target {
 
+struct QUuid;
 class VcprojGenerator : public Win32MakefileGenerator
@@ -70,2 +71,3 @@ protected:
     virtual void outputVariables();
+    QString fixFilename(QString ofile) const;
     
@@ -91,20 +93,2 @@ protected:
 
-    /*
-    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;
@@ -112,2 +96,4 @@ protected:
 
+private:
+    QUuid increaseUUID(const QUuid &id);
     friend class VCFilter;
@@ -128,2 +114,2 @@ inline bool VcprojGenerator::findLibraries()
 
-#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
@@ -103,3 +103,3 @@ Win32MakefileGenerator::writeSubDirs(QTextStream &t)
     t << "SUBTARGETS	= ";
-    for( it.toFirst(); it.current(); ++it) 
+    for( it.toFirst(); it.current(); ++it)
 	t << " \\\n\t\t" << it.current()->target;
@@ -118,7 +118,6 @@ Win32MakefileGenerator::writeSubDirs(QTextStream &t)
 	    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) {
@@ -135,7 +134,6 @@ Win32MakefileGenerator::writeSubDirs(QTextStream &t)
 	    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) {
@@ -157,2 +155,3 @@ Win32MakefileGenerator::writeSubDirs(QTextStream &t)
 	    QString subdir = (*it)->directory;
+	    QString profile = (*it)->profile;
 	    int subLevels = subdir.contains(Option::dir_sep) + 1;
@@ -163,4 +162,5 @@ Win32MakefileGenerator::writeSubDirs(QTextStream &t)
 		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"
@@ -188,5 +188,3 @@ Win32MakefileGenerator::writeSubDirs(QTextStream &t)
 		    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];
@@ -194,3 +192,3 @@ Win32MakefileGenerator::writeSubDirs(QTextStream &t)
 		    t << "\n\t" << "@cd ..";
-		    for(int i = 1; i < subLevels; i++ ) 
+		    for(int i = 1; i < subLevels; i++ )
 			t << Option::dir_sep << "..";
@@ -212,13 +210,10 @@ 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);
@@ -226,8 +221,15 @@ Win32MakefileGenerator::findHighestVersion(const QString &d, const
     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());
+	}
     }
@@ -243,11 +245,28 @@ Win32MakefileGenerator::findLibraries(const QString &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")) {
@@ -256,8 +275,10 @@ Win32MakefileGenerator::findLibraries(const QString &where)
                 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;
@@ -266,24 +287,40 @@ Win32MakefileGenerator::findLibraries(const QString &where)
             }
-            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;
 			}
@@ -293,6 +330,9 @@ Win32MakefileGenerator::findLibraries(const QString &where)
         }
-        if(remove)
+        if(remove) {
             it = l.remove(it);
-        else
+        } else {
+	    if(!quote.isNull() && modified_opt)
+		(*it) = quote + (*it) + quote;
             ++it;
+	}
     }
@@ -325,4 +365,4 @@ Win32MakefileGenerator::processPrlFiles()
 	    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;
diff --git a/qmake/include/private/qapplication_p.h b/qmake/include/private/qapplication_p.h
index 6fab6b3..280992e 100644
--- a/qmake/include/private/qapplication_p.h
+++ b/qmake/include/private/qapplication_p.h
@@ -75,2 +75,4 @@ extern QClipboard *qt_clipboard;
 extern Qt::WindowsVersion qt_winver;
+#elif defined (Q_OS_MAC)
+extern Qt::MacintoshVersion qt_macver;
 #endif
@@ -83,4 +85,3 @@ extern int qt_ncols_option;
 extern void qt_dispatchEnterLeave( QWidget*, QWidget* );
-
-
+extern bool qt_tryModalHelper( QWidget *, QWidget ** = 0 );
 
diff --git a/qmake/include/private/qcom_p.h b/qmake/include/private/qcom_p.h
index 6e7e1c8..5bed8c8c 100644
--- a/qmake/include/private/qcom_p.h
+++ b/qmake/include/private/qcom_p.h
@@ -35,4 +35,4 @@
 
-#ifndef QCOM_H
-#define QCOM_H
+#ifndef QCOM_P_H
+#define QCOM_P_H
 
@@ -336,2 +336,2 @@ public:		   \
 
-#endif //QCOM_H
+#endif //QCOM_P_H
diff --git a/qmake/include/private/qcomlibrary_p.h b/qmake/include/private/qcomlibrary_p.h
index f52f679..3f440c0 100644
--- a/qmake/include/private/qcomlibrary_p.h
+++ b/qmake/include/private/qcomlibrary_p.h
@@ -35,4 +35,4 @@
 
-#ifndef QUCOMLIBRARY_H
-#define QUCOMLIBRARY_H
+#ifndef QCOMLIBRARY_P_H
+#define QCOMLIBRARY_P_H
 
@@ -78,2 +78,2 @@ private:
 
-#endif // QUCOMLIBRARY_H
+#endif
diff --git a/qmake/include/private/qcomplextext_p.h b/qmake/include/private/qcomplextext_p.h
index 2132522..c3aeeb1 100644
--- a/qmake/include/private/qcomplextext_p.h
+++ b/qmake/include/private/qcomplextext_p.h
@@ -5,5 +5,3 @@
 **
-** Created : 
-**
-** Copyright (C) 2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 2001-2002 Trolltech AS.  All rights reserved.
 **
@@ -37,4 +35,4 @@
 
-#ifndef QCOMPLEXTEXT_H
-#define QCOMPLEXTEXT_H
+#ifndef QCOMPLEXTEXT_P_H
+#define QCOMPLEXTEXT_P_H
 
diff --git a/qmake/include/private/qcomponentfactory_p.h b/qmake/include/private/qcomponentfactory_p.h
index 1ac973f..d5c1743 100644
--- a/qmake/include/private/qcomponentfactory_p.h
+++ b/qmake/include/private/qcomponentfactory_p.h
@@ -37,4 +37,4 @@
 
-#ifndef QCOMPONENTFACTORY_H
-#define QCOMPONENTFACTORY_H
+#ifndef QCOMPONENTFACTORY_P_H
+#define QCOMPONENTFACTORY_P_H
 
@@ -72,2 +72,2 @@ public:
 
-#endif // QCOMPONENTFACTORY_H
+#endif // QCOMPONENTFACTORY_P_H
diff --git a/qmake/include/private/qcriticalsection_p.h b/qmake/include/private/qcriticalsection_p.h
index 7d9feca..8dacc62 100644
--- a/qmake/include/private/qcriticalsection_p.h
+++ b/qmake/include/private/qcriticalsection_p.h
@@ -35,4 +35,4 @@
 
-#ifndef QCRITICALSECTION_H
-#define QCRITICALSECTION_H
+#ifndef QCRITICALSECTION_P_H
+#define QCRITICALSECTION_P_H
 
diff --git a/qmake/include/private/qdir_p.h b/qmake/include/private/qdir_p.h
index 35dba28..a6c7c91 100644
--- a/qmake/include/private/qdir_p.h
+++ b/qmake/include/private/qdir_p.h
@@ -5,3 +5,3 @@
 **
-** Created : 2000.11.06
+** Created : 001106
 **
@@ -40,3 +40,2 @@
 
-
 //
@@ -55,6 +54,8 @@
 #ifndef QT_H
+#include "qregexp.h"
+#include "qvaluelist.h"
 #endif // QT_H
 
-extern QStringList qt_makeFilterList( const QString & );
-
+extern QValueList<QRegExp> qt_makeFilterList( const QString & );
+extern bool qt_matchFilterList( const QValueList<QRegExp> &, const QString & );
 
diff --git a/qmake/include/private/qeffects_p.h b/qmake/include/private/qeffects_p.h
index 4178b6f..3b6c212 100644
--- a/qmake/include/private/qeffects_p.h
+++ b/qmake/include/private/qeffects_p.h
@@ -5,3 +5,3 @@
 **
-** Created : 2000.06.21
+** Created : 000621
 **
diff --git a/qmake/include/private/qeventloop_p.h b/qmake/include/private/qeventloop_p.h
index b64d0df..3a5350e 100644
--- a/qmake/include/private/qeventloop_p.h
+++ b/qmake/include/private/qeventloop_p.h
@@ -1 +1,31 @@
+/****************************************************************************
+** $Id$
+**
+** Definition of QEventLoop class
+**
+** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
+**
+** This file is part of the kernel module of the Qt GUI Toolkit.
+**
+** 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 or Qt Professional Edition
+** licenses for Qt/Embedded may use this file in accordance with the
+** Qt Embedded 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/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
 #ifndef QEVENTLOOP_P_H
@@ -3,3 +33,21 @@
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  This header file may
+// change from version to version without notice, or even be
+// removed.
+//
+// We mean it.
+//
+//
+
 #include "qplatformdefs.h"
+
+// SCO OpenServer redefines raise -> kill
+#if defined(raise)
+# undef raise
+#endif
+
 #include "qwindowdefs.h"
@@ -8,5 +56,7 @@ class QSocketNotifier;
 
-#if defined(Q_OS_UNIX)
+#if defined(Q_OS_UNIX) || defined (Q_WS_WIN)
 #include <qptrlist.h>
+#endif // Q_OS_UNIX || Q_WS_WIN
 
+#if defined(Q_OS_UNIX)
 struct QSockNot
@@ -32,2 +82,8 @@ public:
 
+#if defined(Q_WS_WIN)
+struct QSockNot {
+    QSocketNotifier *obj;
+    int fd;
+};
+#endif // Q_WS_WIN
 
@@ -46,2 +102,3 @@ public:
 	exitloop = FALSE;
+	shortcut = FALSE;
     }
@@ -50,4 +107,5 @@ public:
     int quitcode;
-    bool quitnow;
-    bool exitloop;
+    unsigned int quitnow  : 1;
+    unsigned int exitloop : 1;
+    unsigned int shortcut : 1;
 
@@ -71,2 +129,8 @@ public:
 #endif
+
+#ifdef Q_WS_WIN
+    // pending socket notifiers list
+    QPtrList<QSockNot> sn_pending_list;
+#endif // Q_WS_WIN
+
 };
diff --git a/qmake/include/private/qfontcodecs_p.h b/qmake/include/private/qfontcodecs_p.h
index 8222f98..54b0ac1 100644
--- a/qmake/include/private/qfontcodecs_p.h
+++ b/qmake/include/private/qfontcodecs_p.h
@@ -53,4 +53,4 @@
 #ifndef QT_H
-#include <qglobal.h>
-#include <qtextcodec.h>
+#include "qglobal.h"
+#include "qtextcodec.h"
 #endif // QT_H
diff --git a/qmake/include/private/qfontdata_p.h b/qmake/include/private/qfontdata_p.h
index 917d14f..1eaf80c 100644
--- a/qmake/include/private/qfontdata_p.h
+++ b/qmake/include/private/qfontdata_p.h
@@ -164,2 +164,3 @@ public:
     uint	paintDevice:1;
+    uint        useTextOutA:1;
     union {
@@ -415,3 +416,3 @@ public:
     void macSetFont(QPaintDevice *);
-    void drawText(int x, int y, QString s, int len, QPaintDevice *dev, const QRegion *rgn);
+    void drawText(int x, int y, const QString &s, int from, int len, QPaintDevice *dev, const QRegion *rgn, int dir);
     void computeLineWidth();
diff --git a/qmake/include/private/qgfxdriverinterface_p.h b/qmake/include/private/qgfxdriverinterface_p.h
index 1782ed4..e8259ac 100644
--- a/qmake/include/private/qgfxdriverinterface_p.h
+++ b/qmake/include/private/qgfxdriverinterface_p.h
@@ -32,4 +32,16 @@
 
-#ifndef QGFXDRIVERINTERFACE_H
-#define QGFXDRIVERINTERFACE_H
+#ifndef QGFXDRIVERINTERFACE_P_H
+#define QGFXDRIVERINTERFACE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  This header file may
+// change from version to version without notice, or even be
+// removed.
+//
+// We mean it.
+//
+//
 
@@ -55,2 +67,2 @@ struct Q_EXPORT QGfxDriverInterface : public QFeatureListInterface
 
-#endif // QGFXDRIVERINTERFACE_H
+#endif // QGFXDRIVERINTERFACE_P_H
diff --git a/qmake/include/private/qgpluginmanager_p.h b/qmake/include/private/qgpluginmanager_p.h
index e0c0e78..2e4e9c5 100644
--- a/qmake/include/private/qgpluginmanager_p.h
+++ b/qmake/include/private/qgpluginmanager_p.h
@@ -5,3 +5,3 @@
 **
-** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
@@ -35,4 +35,4 @@
 
-#ifndef QGPLUGINMANAGER_H
-#define QGPLUGINMANAGER_H
+#ifndef QGPLUGINMANAGER_P_H
+#define QGPLUGINMANAGER_P_H
 
@@ -106,2 +106,2 @@ inline bool QGPluginManager::autoUnload() const
 
-#endif //QGPLUGINMANAGER_H
+#endif //QGPLUGINMANAGER_P_H
diff --git a/qmake/include/private/qimageformatinterface_p.h b/qmake/include/private/qimageformatinterface_p.h
index 5f7601c..fd4c256 100644
--- a/qmake/include/private/qimageformatinterface_p.h
+++ b/qmake/include/private/qimageformatinterface_p.h
@@ -3,3 +3,3 @@
 **
-** Definition of ???
+** ...
 **
@@ -35,4 +35,4 @@
 
-#ifndef QIMAGEFORMATINTERFACE_H
-#define QIMAGEFORMATINTERFACE_H
+#ifndef QIMAGEFORMATINTERFACE_P_H
+#define QIMAGEFORMATINTERFACE_P_H
 
@@ -74,2 +74,2 @@ struct Q_EXPORT QImageFormatInterface : public QFeatureListInterface
 
-#endif // QIMAGEFORMATINTERFACE_H
+#endif // QIMAGEFORMATINTERFACE_P_H
diff --git a/qmake/include/private/qinputcontext_p.h b/qmake/include/private/qinputcontext_p.h
index 9ac0d2b..4d94147 100644
--- a/qmake/include/private/qinputcontext_p.h
+++ b/qmake/include/private/qinputcontext_p.h
@@ -89,3 +89,3 @@ public:
     void *ic;
-    QString text, lastcompose;
+    QString text;
     QWidget *focusWidget;
@@ -117,2 +117,5 @@ private:
     static bool composition( LPARAM lparam );
+
+    static void accept( QWidget *fw = 0 );
+    static void enable( bool );
 #endif
diff --git a/qmake/include/private/qkbddriverinterface_p.h b/qmake/include/private/qkbddriverinterface_p.h
index efc7ded..fe13487 100644
--- a/qmake/include/private/qkbddriverinterface_p.h
+++ b/qmake/include/private/qkbddriverinterface_p.h
@@ -32,4 +32,16 @@
 
-#ifndef QKBDDRIVERINTERFACE_H
-#define QKBDDRIVERINTERFACE_H
+#ifndef QKBDDRIVERINTERFACE_P_H
+#define QKBDDRIVERINTERFACE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  This header file may
+// change from version to version without notice, or even be
+// removed.
+//
+// We mean it.
+//
+//
 
@@ -55,2 +67,2 @@ struct Q_EXPORT QKbdDriverInterface : public QFeatureListInterface
 
-#endif // QKBDDRIVERINTERFACE_H
+#endif // QKBDDRIVERINTERFACE_P_H
diff --git a/qmake/include/private/qlibrary_p.h b/qmake/include/private/qlibrary_p.h
index c4dd565..1624ca5 100644
--- a/qmake/include/private/qlibrary_p.h
+++ b/qmake/include/private/qlibrary_p.h
@@ -5,3 +5,3 @@
 **
-** Created : 2000-01-01
+** Created : 000101
 **
@@ -57,5 +57,2 @@
 #ifndef QT_H
-#if defined(Q_CC_GNU)
-#warning "avoid including header file \"qwindowdefs.h\" in directory 'tools'"
-#endif
 #include "qwindowdefs.h"
diff --git a/qmake/include/private/qlock_p.h b/qmake/include/private/qlock_p.h
new file mode 100644
index 0000000..5c261aa
--- a/dev/null
+++ b/qmake/include/private/qlock_p.h
@@ -0,0 +1,93 @@
+/****************************************************************************
+** $Id$
+**
+** Definition of QLock class. This manages interprocess locking
+**
+** Created : 20000406
+**
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+**
+** This file is part of the kernel module of the Qt GUI Toolkit.
+**
+** 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 or Qt Professional Edition
+** licenses for Qt/Embedded may use this file in accordance with the
+** Qt Embedded 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/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+#ifndef QLOCK_P_H
+#define QLOCK_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  This header file may
+// change from version to version without notice, or even be
+// removed.
+//
+// We mean it.
+//
+//
+
+#ifndef QT_H
+#include <qstring.h>
+#endif // QT_H
+
+class QLockData;
+
+class QLock
+{
+public:
+    QLock( const QString &filename, char id, bool create = FALSE );
+    ~QLock();
+
+    enum Type { Read, Write };
+
+    bool isValid() const;
+    void lock( Type type );
+    void unlock();
+    bool locked() const;
+
+private:
+    Type type;
+    QLockData *data;
+};
+
+
+// Nice class for ensuring the lock is released.
+// Just create one on the stack and the lock is automatically released
+// when QLockHolder is destructed.
+class QLockHolder
+{
+public:
+    QLockHolder( QLock *l, QLock::Type type ) : qlock(l) {
+	qlock->lock( type );
+    }
+    ~QLockHolder() { if ( locked() ) qlock->unlock(); }
+
+    void lock( QLock::Type type ) { qlock->lock( type ); }
+    void unlock() { qlock->unlock(); }
+    bool locked() const { return qlock->locked(); }
+
+private:
+    QLock *qlock;
+};
+
+#endif
+
diff --git a/qmake/include/private/qmousedriverinterface_p.h b/qmake/include/private/qmousedriverinterface_p.h
index fd76308..42a2e3e 100644
--- a/qmake/include/private/qmousedriverinterface_p.h
+++ b/qmake/include/private/qmousedriverinterface_p.h
@@ -32,4 +32,16 @@
 
-#ifndef QMOUSEDRIVERINTERFACE_H
-#define QMOUSEDRIVERINTERFACE_H
+#ifndef QMOUSEDRIVERINTERFACE_P_H
+#define QMOUSEDRIVERINTERFACE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  This header file may
+// change from version to version without notice, or even be
+// removed.
+//
+// We mean it.
+//
+//
 
@@ -55,2 +67,2 @@ struct Q_EXPORT QMouseDriverInterface : public QFeatureListInterface
 
-#endif // QMOUSEDRIVERINTERFACE_H
+#endif // QMOUSEDRIVERINTERFACE_P_H
diff --git a/qmake/include/private/qmutexpool_p.h b/qmake/include/private/qmutexpool_p.h
index 3d9fef7..fb84157 100644
--- a/qmake/include/private/qmutexpool_p.h
+++ b/qmake/include/private/qmutexpool_p.h
@@ -1,3 +1,38 @@
-#ifndef QMUTEXPOOL_H
-#define QMUTEXPOOL_H
+/****************************************************************************
+** $Id$
+**
+** ...
+**
+** Copyright (C) 2002 Trolltech AS.  All rights reserved.
+**
+** This file is part of the tools 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 or Qt Professional 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 QMUTEXPOOL_P_H
+#define QMUTEXPOOL_P_H
 
@@ -30,3 +65,4 @@ private:
     QMutex mutex;
-    QMemArray<QMutex*> mutexes;
+    QMutex **mutexes;
+    int count;
     bool recurs;
@@ -38,2 +74,2 @@ extern QMutexPool *qt_global_mutexpool;
 
-#endif // QMUTEXPOOL_H
+#endif // QMUTEXPOOL_P_H
diff --git a/qmake/include/private/qpluginmanager_p.h b/qmake/include/private/qpluginmanager_p.h
index 4b64ba0..a8da10e 100644
--- a/qmake/include/private/qpluginmanager_p.h
+++ b/qmake/include/private/qpluginmanager_p.h
@@ -5,3 +5,3 @@
 **
-** Created : 2000-01-01
+** Created : 000101
 **
@@ -37,8 +37,4 @@
 
-#ifndef QPLUGINMANAGER_H
-#define QPLUGINMANAGER_H
-
-#ifndef QT_H
-#include "qgpluginmanager_p.h"
-#endif // QT_H
+#ifndef QPLUGINMANAGER_P_H
+#define QPLUGINMANAGER_P_H
 
@@ -56,2 +52,6 @@
 
+#ifndef QT_H
+#include "qgpluginmanager_p.h"
+#endif // QT_H
+
 #ifndef QT_NO_COMPONENT
@@ -72,2 +72,2 @@ public:
 
-#endif //QPLUGINMANAGER_H
+#endif //QPLUGINMANAGER_P_H
diff --git a/qmake/include/private/qpsprinter_p.h b/qmake/include/private/qpsprinter_p.h
index 27a4968..692cb44 100644
--- a/qmake/include/private/qpsprinter_p.h
+++ b/qmake/include/private/qpsprinter_p.h
@@ -8,3 +8,3 @@
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
@@ -63,3 +63,3 @@
 
-struct QPSPrinterPrivate;
+class QPSPrinterPrivate;
 
diff --git a/qmake/include/private/qrichtext_p.h b/qmake/include/private/qrichtext_p.h
index 8e29804..9ed87cf 100644
--- a/qmake/include/private/qrichtext_p.h
+++ b/qmake/include/private/qrichtext_p.h
@@ -158,2 +158,4 @@ private:
     }
+    QTextStringChar( const QTextStringChar & ) {
+    }
     friend class QComplexText;
@@ -176,4 +178,4 @@ public:
 
-    static QString toString( const QMemArray<QTextStringChar> &data );
-    QString toString() const;
+    static QString toString( const QMemArray<QTextStringChar> &data, bool fixspaces = TRUE );
+    QString toString( bool fixspaces = TRUE ) const;
 
@@ -288,4 +290,4 @@ public:
     void gotoPageDown( int visibleHeight );
-    void gotoNextWord();
-    void gotoPreviousWord();
+    void gotoNextWord( bool onlySpace = FALSE );
+    void gotoPreviousWord( bool onlySpace = FALSE );
     void gotoWordLeft();
@@ -328,3 +330,3 @@ private:
     void pop();
-    void processNesting( Operation op );
+    bool processNesting( Operation op );
     void invalidateNested();
@@ -705,2 +707,3 @@ struct Q_EXPORT QTextDocumentSelection
     bool swapped;
+    Q_DUMMY_COMPARISON_OPERATOR(QTextDocumentSelection)
 };
@@ -841,2 +844,5 @@ public:
     void draw( QPainter *p, const QRect& rect, const QColorGroup &cg, const QBrush *paper = 0 );
+    void eraseParagraphEmptyArea( QTextParagraph *parag, QPainter *p, const QColorGroup &cg );
+    bool useDoubleBuffer( QTextParagraph *parag, QPainter *p );
+
     void drawParagraph( QPainter *p, QTextParagraph *parag, int cx, int cy, int cw, int ch,
@@ -1069,2 +1075,3 @@ struct Q_EXPORT QTextParagraphSelection
     int start, end;
+    Q_DUMMY_COMPARISON_OPERATOR(QTextParagraphSelection)
 };
@@ -1138,15 +1145,6 @@ public:
 
-class Q_EXPORT QTextParagraphPseudoDocument
-{
-public:
-    QTextParagraphPseudoDocument();
-    ~QTextParagraphPseudoDocument();
-    QRect docRect;
-    QTextFormatter *pFormatter;
-    QTextCommandHistory *commandHistory;
-    int minw;
-    int wused;
-};
+class QTextParagraphPseudoDocument;
+
+class QSyntaxHighlighter;
 
-//nase
 class Q_EXPORT QTextParagraph
@@ -1155,2 +1153,3 @@ class Q_EXPORT QTextParagraph
     friend class QTextCursor;
+    friend class QSyntaxHighlighter;
 
@@ -1178,3 +1177,9 @@ public:
 
+#if defined(Q_STRICT_INLINING_RULES)
+    // This is for the IRIX MIPSpro o32 ABI - it fails, claiming the
+    // implementation to be a redefinition.
+    inline QTextDocument *document() const;
+#else
     QTextDocument *document() const;
+#endif
     QTextParagraphPseudoDocument *pseudoDocument() const;
@@ -1598,3 +1603,2 @@ public:
     void updateDefaultFormat( const QFont &font, const QColor &c, QStyleSheet *sheet );
-    QDict<QTextFormat> dict() const { return cKey; }
 
@@ -1618,2 +1622,15 @@ private:
 
+class Q_EXPORT QTextParagraphPseudoDocument
+{
+public:
+    QTextParagraphPseudoDocument();
+    ~QTextParagraphPseudoDocument();
+    QRect docRect;
+    QTextFormatter *pFormatter;
+    QTextCommandHistory *commandHistory;
+    int minw;
+    int wused;
+    QTextFormatCollection collection;
+};
+
 // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -1830,2 +1847,8 @@ inline void QTextDocument::takeFlow()
 
+inline bool QTextDocument::useDoubleBuffer( QTextParagraph *parag, QPainter *p )
+{
+    return ( !parag->document()->parent() || parag->document()->nextDoubleBuffered ) &&
+	( !p || !p->device() || p->device()->devType() != QInternal::Printer );
+}
+
 // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/qmake/include/private/qsettings_p.h b/qmake/include/private/qsettings_p.h
index 18d118b..095291c 100644
--- a/qmake/include/private/qsettings_p.h
+++ b/qmake/include/private/qsettings_p.h
@@ -96,3 +96,3 @@ public:
 
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     // system dependent implementations to use the 
diff --git a/qmake/include/private/qsharedmemory_p.h b/qmake/include/private/qsharedmemory_p.h
index 4a8339d..927de89 100644
--- a/qmake/include/private/qsharedmemory_p.h
+++ b/qmake/include/private/qsharedmemory_p.h
@@ -7,3 +7,3 @@
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
@@ -32,2 +32,5 @@
 
+#ifndef QSHAREDMEMORY_P_H
+#define QSHAREDMEMORY_P_H
+
 //
@@ -40,6 +43,5 @@
 //
+// We mean it.
+//
 //
-
-#if !defined(QT_QSHM_H)
-#define QT_QSHM_H
 
@@ -83,2 +85,3 @@ private:
 #endif
+
 #endif
diff --git a/qmake/include/private/qsqldriverinterface_p.h b/qmake/include/private/qsqldriverinterface_p.h
index 8957b86..8a39ddf 100644
--- a/qmake/include/private/qsqldriverinterface_p.h
+++ b/qmake/include/private/qsqldriverinterface_p.h
@@ -1,2 +1,3 @@
 /****************************************************************************
+** $Id$
 **
@@ -6,3 +7,3 @@
 **
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
@@ -39,2 +40,14 @@
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  This header file may
+// change from version to version without notice, or even be
+// removed.
+//
+// We mean it.
+//
+//
+
 #ifndef QT_H
@@ -68,2 +81,2 @@ struct QM_EXPORT_SQL QSqlDriverFactoryInterface : public QFeatureListInterface
 
-#endif // QSQLDRIVERINTERFACE_H
+#endif // QSQLDRIVERINTERFACE_P_H
diff --git a/qmake/include/private/qsqlextension_p.h b/qmake/include/private/qsqlextension_p.h
index 597b266..3445b47 100644
--- a/qmake/include/private/qsqlextension_p.h
+++ b/qmake/include/private/qsqlextension_p.h
@@ -53,4 +53,6 @@
 #include "qmap.h"
+#include "qvaluevector.h"
 #include "qstring.h"
 #include "qvariant.h"
+#include "qsql.h"
 #endif // QT_H
@@ -61,9 +63,27 @@
 #define QM_EXPORT_SQL
+#define QM_TEMPLATE_EXTERN_SQL
 #else
 #define QM_EXPORT_SQL Q_EXPORT
+#define QM_TEMPLATE_EXTERN_SQL Q_TEMPLATE_EXTERN
 #endif
 
+struct Param {
+    Param( const QVariant& v = QVariant(), QSql::ParameterType t = QSql::In ): value( v ), typ( t ) {}
+    QVariant value;
+    QSql::ParameterType typ;
+    Q_DUMMY_COMPARISON_OPERATOR(Param)
+};
+
+struct Holder {
+    Holder( const QString& hldr = QString::null, int pos = -1 ): holderName( hldr ), holderPos( pos ) {}
+    bool operator==( const Holder& h ) const { return h.holderPos == holderPos && h.holderName == holderName; }
+    bool operator!=( const Holder& h ) const { return h.holderPos != holderPos || h.holderName != holderName; }
+    QString holderName;
+    int	    holderPos;
+};
+
 #if defined(Q_TEMPLATEDLL)
-Q_TEMPLATE_EXTERN template class QM_EXPORT_SQL QMap<QString,QVariant>;
-Q_TEMPLATE_EXTERN template class QM_EXPORT_SQL QMap<int,QString>;
+QM_TEMPLATE_EXTERN_SQL template class QM_EXPORT_SQL QMap<QString,Param>;
+QM_TEMPLATE_EXTERN_SQL template class QM_EXPORT_SQL QMap<int,QString>;
+QM_TEMPLATE_EXTERN_SQL template class QM_EXPORT_SQL QValueVector<Holder>;
 #endif
@@ -76,5 +96,7 @@ public:
     virtual bool exec();
-    virtual void bindValue( const QString& holder, const QVariant& value );
-    virtual void bindValue( int pos, const QVariant& value );
-    virtual void addBindValue( const QVariant& value );
+    virtual void bindValue( const QString& holder, const QVariant& value, QSql::ParameterType = QSql::In );
+    virtual void bindValue( int pos, const QVariant& value, QSql::ParameterType = QSql::In );
+    virtual void addBindValue( const QVariant& value, QSql::ParameterType = QSql::In );
+    virtual QVariant parameterValue( const QString& holder );
+    virtual QVariant parameterValue( int pos );
     void clearValues();
@@ -88,3 +110,9 @@ public:
     QMap<int, QString> index;
-    QMap<QString, QVariant> values;
+    typedef QMap<QString, Param> ValueMap;
+    ValueMap values;
+
+    // convenience container for QSqlQuery
+    // to map holders <-> positions
+    typedef QValueVector<Holder> HolderVector;
+    HolderVector holders;
 };
@@ -98,3 +126,2 @@ public:
 };
-
 #endif
diff --git a/qmake/include/private/qstyleinterface_p.h b/qmake/include/private/qstyleinterface_p.h
index 4aaedc7..24a43ad 100644
--- a/qmake/include/private/qstyleinterface_p.h
+++ b/qmake/include/private/qstyleinterface_p.h
@@ -35,4 +35,16 @@
 
-#ifndef QSTYLEINTERFACE_H
-#define QSTYLEINTERFACE_H
+#ifndef QSTYLEINTERFACE_P_H
+#define QSTYLEINTERFACE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  This header file may
+// change from version to version without notice, or even be
+// removed.
+//
+// We mean it.
+//
+//
 
@@ -60,2 +72,2 @@ struct Q_EXPORT QStyleFactoryInterface : public QFeatureListInterface
 
-#endif //QSTYLEINTERFACE_H
+#endif //QSTYLEINTERFACE_P_H
diff --git a/qmake/include/private/qsvgdevice_p.h b/qmake/include/private/qsvgdevice_p.h
index c1cc389..3407705 100644
--- a/qmake/include/private/qsvgdevice_p.h
+++ b/qmake/include/private/qsvgdevice_p.h
@@ -5,3 +5,3 @@
 **
-** Created : 20001024
+** Created : 001024
 **
@@ -37,4 +37,4 @@
 
-#ifndef QSVGDEVICE_H
-#define QSVGDEVICE_H
+#ifndef QSVGDEVICE_P_H
+#define QSVGDEVICE_P_H
 
@@ -133,2 +133,2 @@ inline QRect QSvgDevice::boundingRect() const
 
-#endif // QSVGDEVICE_H
+#endif // QSVGDEVICE_P_H
diff --git a/qmake/include/private/qtextcodecinterface_p.h b/qmake/include/private/qtextcodecinterface_p.h
index d2a2cb9..76e77f7 100644
--- a/qmake/include/private/qtextcodecinterface_p.h
+++ b/qmake/include/private/qtextcodecinterface_p.h
@@ -38,3 +38,2 @@
 
-
 //
@@ -52,3 +51,2 @@
 
-
 #ifndef QT_H
diff --git a/qmake/include/private/qtitlebar_p.h b/qmake/include/private/qtitlebar_p.h
index dabb6bf..091845f 100644
--- a/qmake/include/private/qtitlebar_p.h
+++ b/qmake/include/private/qtitlebar_p.h
@@ -5,3 +5,3 @@
 **
-** Created : 2000-01-01
+** Created : 000101
 **
diff --git a/qmake/include/private/qucom_p.h b/qmake/include/private/qucom_p.h
index d2ff48e..6b6ad40 100644
--- a/qmake/include/private/qucom_p.h
+++ b/qmake/include/private/qucom_p.h
@@ -37,9 +37,4 @@
 
-#ifndef QUCOM_H
-#define QUCOM_H
-
-#ifndef QT_H
-#include <qstring.h>
-#include "quuid.h"
-#endif // QT_H
+#ifndef QUCOM_P_H
+#define QUCOM_P_H
 
@@ -57,2 +52,7 @@
 
+#ifndef QT_H
+#include <qstring.h>
+#include "quuid.h"
+#endif // QT_H
+
 #ifdef check
@@ -131,3 +131,3 @@ public: // scary MSVC bug makes this necessary
 	bool b;
-	
+
 	char c;
@@ -136,3 +136,3 @@ public: // scary MSVC bug makes this necessary
 	long l;
-	
+
 	unsigned char uc;
@@ -141,8 +141,8 @@ public: // scary MSVC bug makes this necessary
 	unsigned long ul;
-	
+
 	float f;
 	double d;
-	
+
 	char byte[16];
-	
+
 	struct {
@@ -151,5 +151,5 @@ public: // scary MSVC bug makes this necessary
 	} bytearray;
-	
+
 	void* ptr;
-	
+
 	struct {
@@ -158,3 +158,3 @@ public: // scary MSVC bug makes this necessary
 	} voidstar;
-	
+
 	struct {
@@ -168,3 +168,3 @@ public: // scary MSVC bug makes this necessary
 	} utf8;
-	
+
 	struct {
@@ -173,6 +173,6 @@ public: // scary MSVC bug makes this necessary
 	} local8bit;
-	
+
 	QUnknownInterface* iface;
 	QDispatchInterface* idisp;
-	
+
     } payload;
@@ -265,3 +265,3 @@ struct Q_EXPORT QUEnumItem 				// - a name/value pair
 struct Q_EXPORT QUEnum
-{			
+{
     const char *name;			// - enumerator name
@@ -398,20 +398,2 @@ extern Q_EXPORT QUType_int static_QUType_int;
 
-// {5938712A-C496-11D5-8CB2-00C0F03BC0F3}
-extern Q_EXPORT const QUuid TID_QUType_uint;
-struct Q_EXPORT QUType_uint : public QUType
-{
-    const QUuid *uuid() const;
-    const char *desc() const;
-
-    void set( QUObject *, uint );
-    uint &get( QUObject *o ) { return o->payload.ui; }
-    bool canConvertFrom( QUObject *, QUType * );
-    bool canConvertTo( QUObject *, QUType * );
-    bool convertFrom( QUObject *, QUType * );
-    bool convertTo( QUObject *, QUType * );
-    void clear( QUObject * ) {}
-    int serializeTo( QUObject *, QUBuffer * );
-    int serializeFrom( QUObject *, QUBuffer * );
-};
-extern Q_EXPORT QUType_uint static_QUType_uint;
 
@@ -436,20 +418,2 @@ extern Q_EXPORT QUType_double static_QUType_double;
 
-// {544C5175-6993-4486-B04D-CEC4D21BF4B9 }
-extern Q_EXPORT const QUuid TID_QUType_float;
-struct Q_EXPORT QUType_float : public QUType
-{
-    const QUuid *uuid() const;
-    const char *desc() const;
-
-    void set( QUObject *, float );
-    float &get( QUObject *o ) { return o->payload.f; }
-    bool canConvertFrom( QUObject *, QUType * );
-    bool canConvertTo( QUObject *, QUType * );
-    bool convertFrom( QUObject *, QUType * );
-    bool convertTo( QUObject *, QUType * );
-    void clear( QUObject * ) {}
-    int serializeTo( QUObject *, QUBuffer * );
-    int serializeFrom( QUObject *, QUBuffer * );
-};
-extern Q_EXPORT QUType_float static_QUType_float;
 
@@ -498,2 +462,2 @@ extern Q_EXPORT QUType_QString static_QUType_QString;
 
-#endif // QUCOM_H
+#endif // QUCOM_P_H
diff --git a/qmake/include/private/qucomextra_p.h b/qmake/include/private/qucomextra_p.h
index 3de6104..fe39692 100644
--- a/qmake/include/private/qucomextra_p.h
+++ b/qmake/include/private/qucomextra_p.h
@@ -37,4 +37,16 @@
 
-#ifndef QUCOMEXTRA_H
-#define QUCOMEXTRA_H
+#ifndef QUCOMEXTRA_P_H
+#define QUCOMEXTRA_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  This header file may
+// change from version to version without notice, or even be
+// removed.
+//
+// We mean it.
+//
+//
 
@@ -91,3 +103,3 @@ extern Q_EXPORT QUType_varptr static_QUType_varptr;
 
-#endif // QUCOMEXTRA_H
+#endif // QUCOMEXTRA_P_H
 
diff --git a/qmake/include/private/qwidgetinterface_p.h b/qmake/include/private/qwidgetinterface_p.h
index 5b5776b..78e9aad 100644
--- a/qmake/include/private/qwidgetinterface_p.h
+++ b/qmake/include/private/qwidgetinterface_p.h
@@ -1,5 +1,13 @@
- /**********************************************************************
-** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
+/****************************************************************************
+** $Id$
 **
-** This file is part of Qt Designer.
+** ...
+**
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+**
+** This file is part of the widgets 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.
 **
@@ -10,2 +18,6 @@
 **
+** Licensees holding valid Qt Enterprise Edition or Qt Professional 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
@@ -13,2 +25,5 @@
 **
+** 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.
@@ -20,12 +35,4 @@
 
-#ifndef QWIDGETINTERFACE_H
-#define QWIDGETINTERFACE_H
-
-
-#ifndef QT_H
-#include <private/qcom_p.h>
-#include <qiconset.h>
-#endif // QT_H
-
-#ifndef QT_NO_WIDGETPLUGIN
+#ifndef QWIDGETINTERFACE_P_H
+#define QWIDGETINTERFACE_P_H
 
@@ -43,2 +50,9 @@
 
+#ifndef QT_H
+#include <private/qcom_p.h>
+#include <qiconset.h>
+#endif // QT_H
+
+#ifndef QT_NO_WIDGETPLUGIN
+
 class QWidget;
@@ -94,3 +108,3 @@ public:
 
-#if CONTAINER_CUSTOM_WIDGETS
+#ifdef QT_CONTAINER_CUSTOM_WIDGETS
 // {15976628-e3c3-47f4-b525-d124a3caf30e}
@@ -103,5 +117,20 @@ struct QWidgetContainerInterfacePrivate : public QUnknownInterface
 public:
-    virtual QWidget *containerOfWidget( QWidget *widget ) const = 0;
-    virtual QWidgetList containersOf( QWidget *widget ) const = 0;
-    virtual bool isPassiveInteractor( QWidget *widget ) const = 0;
+    virtual QWidget *containerOfWidget( const QString &f, QWidget *container ) const = 0;
+    virtual bool isPassiveInteractor( const QString &f, QWidget *container ) const = 0;
+
+    virtual bool supportsPages( const QString &f ) const = 0;
+
+    virtual QWidget *addPage( const QString &f, QWidget *container,
+			      const QString &name, int index ) const = 0;
+    virtual void insertPage( const QString &f, QWidget *container,
+			     const QString &name, int index, QWidget *page ) const = 0;
+    virtual void removePage( const QString &f, QWidget *container, int index ) const = 0;
+    virtual void movePage( const QString &f, QWidget *container, int fromIndex, int toIndex ) const = 0;
+    virtual int count( const QString &key, QWidget *container ) const = 0;
+    virtual int currentIndex( const QString &key, QWidget *container ) const = 0;
+    virtual QString pageLabel( const QString &key, QWidget *container, int index ) const = 0;
+    virtual QWidget *page( const QString &key, QWidget *container, int index ) const = 0;
+    virtual void renamePage( const QString &key, QWidget *container,
+			     int index, const QString &newName ) const = 0;
+    virtual QWidgetList pages( const QString &f, QWidget *container ) const = 0;
 };
@@ -110,2 +139,2 @@ public:
 #endif // QT_NO_WIDGETPLUGIN
-#endif // QWIDGETINTERFACE_H
+#endif // QWIDGETINTERFACE_P_H
diff --git a/qmake/include/private/qwidgetresizehandler_p.h b/qmake/include/private/qwidgetresizehandler_p.h
index ca229db..9297832 100644
--- a/qmake/include/private/qwidgetresizehandler_p.h
+++ b/qmake/include/private/qwidgetresizehandler_p.h
@@ -7,3 +7,3 @@
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
@@ -37,4 +37,16 @@
 
-#ifndef QWIDGETRESIZEHANDLER_H
-#define QWIDGETRESIZEHANDLER_H
+#ifndef QWIDGETRESIZEHANDLER_P_H
+#define QWIDGETRESIZEHANDLER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  This header file may
+// change from version to version without notice, or even be
+// removed.
+//
+// We mean it.
+//
+//
 
diff --git a/qmake/include/qasciidict.h b/qmake/include/qasciidict.h
index 8f344cd..ecd9c9f 100644
--- a/qmake/include/qasciidict.h
+++ b/qmake/include/qasciidict.h
@@ -117,2 +117,6 @@ public:
 
+#ifdef QT_QWINEXPORT
+#define Q_DEFINED_QASCIIDICT
+#include "qwinexport.h"
+#endif /* QT_QWINEXPORT */
 #endif // QASCIIDICT_H
diff --git a/qmake/include/qcstring.h b/qmake/include/qcstring.h
index 004bb3b..6b7352a 100644
--- a/qmake/include/qcstring.h
+++ b/qmake/include/qcstring.h
@@ -103,2 +103,3 @@ Q_EXPORT Q_UINT16 qChecksum( const char *s, uint len );
 
+#ifndef QT_QWINEXPORT
 #if defined(Q_TEMPLATEDLL)
@@ -106,2 +107,3 @@ Q_TEMPLATE_EXTERN template class Q_EXPORT QMemArray<char>;
 #endif
+#endif /* QT_QWINEXPORT */
 
@@ -234,2 +236,4 @@ public:
     QCString    &operator+=( char c );
+private:
+    int	find( const char *str, int index, bool cs, uint l ) const;
 };
@@ -390,2 +394,5 @@ Q_EXPORT inline const QCString operator+( char c1, const QCString &s2 )
 
+#ifdef QT_QWINEXPORT
+#include <qwinexport.h>
+#endif /* QT_QWINEXPORT */
 #endif // QCSTRING_H
diff --git a/qmake/include/qdict.h b/qmake/include/qdict.h
index 04ae7bf..d8943ad 100644
--- a/qmake/include/qdict.h
+++ b/qmake/include/qdict.h
@@ -117,2 +117,6 @@ public:
 
+#ifdef QT_QWINEXPORT
+#define Q_DEFINED_QDICT
+#include "qwinexport.h"
+#endif /* QT_QWINEXPORT */
 #endif // QDICT_H
diff --git a/qmake/include/qdir.h b/qmake/include/qdir.h
index 6e9f1ab..4b08b79 100644
--- a/qmake/include/qdir.h
+++ b/qmake/include/qdir.h
@@ -180,2 +180,3 @@ public:
     static bool isRelativePath( const QString &path );
+    void refresh() const;
 
@@ -190,3 +191,3 @@ private:
 
-    static void slashify ( QString &);
+    static void slashify( QString & );
 
diff --git a/qmake/include/qfeatures.h b/qmake/include/qfeatures.h
index 57502f9..270a6de 100644
--- a/qmake/include/qfeatures.h
+++ b/qmake/include/qfeatures.h
@@ -76,3 +76,3 @@
 
-// 4-bit greyscale
+// 4-bit grayscale
 //#define QT_NO_QWS_DEPTH_4
diff --git a/qmake/include/qgarray.h b/qmake/include/qgarray.h
index 12edea6..40720a6 100644
--- a/qmake/include/qgarray.h
+++ b/qmake/include/qgarray.h
@@ -51,7 +51,15 @@ public:
     struct array_data : public QShared {	// shared array
-	array_data()	{ data=0; len=0; }
+	array_data():data(0),len(0)
+#ifdef QT_QGARRAY_SPEED_OPTIM
+		    ,maxl(0)
+#endif
+	    {}
 	char *data;				// actual array data
 	uint  len;
+#ifdef QT_QGARRAY_SPEED_OPTIM
+	uint maxl;
+#endif
     };
     QGArray();
+    enum Optimization { MemOptim, SpeedOptim };
 protected:
@@ -72,2 +80,3 @@ protected:
 
+    bool	resize( uint newsize, Optimization optim );
     bool	resize( uint newsize );
@@ -90,3 +99,3 @@ protected:
     int		contains( const char *d, uint sz ) const;
-    
+
     void	sort( uint sz );
diff --git a/qmake/include/qglobal.h b/qmake/include/qglobal.h
index 13cff64..d212bff 100644
--- a/qmake/include/qglobal.h
+++ b/qmake/include/qglobal.h
@@ -40,3 +40,3 @@
 
-#define QT_VERSION_STR   "3.1.0-b2"
+#define QT_VERSION_STR   "3.1.2"
 /*
@@ -44,3 +44,3 @@
  */
-#define QT_VERSION 0x030100
+#define QT_VERSION 0x030102
 
@@ -143,8 +143,8 @@
 #  define Q_OS_DYNIX
-#elif defined(_SCO_DS)      /* SCO OpenServer 5 */
+#elif defined(_SCO_DS)                   /* SCO OpenServer 5 + GCC */
 #  define Q_OS_SCO
-#elif defined(__UNIXWARE__) /* UnixWare 7 + GCC, Open UNIX 8 + GCC */
+#elif defined(__USLC__)                  /* all SCO platforms + UDK or OUDK */
 #  define Q_OS_UNIXWARE
 #  define Q_OS_UNIXWARE7
-#elif defined(__USLC__)     /* UnixWare 7 + UDK, Open UNIX 8 + OUDK */
+#elif defined(__svr4__) && defined(i386) /* Open UNIX 8 + GCC */
 #  define Q_OS_UNIXWARE
@@ -227,3 +227,5 @@
 #    define Q_CC_MSVC_NET
-#    define Q_TYPENAME
+#    if _MSC_VER < 1310
+#      define Q_TYPENAME
+#    endif
 #  endif
@@ -273,2 +275,6 @@
 #  endif
+/* GCC 3.1 and GCC 3.2 wrongly define _SB_CTYPE_MACROS on HP-UX */
+#  if defined(Q_OS_HPUX) && __GNUC__ == 3 && __GNUC_MINOR__ >= 1
+#    define Q_WRONG_SB_CTYPE_MACROS
+#  endif
 #  if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP)
@@ -392,2 +398,6 @@
 #    define Q_CC_USLC
+/* The latest UDK 7.1.1b does not need this, but previous versions do */
+#    if !defined(__SCO_VERSION__) || (__SCO_VERSION__ < 302200010)
+#      define Q_INLINE_TEMPLATES inline
+#    endif
 #    define Q_NO_USING_KEYWORD /* ### check "using" status */
@@ -399,5 +409,4 @@
 
-/* CDS++ is not documented to define __EDG__ or __EDG in the Reliant
-   documentation but we suppose it does, in any case it does follow
-   conventions like _BOOL */
+/* CDS++ defines __EDG__ although this is not documented in the Reliant
+   documentation. It also follows conventions like _BOOL and this documented */
 #  elif defined(sinix)
@@ -417,2 +426,4 @@
 #      define Q_STRICT_INLINING_RULES
+#      define Q_NO_EXPLICIT_KEYWORD
+#      define Q_INLINE_TEMPLATES inline
 #    elif defined(_COMPILER_VERSION) && (_COMPILER_VERSION < 730) /* 7.2 */
@@ -425,4 +436,5 @@
 /* The older UnixWare 2.X compiler? */
-#elif defined(__USLC__) && !defined(__SCO_VERSION__)
+#elif defined(__USLC__)
 #  define Q_CC_USLC
+#  define Q_TYPENAME
 #  define Q_NO_BOOL_TYPE
@@ -430,2 +442,3 @@
 #  define Q_NO_USING_KEYWORD
+#  define Q_INLINE_TEMPLATES inline
 
@@ -456,2 +469,12 @@
 
+/* CDS++ does not seem to define __EDG__ or __EDG according to Reliant
+   documentation but nevertheless uses EDG conventions like _BOOL */
+#elif defined(sinix)
+#  define Q_CC_EDG
+#  define Q_CC_CDS
+#  if !defined(_BOOL)
+#    define Q_NO_BOOL_TYPE
+#  endif
+#  define Q_BROKEN_TEMPLATE_SPECIALIZATION
+
 #elif defined(Q_OS_HPUX)
@@ -508,2 +531,3 @@
 #    define Q_WS_QWS
+#    define QT_NO_QWS_IM
 #  elif defined(Q_OS_MACX)
@@ -747,2 +771,6 @@ class QDataStream;
 
+#if !defined(Q_WS_QWS) && !defined(QT_NO_COP)
+#  define QT_NO_COP
+#endif
+
 #ifndef QT_H
@@ -754,2 +782,3 @@ class QDataStream;
 // Create Qt DLL if QT_DLL is defined (Windows only)
+// or QT_SHARED is defined (Kylix only)
 //
@@ -772,4 +801,4 @@ class QDataStream;
 #    ifndef Q_TEMPLATE_EXTERN
-#      if defined(Q_CC_MSVC)
-#        define Q_TEMPLATE_EXTERN /*extern*/ //### too many warnings, even though disabled
+#      if defined(Q_CC_MSVC_NET)
+#        define Q_TEMPLATE_EXTERN extern
 #      else
@@ -778,3 +807,14 @@ class QDataStream;
 #    endif
-#    undef  Q_DISABLE_COPY  /* avoid unresolved externals */
+#    undef  Q_DISABLE_COPY	/* avoid unresolved externals */
+#  endif
+#elif defined(Q_OS_LINUX) && defined(Q_CC_BOR)
+#  if defined(QT_SHARED)	/* create a Qt shared library */
+#    define Q_EXPORT  __declspec(dllexport)
+#    define Q_TEMPLATEDLL
+#    define Q_TEMPLATE_EXTERN
+#    undef  Q_DISABLE_COPY	/* avoid unresolved externals */
+#  else
+#    define Q_TEMPLATEDLL
+#    define Q_TEMPLATE_EXTERN
+#    undef  Q_DISABLE_COPY 	/* avoid unresolved externals */
 #  endif
@@ -805,3 +845,5 @@ Q_EXPORT const char *qVersion();
 Q_EXPORT bool qSysInfo( int *wordSize, bool *bigEndian );
-#if defined(Q_WS_WIN)
+#if defined(Q_OS_MAC)
+int qMacVersion();
+#elif defined(Q_WS_WIN)
 Q_EXPORT int qWinVersion();
@@ -971,2 +1013,18 @@ Q_EXPORT const char *qInstallPathData();
 
+// compilers which follow outdated template instantiation rules
+// require a class to have a comparison operator to exist when
+// a QValueList of this type is instantiated. It's not actually
+// used in the list, though. Hence the dummy implementation.
+// Just in case other code relies on it we better trigger a warning
+// mandating a real implementation.
+#ifdef Q_FULL_TEMPLATE_INSTANTIATION
+#  define Q_DUMMY_COMPARISON_OPERATOR(C) \
+    bool operator==( const C& ) const { \
+        qWarning( #C"::operator==( const "#C"& ) got called." ); \
+        return FALSE; \
+    }
+#else
+#  define Q_DUMMY_COMPARISON_OPERATOR(C)
+#endif
+
 #endif // QGLOBAL_H
@@ -994,2 +1052,3 @@ Q_EXPORT const char *qInstallPathData();
 #    pragma warning(disable: 4231) // nonstandard extension used : 'extern' before template explicit instantiation
+#    pragma warning(disable: 4710) // function not inlined
 #  elif defined(Q_CC_BOR)
diff --git a/qmake/include/qintdict.h b/qmake/include/qintdict.h
index b4cb223..0299879 100644
--- a/qmake/include/qintdict.h
+++ b/qmake/include/qintdict.h
@@ -113,2 +113,6 @@ public:
 
+#ifdef QT_QWINEXPORT
+#define Q_DEFINED_QINTDICT
+#include "qwinexport.h"
+#endif /* QT_QWINEXPORT */
 #endif // QINTDICT_H
diff --git a/qmake/include/qmap.h b/qmake/include/qmap.h
index 269bd6b..4bc0a2f 100644
--- a/qmake/include/qmap.h
+++ b/qmake/include/qmap.h
@@ -882,2 +882,6 @@ Q_INLINE_TEMPLATES QDataStream& operator<<( QDataStream& s, const QMap<Key,T>& m
 
+#ifdef QT_QWINEXPORT
+#define Q_DEFINED_QMAP
+#include "qwinexport.h"
+#endif /* QT_QWINEXPORT */
 #endif // QMAP_H
diff --git a/qmake/include/qmemarray.h b/qmake/include/qmemarray.h
index a5baf99..267670d 100644
--- a/qmake/include/qmemarray.h
+++ b/qmake/include/qmemarray.h
@@ -45,3 +45,3 @@
 
-template<class type> 
+template<class type>
 class QMemArray : public QGArray
@@ -70,2 +70,3 @@ public:
     bool  resize( uint size )	{ return QGArray::resize(size*sizeof(type)); }
+    bool  resize( uint size, Optimization optim ) { return QGArray::resize(size*sizeof(type), optim); }
     bool  truncate( uint pos )	{ return QGArray::resize(pos*sizeof(type)); }
@@ -110,2 +111,3 @@ public:
 
+#ifndef QT_QWINEXPORT
 #if defined(Q_TEMPLATEDLL)
@@ -116,2 +118,3 @@ Q_TEMPLATE_EXTERN template class Q_EXPORT QMemArray<bool>;
 #endif
+#endif /* QT_QWINEXPORT */
 
@@ -121,2 +124,6 @@ Q_TEMPLATE_EXTERN template class Q_EXPORT QMemArray<bool>;
 
+#ifdef QT_QWINEXPORT
+#define Q_DEFINED_QMEMARRAY
+#include <qwinexport.h>
+#endif /* QT_QWINEXPORT */
 #endif // QARRAY_H
diff --git a/qmake/include/qptrlist.h b/qmake/include/qptrlist.h
index 53fb605..17b5ee9 100644
--- a/qmake/include/qptrlist.h
+++ b/qmake/include/qptrlist.h
@@ -5,4 +5,2 @@
 **
-** Created :
-**
 ** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
@@ -159,2 +157,6 @@ public:
 
+#ifdef QT_QWINEXPORT
+#define Q_DEFINED_QPTRLIST
+#include "qwinexport.h"
+#endif /* QT_QWINEXPORT */
 #endif // QPTRLIST_H
diff --git a/qmake/include/qptrvector.h b/qmake/include/qptrvector.h
index f6d9623..49b40b7 100644
--- a/qmake/include/qptrvector.h
+++ b/qmake/include/qptrvector.h
@@ -112,2 +112,6 @@ template<class type> inline void QPtrVector<type>::deleteItem( QPtrCollection::I
 
+#ifdef QT_QWINEXPORT
+#define Q_DEFINED_QPTRVECTOR
+#include "qwinexport.h"
+#endif /* QT_QWINEXPORT */
 #endif // QVECTOR_H
diff --git a/qmake/include/qregexp.h b/qmake/include/qregexp.h
index 7bb777a..90f54bd 100644
--- a/qmake/include/qregexp.h
+++ b/qmake/include/qregexp.h
@@ -82,3 +82,3 @@ public:
 
-#if defined(qdoc)
+#if defined(Q_QDOC)
     int search( const QString& str, int offset = 0,
diff --git a/qmake/include/qstring.h b/qmake/include/qstring.h
index 2a87a5a..c1d6740 100644
--- a/qmake/include/qstring.h
+++ b/qmake/include/qstring.h
@@ -3,4 +3,3 @@
 **
-** Definition of the QString class, and related Unicode
-** functions.
+** Definition of the QString class, and related Unicode functions.
 **
@@ -8,3 +7,3 @@
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
@@ -45,2 +44,9 @@
 
+#ifndef QT_NO_STL
+#include <string>
+#if defined(Q_WRONG_SB_CTYPE_MACROS) && defined(_SB_CTYPE_MACROS)
+#undef _SB_CTYPE_MACROS
+#endif
+#endif
+
 
@@ -338,5 +344,5 @@ struct Q_EXPORT QStringData : public QShared {
     QStringData() :
-        QShared(), unicode(0), ascii(0), len(0), simpletext(1), maxl(0), dirty(0) { ref(); }
+        QShared(), unicode(0), ascii(0), len(0), issimpletext(TRUE), maxl(0), islatin1(FALSE) { ref(); }
     QStringData(QChar *u, uint l, uint m) :
-        QShared(), unicode(u), ascii(0), len(l), simpletext(1), maxl(m), dirty(1) { }
+        QShared(), unicode(u), ascii(0), len(l), issimpletext(FALSE), maxl(m), islatin1(FALSE) { }
     ~QStringData() { if ( unicode ) delete[] ((char*)unicode);
@@ -352,3 +358,3 @@ struct Q_EXPORT QStringData : public QShared {
 	}
-	dirty = 1;
+	issimpletext = FALSE;
     }
@@ -359,3 +365,3 @@ struct Q_EXPORT QStringData : public QShared {
 #endif
-    uint simpletext : 1;
+    uint issimpletext : 1;
 #ifdef Q_OS_MAC9
@@ -365,3 +371,3 @@ struct Q_EXPORT QStringData : public QShared {
 #endif
-    uint dirty : 1;
+    uint islatin1 : 1;
 
@@ -386,2 +392,5 @@ public:
 #endif
+#ifndef QT_NO_STL
+    QString( const std::string& );                   // deep copy
+#endif
     ~QString();
@@ -389,4 +398,5 @@ public:
     QString    &operator=( const QString & );   // impl-shared copy
-#ifndef QT_NO_CAST_ASCII
     QString    &operator=( const char * );      // deep copy
+#ifndef QT_NO_STL
+    QString    &operator=( const std::string& );     // deep copy
 #endif
@@ -496,2 +506,5 @@ public:
 #endif
+#ifndef QT_NO_STL
+    QString    &append( const std::string& );
+#endif
     QString    &prepend( char );
@@ -503,2 +516,5 @@ public:
 #endif
+#ifndef QT_NO_STL
+    QString    &prepend( const std::string& );
+#endif
     QString    &remove( uint index, uint len );
@@ -558,2 +574,5 @@ public:
 #endif
+#ifndef QT_NO_STL
+    QString    &operator+=( const std::string& );
+#endif
     QString    &operator+=( QChar c );
@@ -578,3 +597,4 @@ public:
     const QChar* unicode() const { return d->unicode; }
-    const char* ascii() const { return latin1(); }
+    const char* ascii() const;
+    static QString fromAscii(const char*, int len=-1);
     const char* latin1() const;
@@ -587,4 +607,8 @@ public:
 #ifndef QT_NO_ASCII_CAST
-    operator const char *() const { return latin1(); }
+    operator const char *() const { return ascii(); }
 #endif
+#ifndef QT_NO_STL
+    operator std::string() const { return ascii() ? ascii() : ""; }
+#endif
+
     static QString fromUcs2( const unsigned short *ucs2 );
@@ -594,2 +618,3 @@ public:
     QString &setUnicodeCodes( const ushort* unicode_as_ushorts, uint len );
+    QString &setAscii( const char*, int len=-1 );
     QString &setLatin1( const char*, int len=-1 );
@@ -611,3 +636,3 @@ public:
 #ifndef QT_NO_COMPAT
-    const char* data() const { return latin1(); }
+    const char* data() const { return ascii(); }
 #endif
@@ -619,3 +644,3 @@ public:
 
-    bool simpleText() const { if ( d->dirty ) checkSimpleText(); return (bool)d->simpletext; }
+    bool simpleText() const { if ( !d->issimpletext ) checkSimpleText(); return (bool)d->issimpletext; }
     bool isRightToLeft() const;
@@ -633,5 +658,5 @@ private:
 
-    static QChar* asciiToUnicode( const char*, uint * len, uint maxlen=(uint)-1 );
-    static QChar* asciiToUnicode( const QByteArray&, uint * len );
-    static char* unicodeToAscii( const QChar*, uint len );
+    static QChar* latin1ToUnicode( const char*, uint * len, uint maxlen=(uint)-1 );
+    static QChar* latin1ToUnicode( const QByteArray&, uint * len );
+    static char* unicodeToLatin1( const QChar*, uint len );
 
@@ -796,3 +821,13 @@ inline QString &QString::prepend( char c )
 inline QString &QString::prepend( const QByteArray & s )
-{ return insert(0,s.data()); }
+{ return insert(0,QString(s)); }
+#endif
+
+#ifndef QT_NO_STL
+inline QString &QString::prepend( const std::string& s )
+{ return insert(0, s); }
+#endif
+
+#ifndef QT_NO_CAST_ASCII
+inline QString &QString::operator+=( const QByteArray &s )
+{ return operator+=(QString(s)); }
 #endif
@@ -804,3 +839,3 @@ inline QString &QString::append( const QString & s )
 inline QString &QString::append( const QByteArray &s )
-{ return operator+=(s.data()); }
+{ return operator+=(s); }
 
@@ -816,5 +851,7 @@ inline QString &QString::append( char c )
 
-#ifndef QT_NO_CAST_ASCII
-inline QString &QString::operator+=( const QByteArray &s )
-{ return operator+=(s.data()); }
+#ifndef QT_NO_STL
+inline QString &QString::operator+=( const std::string& s )
+{ return operator+=(s.c_str()); }
+inline QString &QString::append( const std::string& s )
+{ return operator+=(s); }
 #endif
@@ -856,6 +893,6 @@ inline int QString::findRev( char c, int index, bool cs) const
 inline int QString::find( const char* str, int index ) const
-{ return find(QString::fromLatin1(str), index); }
+{ return find(QString::fromAscii(str), index); }
 
 inline int QString::findRev( const char* str, int index ) const
-{ return findRev(QString::fromLatin1(str), index); }
+{ return findRev(QString::fromAscii(str), index); }
 #endif
@@ -899,3 +936,3 @@ Q_EXPORT inline const QString operator+( const QString &s1, const char *s2 )
     QString tmp( s1 );
-    tmp += QString::fromLatin1(s2);
+    tmp += QString::fromAscii(s2);
     return tmp;
@@ -905,3 +942,3 @@ Q_EXPORT inline const QString operator+( const char *s1, const QString &s2 )
 {
-    QString tmp = QString::fromLatin1( s1 );
+    QString tmp = QString::fromAscii( s1 );
     tmp += s2;
@@ -949,2 +986,6 @@ extern Q_EXPORT QString qt_winMB2QString( const char* mb, int len=-1 );
 
+#ifdef QT_QWINEXPORT
+#define Q_DEFINED_QSTRING
+#include "qwinexport.h"
+#endif /* QT_QWINEXPORT */
 #endif // QSTRING_H
diff --git a/qmake/include/qstrlist.h b/qmake/include/qstrlist.h
index 86de328..b9dd753 100644
--- a/qmake/include/qstrlist.h
+++ b/qmake/include/qstrlist.h
@@ -47,2 +47,3 @@
 
+#ifndef QT_QWINEXPORT
 #if defined(Q_TEMPLATEDLL)
@@ -51,2 +52,3 @@ Q_TEMPLATE_EXTERN template class Q_EXPORT QPtrListIterator<char>;
 #endif
+#endif /* QT_QWINEXPORT */
 
diff --git a/qmake/include/qtextcodec.h b/qmake/include/qtextcodec.h
index 149b5cb..995e434 100644
--- a/qmake/include/qtextcodec.h
+++ b/qmake/include/qtextcodec.h
@@ -77,2 +77,7 @@ public:
 
+    static QTextCodec* codecForTr();
+    static void setCodecForTr(QTextCodec *c);
+    static QTextCodec* codecForCStrings();
+    static void setCodecForCStrings(QTextCodec *c);
+
     static void deleteAllCodecs();
@@ -90,3 +95,3 @@ public:
     virtual QCString fromUnicode(const QString& uc, int& lenInOut) const;
-    
+
     QCString fromUnicode(const QString& uc) const;
@@ -110,4 +115,13 @@ protected:
 
+private:
+    static QTextCodec *cftr;
+    static QTextCodec *cfcs;
     friend class QFont;
 };
+
+inline QTextCodec* QTextCodec::codecForTr() { return cftr; }
+inline void QTextCodec::setCodecForTr(QTextCodec *c) { cftr = c; }
+inline QTextCodec* QTextCodec::codecForCStrings() { return cfcs; }
+inline void QTextCodec::setCodecForCStrings(QTextCodec *c) { cfcs = c; }
+
 #endif // QT_NO_TEXTCODEC
diff --git a/qmake/include/qtl.h b/qmake/include/qtl.h
index 346cecc..25631fd 100644
--- a/qmake/include/qtl.h
+++ b/qmake/include/qtl.h
@@ -91,2 +91,3 @@ inline bool qEqual( InputIterator1 first1, InputIterator1 last1, InputIterator2
 {
+    // ### compare using !(*first1 == *first2) in Qt 4.0
     for ( ; first1 != last1; ++first1, ++first2 )
diff --git a/qmake/include/quuid.h b/qmake/include/quuid.h
index 591d2f1..664c149 100644
--- a/qmake/include/quuid.h
+++ b/qmake/include/quuid.h
@@ -5,5 +5,5 @@
 **
-** Created: 010523
+** Created : 010523
 **
-** Copyright (C) 1992-2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
 **
@@ -55,3 +55,3 @@ typedef struct _GUID
     uchar   Data4[ 8 ];
-} GUID;
+} GUID, *REFGUID, *LPGUID;
 #endif
diff --git a/qmake/include/qvaluelist.h b/qmake/include/qvaluelist.h
index 54f7aec..f5cd7bb 100644
--- a/qmake/include/qvaluelist.h
+++ b/qmake/include/qvaluelist.h
@@ -664,2 +664,6 @@ Q_INLINE_TEMPLATES QDataStream& operator<<( QDataStream& s, const QValueList<T>&
 #endif // QT_NO_DATASTREAM
+#ifdef QT_QWINEXPORT
+#define Q_DEFINED_QVALUELIST
+#include "qwinexport.h"
+#endif /* QT_QWINEXPORT */
 #endif // QVALUELIST_H
diff --git a/qmake/include/qvaluestack.h b/qmake/include/qvaluestack.h
index 7e9bc48..c3f966e 100644
--- a/qmake/include/qvaluestack.h
+++ b/qmake/include/qvaluestack.h
@@ -7,3 +7,3 @@
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
 **
@@ -56,3 +56,3 @@ public:
 	if ( !this->isEmpty() )
-	    remove( this->fromLast() );
+	    this->remove( this->fromLast() );
 	return elem;
diff --git a/qmake/main.cpp b/qmake/main.cpp
index eed1697..cc2d08a 100644
--- a/qmake/main.cpp
+++ b/qmake/main.cpp
@@ -62,4 +62,9 @@ int main(int argc, char **argv)
     Option::output_dir = oldpwd; //for now this is the output dir
-    if(Option::output_dir.right(1) != QString(QChar(QDir::separator())))
-	Option::output_dir += QDir::separator();
+#ifdef Q_WS_WIN
+    if ( !(Option::output_dir.length() == 3 && Option::output_dir[0].isLetter() && Option::output_dir.endsWith(":/") ) )
+#endif
+    {
+	if(Option::output_dir.right(1) != QString(QChar(QDir::separator())))
+	    Option::output_dir += QDir::separator();
+    }
     QMakeProject proj;
diff --git a/qmake/option.cpp b/qmake/option.cpp
index 34b3ee2..8b7e5e8 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -84,3 +84,3 @@ Option::TARG_MODE Option::target_mode = Option::TARG_UNIX_MODE;
 bool Option::projfile::do_pwd = TRUE;
-bool Option::projfile::do_recursive = FALSE;
+bool Option::projfile::do_recursive = TRUE;
 QStringList Option::projfile::project_dirs;
@@ -99,2 +99,13 @@ QString Option::mkfile::qmakespec_commandline;
 
+static Option::QMAKE_MODE default_mode(QString progname)
+{
+    int s = progname.findRev(Option::dir_sep);
+    if(s != -1)
+	progname = progname.right(progname.length() - (s + 1));
+    if(progname == "qmakegen")
+	return Option::QMAKE_GENERATE_PROJECT;
+    return Option::QMAKE_GENERATE_MAKEFILE;
+}
+
+QString project_builtin_regx();
 bool usage(const char *a0)
@@ -109,7 +120,7 @@ bool usage(const char *a0)
 	    "Mode:\n"
-	    "\t-project       Put qmake into project file generation mode\n"
+	    "\t-project       Put qmake into project file generation mode%s\n"
 	    "\t               In this mode qmake interprets files as files to\n"
 	    "\t               be built,\n"
-	    "\t               defaults to *.cpp; *.l; *.y; *.ui\n"
-	    "\t-makefile      Put qmake into makefile generation mode (default)\n"
+	    "\t               defaults to %s\n"
+	    "\t-makefile      Put qmake into makefile generation mode%s\n"
 	    "\t               In this mode qmake interprets files as project files to\n"
@@ -138,3 +149,3 @@ bool usage(const char *a0)
 	    "\t-after         All variable assignments after this will be\n"
-	    "\t               parsed after [files]        [makefile mode only]\n"
+	    "\t               parsed after [files]\n"
 	    "\t-cache file    Use file as cache           [makefile mode only]\n"
@@ -145,22 +156,14 @@ bool usage(const char *a0)
 	    "\t-nopwd         Don't look for files in pwd [ project mode only]\n"
-	    "\t-r             Recursive search            [ project mode only]\n"
-	    ,a0);
+	    "\t-norecursive   Don't do a recursive search [ project mode only]\n"
+	    ,a0, 
+	    default_mode(a0) == Option::QMAKE_GENERATE_PROJECT  ? " (default)" : "", project_builtin_regx().latin1(),
+	    default_mode(a0) == Option::QMAKE_GENERATE_MAKEFILE ? " (default)" : "");
     return FALSE;
 }
-static Option::QMAKE_MODE default_mode(QString progname)
-{
-    int s = progname.findRev(Option::dir_sep);
-    if(s != -1)
-	progname = progname.right(progname.length() - (s + 1));
-    if(progname == "qmakegen")
-	return Option::QMAKE_GENERATE_PROJECT;
-    return Option::QMAKE_GENERATE_MAKEFILE;
-}
-
 
 bool
-Option::parseCommandLine(int argc, char **argv)
+Option::internalParseCommandLine(int argc, char **argv, int skip)
 {
     bool before = TRUE;
-    for(int x = 1; x < argc; x++) {
+    for(int x = skip; x < argc; x++) {
 	if(*argv[x] == '-' && strlen(argv[x]) > 1) { /* options */
@@ -181,3 +184,2 @@ Option::parseCommandLine(int argc, char **argv)
 		    specified = FALSE;
-		    Option::qmake_mode = default_mode(argv[0]);
 		}
@@ -206,3 +208,3 @@ Option::parseCommandLine(int argc, char **argv)
 	    } else if(opt == "version" || opt == "v" || opt == "-version") {
-		fprintf(stderr, "Qmake version: %s\n", qmake_version());
+		fprintf(stderr, "Qmake version: %s (Qt %s)\n", qmake_version(), QT_VERSION_STR);
 		fprintf(stderr, "Qmake is free software from Trolltech AS.\n");
@@ -210,3 +212,3 @@ Option::parseCommandLine(int argc, char **argv)
 	    } else if(opt == "h" || opt == "help") {
-		return usage(argv[0]);
+		return FALSE;
 	    } else if(opt == "Wall") {
@@ -246,5 +248,7 @@ Option::parseCommandLine(int argc, char **argv)
 			Option::projfile::do_recursive = TRUE;
+		    } else if(opt == "norecursive") {
+			Option::projfile::do_recursive = FALSE;
 		    } else {
 			fprintf(stderr, "***Unknown option -%s\n", opt.latin1());
-			return usage(argv[0]);
+			return FALSE;
 		    }
@@ -253,5 +257,2 @@ Option::parseCommandLine(int argc, char **argv)
 	} else {
-	    if(x == 1)
-		Option::qmake_mode = default_mode(argv[0]);
-
 	    QString arg = argv[x];
@@ -274,4 +275,65 @@ Option::parseCommandLine(int argc, char **argv)
     }
+    return TRUE;
+}
+
+
+bool
+Option::parseCommandLine(int argc, char **argv)
+{
+    Option::moc_mod = "moc_";
+    Option::lex_mod = "_lex";
+    Option::yacc_mod = "_yacc";
+    Option::prl_ext = ".prl";
+    Option::prf_ext = ".prf";
+    Option::ui_ext = ".ui";
+    Option::h_ext << ".h" << ".hpp" << ".hh" << ".H" << ".hxx";
+    Option::moc_ext = ".moc";
+    Option::cpp_ext << ".cpp" << ".cc" << ".cxx" << ".C";
+    Option::lex_ext = ".l";
+    Option::yacc_ext = ".y";
+
     if(Option::qmake_mode == Option::QMAKE_GENERATE_NOTHING)
 	Option::qmake_mode = default_mode(argv[0]);
+    if(const char *envflags = getenv("QMAKEFLAGS")) {
+	int env_argc = 0, env_size = 0, currlen=0;
+	char quote = 0, **env_argv = NULL;
+	for(int i = 0; envflags[i]; i++) {
+	    if(!quote && (envflags[i] == '\'' || envflags[i] == '"')) {
+		quote = envflags[i];
+	    } else if(envflags[i] == quote) {
+		quote = 0;
+	    } else if(!quote && envflags[i] == ' ') {
+		if(currlen && env_argv && env_argv[env_argc]) {
+		    env_argv[env_argc][currlen] = '\0';
+		    currlen = 0;
+		    env_argc++;
+		}
+	    } else {
+		if(!env_argv || env_argc > env_size) {
+		    env_argv = (char **)realloc(env_argv, sizeof(char *)*(env_size+=10));
+		    for(int i2 = env_argc; i2 < env_size; i2++)
+			env_argv[i2] = NULL;
+		}
+		if(!env_argv[env_argc]) {
+		    currlen = 0;
+		    env_argv[env_argc] = (char*)malloc(255);
+		}
+		if(currlen < 255) 
+		    env_argv[env_argc][currlen++] = envflags[i];
+	    }
+	}
+	if(env_argv[env_argc]) {
+	    env_argv[env_argc][currlen] = '\0';
+	    currlen = 0;
+	    env_argc++;
+	}
+	internalParseCommandLine(env_argc, env_argv);
+	for(int i2 = 0; i2 < env_size; i2++) {
+	    if(env_argv[i2])
+		free(env_argv[i2]);
+	}
+	free(env_argv);
+    }
+    if(!internalParseCommandLine(argc, argv, 1))
+	return usage(argv[0]);
 
@@ -285,8 +347,12 @@ Option::parseCommandLine(int argc, char **argv)
 	if(Option::mkfile::project_files.isEmpty()) {
-	    QString proj = QDir::currentDirPath();
-	    proj = proj.right(proj.length() - (proj.findRev('/') + 1)) + ".pro";
-	    if(QFile::exists(proj))
+	    QString pwd = QDir::currentDirPath(), 
+		   proj = pwd + "/" + pwd.right(pwd.length() - (pwd.findRev('/') + 1)) + ".pro";
+	    if(QFile::exists(proj)) {
 		Option::mkfile::project_files.append(proj);
-	    else
-		return usage(argv[0]);
+	    } else { //last try..
+		QDir d(pwd, "*.pro");
+		if(d.count() != 1)
+		    return usage(argv[0]);
+		Option::mkfile::project_files.append(pwd + "/" + d[0]);
+	    }
 	}
@@ -295,13 +361,2 @@ Option::parseCommandLine(int argc, char **argv)
     //defaults for globals
-    Option::moc_mod = "moc_";
-    Option::lex_mod = "_lex";
-    Option::yacc_mod = "_yacc";
-    Option::prl_ext = ".prl";
-    Option::prf_ext = ".prf";
-    Option::ui_ext = ".ui";
-    Option::h_ext << ".h" << ".hpp" << ".hh" << ".H" << ".hxx";
-    Option::moc_ext = ".moc";
-    Option::cpp_ext << ".cpp" << ".cc" << ".cxx" << ".C";
-    Option::lex_ext = ".l";
-    Option::yacc_ext = ".y";
     if(Option::target_mode == Option::TARG_WIN_MODE) {
@@ -388,9 +443,9 @@ Option::fixPathToTargetOS(const QString& in, bool fix_env, bool canonical)
     QString rep;
-    if(Option::target_mode == TARG_MAC9_MODE)
-	rep = "[/\\\\]";
-    else if(Option::target_mode == TARG_WIN_MODE)
-	rep = "[/]";
-    else
-	rep = "[\\\\]";
-    return tmp.replace(QRegExp(rep), Option::dir_sep);
+    if(Option::target_mode == TARG_MAC9_MODE) 
+	tmp = tmp.replace('/', Option::dir_sep).replace('\\', Option::dir_sep);
+    else if(Option::target_mode == TARG_WIN_MODE) 
+	tmp = tmp.replace('/', Option::dir_sep);
+    else 
+	tmp = tmp.replace('\\', Option::dir_sep);
+    return tmp;
 }
diff --git a/qmake/option.h b/qmake/option.h
index 9a5a85a..8bd348e 100644
--- a/qmake/option.h
+++ b/qmake/option.h
@@ -45,3 +45,3 @@
 #define QMAKE_VERSION_MAJOR 1
-#define QMAKE_VERSION_MINOR 4
+#define QMAKE_VERSION_MINOR 5
 #define QMAKE_VERSION_PATCH 0
@@ -118,2 +118,5 @@ struct Option
     };
+
+private:
+    static bool internalParseCommandLine(int, char **, int=0);
 };
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 44eb503..834823d 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -68,5 +68,10 @@ static QString varMap(const QString &x)
     QString ret(x);
-    ret.replace(QRegExp("^TMAKE"), "QMAKE");
+    if(ret.startsWith("TMAKE")) //tmake no more!
+	ret = "QMAKE" + ret.mid(5);
     if(ret == "INTERFACES")
 	ret = "FORMS";
+    if(ret == "QMAKE_POST_BUILD")
+	ret = "QMAKE_POST_LINK";
+    if(ret == "TARGETDEPS")
+	ret = "POST_TARGETDEPS";
     return ret;
@@ -108,3 +113,3 @@ static QStringList split_value_list(const QString &vals, bool do_semicolon=FALSE
 	    quote.push(vals[x]);
-	} else if(quote.isEmpty() && 
+	} else if(quote.isEmpty() &&
 		  ((do_semicolon && vals[x] == ';') ||  vals[x] == ' ')) {
@@ -124,6 +129,8 @@ QMakeProject::QMakeProject()
 bool
-QMakeProject::parse(QString t, QMap<QString, QStringList> &place)
+QMakeProject::parse(const QString &t, QMap<QString, QStringList> &place)
 {
     QString s = t.simplifyWhiteSpace();
-    s.replace(QRegExp("#.*$"), ""); /* bye comments */
+    int hash_mark = s.find('#');
+    if(hash_mark != -1) //good bye comments
+	s = s.left(hash_mark);
     if(s.isEmpty()) /* blank_line */
@@ -156,13 +163,17 @@ QMakeProject::parse(QString t, QMap<QString, QStringList> &place)
     int parens = 0, scope_count=0;
-    while(*d && *d != '=') {
-	if((*d == '+' || *d == '-' || *d == '*' || *d == '~')) {
-	    if(*(d+1) == '=') {
+    while(*d) {
+	if(!parens) {
+	    if(*d == '=')
 		break;
-	    } else if(*(d+1) == ' ') {
-		const char *k = d + 1;
-		SKIP_WS(k);
-		if(*k == '=') {
-		    QString msg;
-		    qmake_error_msg(*d + "must be followed immediatly by =");
-		    return FALSE;
+	    if(*d == '+' || *d == '-' || *d == '*' || *d == '~') {
+		if(*(d+1) == '=') {
+		    break;
+		} else if(*(d+1) == ' ') {
+		    const char *k = d + 1;
+		    SKIP_WS(k);
+		    if(*k == '=') {
+			QString msg;
+			qmake_error_msg(*d + "must be followed immediately by =");
+			return FALSE;
+		    }
 		}
@@ -219,3 +230,3 @@ QMakeProject::parse(QString t, QMap<QString, QStringList> &place)
 		    } else {
-			test = isActiveConfig(comp_scope.stripWhiteSpace());
+			test = isActiveConfig(comp_scope.stripWhiteSpace(), TRUE);
 		    }
@@ -289,3 +300,3 @@ QMakeProject::parse(QString t, QMap<QString, QStringList> &place)
     /* vallist is the broken up list of values */
-    QStringList vallist = split_value_list(vals, (var == "DEPENDPATH" || var == "INCLUDEPATH")); 
+    QStringList vallist = split_value_list(vals, (var == "DEPENDPATH" || var == "INCLUDEPATH"));
     if(!vallist.grep("=").isEmpty())
@@ -357,3 +368,3 @@ QMakeProject::parse(QString t, QMap<QString, QStringList> &place)
 bool
-QMakeProject::read(QString file, QMap<QString, QStringList> &place)
+QMakeProject::read(const QString &file, QMap<QString, QStringList> &place)
 {
@@ -365,7 +376,7 @@ QMakeProject::read(QString file, QMap<QString, QStringList> &place)
 
-    file = Option::fixPathToLocalOS(file);
-    doVariableReplace(file, place);
+    QString filename = Option::fixPathToLocalOS(file);
+    doVariableReplace(filename, place);
     bool ret = FALSE, using_stdin = FALSE;
     QFile qfile;
-    if(!strcmp(file, "-")) {
+    if(!strcmp(filename, "-")) {
 	qfile.setName("");
@@ -374,3 +385,3 @@ QMakeProject::read(QString file, QMap<QString, QStringList> &place)
     } else {
-	qfile.setName(file);
+	qfile.setName(filename);
 	ret = qfile.open(IO_ReadOnly);
@@ -380,3 +391,3 @@ QMakeProject::read(QString file, QMap<QString, QStringList> &place)
 	QString s, line;
-	parser.file = file;
+	parser.file = filename;
 	parser.line_no = 0;
@@ -386,3 +397,7 @@ QMakeProject::read(QString file, QMap<QString, QStringList> &place)
 	    int prelen = line.length();
-	    line.replace(QRegExp("#.*$"), ""); // bye comments
+	    {
+		int hash_mark = line.find('#');
+		if(hash_mark != -1) //bye comments
+		    line = line.left(hash_mark);
+	    }
 	    if(!line.isEmpty() && line.right(1) == "\\") {
@@ -410,4 +425,11 @@ QMakeProject::read(QString file, QMap<QString, QStringList> &place)
 bool
-QMakeProject::read(QString project, QString)
+QMakeProject::read(const QString &project, const QString &, bool just_project)
 {
+    if(just_project) { //nothing more, nothing less
+	pfile = project;
+	if(pfile != "-" && !QFile::exists(pfile) && pfile.right(4) != ".pro")
+	    pfile += ".pro";
+	return read(pfile, vars);
+    }
+
     if(cfile.isEmpty()) {
@@ -416,2 +438,4 @@ QMakeProject::read(QString project, QString)
 	base_vars["QMAKE_EXT_H"] = Option::h_ext;
+	if(!Option::user_template_prefix.isEmpty())
+	    base_vars["TEMPLATE_PREFIX"] = Option::user_template_prefix;
 
@@ -443,16 +467,5 @@ QMakeProject::read(QString project, QString)
 	/* prefer $QTDIR if it is set */
-	/* prefer QMAKESPECSDIR -cl */
-	
-	if (getenv("QTDIR")) {
+	if (getenv("QTDIR"))
 	    mkspec_roots << getenv("QTDIR");
-	}
 	mkspec_roots << qInstallPathData();
-
-	if (Option::mkfile::qmakespec.isEmpty() && getenv("QMAKESPECSDIR")){
-		QString mkspec = QString(getenv("QMAKESPECSDIR")) + QDir::separator() +
-				 QDir::separator() + "default";
-		if(QFile::exists(mkspec))
-		    Option::mkfile::qmakespec = mkspec;
-	}
-
 	if(Option::mkfile::qmakespec.isEmpty()) {
@@ -466,7 +479,6 @@ QMakeProject::read(QString project, QString)
 	    }
-	}
-
-	if(Option::mkfile::qmakespec.isEmpty()) {
-	    fprintf(stderr, "QMAKESPEC has not been set, so configuration cannot be deduced.\n");
-	    return FALSE;
+	    if(Option::mkfile::qmakespec.isEmpty()) {
+		fprintf(stderr, "QMAKESPEC has not been set, so configuration cannot be deduced.\n");
+		return FALSE;
+	    }
 	}
@@ -546,8 +558,10 @@ QMakeProject::read(QString project, QString)
 
-    if(vars["TEMPLATE"].isEmpty())
-	vars["TEMPLATE"].append(QString("app"));
-    else
-	vars["TEMPLATE"].first().replace(QRegExp("\\.t$"), "");
-    if(!Option::user_template_prefix.isEmpty())
-	vars["TEMPLATE"].first().prepend(Option::user_template_prefix);
+    QStringList &templ = vars["TEMPLATE"];
+    if(templ.isEmpty())
+	templ.append(QString("app"));
+    else if(vars["TEMPLATE"].first().endsWith(".t"))
+	templ = QStringList(templ.first().left(templ.first().length() - 2));
+    if ( !Option::user_template_prefix.isEmpty() ) {
+	templ.first().prepend(Option::user_template_prefix);
+    }
 
@@ -581,3 +595,3 @@ QMakeProject::read(QString project, QString)
 bool
-QMakeProject::isActiveConfig(const QString &x)
+QMakeProject::isActiveConfig(const QString &x, bool regex)
 {
@@ -586,5 +600,4 @@ QMakeProject::isActiveConfig(const QString &x)
 
-    QRegExp re(x, FALSE, TRUE);
-    if((Option::target_mode == Option::TARG_MACX_MODE || Option::target_mode == Option::TARG_QNX6_MODE || Option::target_mode == Option::TARG_UNIX_MODE) &&
-       x == "unix")
+    if((Option::target_mode == Option::TARG_MACX_MODE || Option::target_mode == Option::TARG_QNX6_MODE ||
+	Option::target_mode == Option::TARG_UNIX_MODE) && x == "unix")
 	return TRUE;
@@ -603,5 +616,6 @@ QMakeProject::isActiveConfig(const QString &x)
 
+    QRegExp re(x, FALSE, TRUE);
     QString spec = Option::mkfile::qmakespec.right(Option::mkfile::qmakespec.length() -
 						   (Option::mkfile::qmakespec.findRev(QDir::separator())+1));
-    if(re.exactMatch(spec))
+    if((regex && re.exactMatch(spec)) || (!regex && spec == x))
 	return TRUE;
@@ -618,3 +632,3 @@ QMakeProject::isActiveConfig(const QString &x)
 		r = r.mid(r.findRev('/') + 1);
-	    if(re.exactMatch(r))
+	    if((regex && re.exactMatch(r)) || (!regex && r == x))
 		return TRUE;
@@ -627,2 +641,3 @@ QMakeProject::isActiveConfig(const QString &x)
     for(QStringList::Iterator it = configs.begin(); it != configs.end(); ++it) {
+	if((regex && re.exactMatch((*it))) || (!regex && (*it) == x))
 	if(re.exactMatch((*it)))
@@ -634,3 +649,3 @@ QMakeProject::isActiveConfig(const QString &x)
 bool
-QMakeProject::doProjectTest(QString func, const QString &params, QMap<QString, QStringList> &place)
+QMakeProject::doProjectTest(const QString& func, const QString &params, QMap<QString, QStringList> &place)
 {
@@ -646,3 +661,3 @@ QMakeProject::doProjectTest(QString func, const QString &params, QMap<QString, Q
 bool
-QMakeProject::doProjectTest(QString func, QStringList args, QMap<QString, QStringList> &place)
+QMakeProject::doProjectTest(const QString& func, QStringList args, QMap<QString, QStringList> &place)
 {
@@ -656,2 +671,12 @@ QMakeProject::doProjectTest(QString func, QStringList args, QMap<QString, QStrin
 	return doProjectCheckReqs(args, place);
+    } else if(func == "equals") {
+	if(args.count() != 2) {
+	    fprintf(stderr, "%s:%d: equals(variable, value) requires two arguments.\n", parser.file.latin1(),
+		    parser.line_no);
+	    return FALSE;
+	}
+	QString value = args[1];
+	if((value.left(1) == "\"" || value.left(1) == "'") && value.right(1) == value.left(1))
+	    value = value.mid(1, value.length()-2);
+	return vars[args[0]].join(" ") == value;
     } else if(func == "exists") {
@@ -693,3 +718,3 @@ QMakeProject::doProjectTest(QString func, QStringList args, QMap<QString, QStrin
 	for(QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
-	    if(regx.exactMatch((*it))) 
+	    if(regx.exactMatch((*it)))
 		return TRUE;
@@ -807,4 +832,7 @@ QMakeProject::doProjectTest(QString func, QStringList args, QMap<QString, QStrin
 	bool r = read(file.latin1(), place);
-	if(r) 
+	if(r)
 	    vars["QMAKE_INTERNAL_INCLUDED_FILES"].append(file);
+	else
+	    warn_msg(WarnParser, "%s:%d: Failure to include file %s.",
+		     pi.file.latin1(), pi.line_no, file.latin1());
 	parser = pi;
@@ -821,2 +849,7 @@ QMakeProject::doProjectTest(QString func, QStringList args, QMap<QString, QStrin
 	QString msg = args.first();
+	if((msg.startsWith("\"") || msg.startsWith("'")) && msg.endsWith(msg.left(1)))
+	    msg = msg.mid(1, msg.length()-2);
+	msg.replace(QString("${QMAKE_FILE}"), parser.file.latin1());
+	msg.replace(QString("${QMAKE_LINE_NUMBER}"), QString::number(parser.line_no));
+	msg.replace(QString("${QMAKE_DATE}"), QDateTime::currentDateTime().toString());
 	doVariableReplace(msg, place);
@@ -859,3 +892,3 @@ QMakeProject::doProjectCheckReqs(const QStringList &deps, QMap<QString, QStringL
 	} else {
-	    test = isActiveConfig(chk);
+	    test = isActiveConfig(chk, TRUE);
 	}
@@ -879,114 +912,164 @@ QMakeProject::doVariableReplace(QString &str, const QMap<QString, QStringList> &
 {
-    for(int x = 0, rep; x < 5; x++) {
-	QRegExp reg_var;
-	reg_var.setMinimal(TRUE);
-	if( x == 0 ) //function blocked out by {}'s
-	    reg_var = QRegExp("\\$\\$\\{([a-zA-Z0-9_]*)\\((\\(.|(.*)\\)*)\\)\\}");
-	else if( x == 1 ) //variables blocked out by {}'s
-	    reg_var = QRegExp("\\$\\$\\{([a-zA-Z0-9_\\.-]*)\\}");
-	else if(x == 2) //environment
-	    reg_var = QRegExp("\\$\\$\\(([a-zA-Z0-9_\\.-]*)\\)");
-	else if(x == 3) //function
-	    reg_var = QRegExp("\\$\\$([a-zA-Z0-9_]*)\\((\\(.|(.*)\\)*)\\)");
-	else if(x == 4) //normal variable
-	    reg_var = QRegExp("\\$\\$([a-zA-Z0-9_\\.-]*)");
-	while((rep = reg_var.search(str)) != -1) {
-	    QString replacement;
-	    if(x == 2) {//environment
-		replacement = getenv(reg_var.cap(1));
-	    } else if(x == 0 || x == 3) { //function
-		QStringList args = split_arg_list(reg_var.cap(2));
-		for(QStringList::Iterator arit = args.begin(); arit != args.end(); ++arit) {
-		    (*arit) = (*arit).stripWhiteSpace(); // blah, get rid of space
-		    doVariableReplace((*arit), place);
-		}
-		debug_msg(1, "Running function: %s( %s )", reg_var.cap(1).latin1(), args.join("::").latin1());
-		if(reg_var.cap(1).lower() == "member") {
-		    if(args.count() < 1 || args.count() > 2) {
-			fprintf(stderr, "%s:%d: member(var, place) requires two arguments.\n",
-				parser.file.latin1(), parser.line_no);
-		    } else {
-			uint pos = 0;
-			if(args.count() == 2)
-			    pos = args[1].toInt();
-			const QStringList &var = place[varMap(args.first())];
-			if(var.count() >= pos)
-			    replacement = var[pos];
-		    }
-		} else if(reg_var.cap(1).lower() == "list") {
-		    if(args.count() != 1) {
-			fprintf(stderr, "%s:%d: list(vals) requires one"
-				"argument.\n", parser.file.latin1(), parser.line_no);
-		    } else {
-			static int x = 0;
-			replacement.sprintf(".QMAKE_INTERNAL_TMP_VAR_%d", x++);
-			(*((QMap<QString, QStringList>*)&place))[replacement] = split_value_list(args.first());
-		    }
-		} else if(reg_var.cap(1).lower() == "join") {
-		    if(args.count() < 1 || args.count() > 4) {
-			fprintf(stderr, "%s:%d: join(var, glue, before, after) requires four"
-				"arguments.\n", parser.file.latin1(), parser.line_no);
-		    } else {
-			QString glue, before, after;
-			if(args.count() >= 2)
-			    glue = args[1].replace("\"", "" );
-			if(args.count() >= 3)
-			    before = args[2].replace("\"", "" );
-			if(args.count() == 4)
-			    after = args[3].replace("\"", "" );
-			const QStringList &var = place[varMap(args.first())];
-			if(!var.isEmpty())
-			    replacement = before + var.join(glue) + after;
+    for(int var_begin, var_last=0; (var_begin = str.find("$$", var_last)) != -1; var_last = var_begin) {
+	if(var_begin >= int( str.length() + 2 ) ) {
+	    break;
+	} else if(var_begin != 0 && str[var_begin-1] == '\\') {
+	    str.replace(var_begin-1, 1, "");
+	    var_begin += 1;
+	    continue;
+	}
+
+	int var_incr = var_begin + 2;
+	bool in_braces = FALSE, as_env = FALSE;
+	if(str[var_incr] == '{') {
+	    in_braces = TRUE;
+	    var_incr++;
+	    while(var_incr < int( str.length() ) &&
+		  (str[var_incr] == ' ' || str[var_incr] == '\t' || str[var_incr] == '\n'))
+		var_incr++;
+	}
+	if(str[var_incr] == '(') {
+	    as_env = TRUE;
+	    var_incr++;
+	}
+	QString val, args;
+	while(var_incr < int( str.length() ) &&
+	      (str[var_incr].isLetter() || str[var_incr].isNumber() || str[var_incr] == '.' || str[var_incr] == '_'))
+	    val += str[var_incr++];
+	if(as_env) {
+	    if(str[var_incr] != ')') {
+		var_incr++;
+		warn_msg(WarnParser, "%s:%d: Unterminated env-variable replacement '%s' (%s)",
+			 parser.file.latin1(), parser.line_no,
+			 str.mid(var_begin, QMAX(var_incr - var_begin, int(str.length()))).latin1(), str.latin1());
+		var_begin += var_incr;
+		continue;
+	    }
+	    var_incr++;
+	} else if(str[var_incr] == '(') { //args
+	    for(int parens = 0; var_incr < int( str.length() ); var_incr++) {
+		if(str[var_incr] == '(') {
+		    parens++;
+		    if(parens == 1)
+			continue;
+		} else if(str[var_incr] == ')') {
+		    parens--;
+		    if(!parens) {
+			var_incr++;
+			break;
 		    }
-		} else if(reg_var.cap(1).lower() == "find") {
-		    if(args.count() != 2) {
-			fprintf(stderr, "%s:%d find(var, str) requires two arguments\n",
-				parser.file.latin1(), parser.line_no);
-		    } else {
-			QRegExp regx(args[1]);
-			const QStringList &var = place[varMap(args.first())];
-			for(QStringList::ConstIterator vit = var.begin();
-			    vit != var.end(); ++vit) {
-			    if(regx.search(*vit) != -1) {
-				if(!replacement.isEmpty())
-				    replacement += " ";
-				replacement += (*vit);
-			    }
+		}
+		args += str[var_incr];
+	    }
+	}
+	if(var_incr > int( str.length() ) || (in_braces && str[var_incr] != '}')) {
+	    var_incr++;
+	    warn_msg(WarnParser, "%s:%d: Unterminated variable replacement '%s' (%s)",
+		     parser.file.latin1(), parser.line_no,
+		     str.mid(var_begin, QMAX(var_incr - var_begin, int( str.length() ))).latin1(), str.latin1());
+	    var_begin += var_incr;
+	    continue;
+	} else if(in_braces) {
+	    var_incr++;
+	}
+
+	QString replacement;
+	if(as_env) {
+	    replacement = getenv(val);
+	} else if(args.isEmpty()) {
+	    if(val.left(1) == ".")
+		replacement = "";
+	    else if(val == "LITERAL_WHITESPACE")
+		replacement = "\t";
+	    else
+		replacement = place[varMap(val)].join(" ");
+	} else {
+	    QStringList arg_list = split_arg_list(args);
+	    for(QStringList::Iterator arit = arg_list.begin(); arit != arg_list.end(); ++arit) {
+		(*arit) = (*arit).stripWhiteSpace(); // blah, get rid of space
+		doVariableReplace((*arit), place);
+	    }
+	    debug_msg(1, "Running function: %s( %s )", val.latin1(), arg_list.join("::").latin1());
+	    if(val.lower() == "member") {
+		if(arg_list.count() < 1 || arg_list.count() > 2) {
+		    fprintf(stderr, "%s:%d: member(var, place) requires two arguments.\n",
+			    parser.file.latin1(), parser.line_no);
+		} else {
+		    uint pos = 0;
+		    if(arg_list.count() == 2)
+			pos = arg_list[1].toInt();
+		    const QStringList &var = place[varMap(arg_list.first())];
+		    if(var.count() >= pos)
+			replacement = var[pos];
+		}
+	    } else if(val.lower() == "list") {
+		static int x = 0;
+		replacement.sprintf(".QMAKE_INTERNAL_TMP_VAR_%d", x++);
+		QStringList &lst = (*((QMap<QString, QStringList>*)&place))[replacement];
+		lst.clear();
+		for(QStringList::ConstIterator arg_it = arg_list.begin();
+		    arg_it != arg_list.end(); ++arg_it) 
+		    lst += split_value_list((*arg_it));
+	    } else if(val.lower() == "join") {
+		if(arg_list.count() < 1 || arg_list.count() > 4) {
+		    fprintf(stderr, "%s:%d: join(var, glue, before, after) requires four"
+			    "arguments.\n", parser.file.latin1(), parser.line_no);
+		} else {
+		    QString glue, before, after;
+		    if(arg_list.count() >= 2)
+			glue = arg_list[1].replace("\"", "" );
+		    if(arg_list.count() >= 3)
+			before = arg_list[2].replace("\"", "" );
+		    if(arg_list.count() == 4)
+			after = arg_list[3].replace("\"", "" );
+		    const QStringList &var = place[varMap(arg_list.first())];
+		    if(!var.isEmpty())
+			replacement = before + var.join(glue) + after;
+		}
+	    } else if(val.lower() == "find") {
+		if(arg_list.count() != 2) {
+		    fprintf(stderr, "%s:%d find(var, str) requires two arguments\n",
+			    parser.file.latin1(), parser.line_no);
+		} else {
+		    QRegExp regx(arg_list[1]);
+		    const QStringList &var = place[varMap(arg_list.first())];
+		    for(QStringList::ConstIterator vit = var.begin();
+			vit != var.end(); ++vit) {
+			if(regx.search(*vit) != -1) {
+			    if(!replacement.isEmpty())
+				replacement += " ";
+			    replacement += (*vit);
 			}
 		    }
-		} else if(reg_var.cap(1).lower() == "system") {
-		    if(args.count() != 1) {
-			fprintf(stderr, "%s:%d system(execut) requires one argument\n",
-				parser.file.latin1(), parser.line_no);
-		    } else {
-			char buff[256];
-			FILE *proc = QT_POPEN(args.join(" ").latin1(), "r");
-			while(proc && !feof(proc)) {
-			    int read_in = fread(buff, 1, 255, proc);
-			    if(!read_in)
-				break;
-			    for(int i = 0; i < read_in; i++) {
-				if(buff[i] == '\n' || buff[i] == '\t')
-				    buff[i] = ' ';
-			    }
-			    buff[read_in] = '\0';
-			    replacement += buff;
+		}
+	    } else if(val.lower() == "system") {
+		if(arg_list.count() != 1) {
+		    fprintf(stderr, "%s:%d system(execut) requires one argument\n",
+			    parser.file.latin1(), parser.line_no);
+		} else {
+		    char buff[256];
+		    FILE *proc = QT_POPEN(arg_list.join(" ").latin1(), "r");
+		    while(proc && !feof(proc)) {
+			int read_in = fread(buff, 1, 255, proc);
+			if(!read_in)
+			    break;
+			for(int i = 0; i < read_in; i++) {
+			    if(buff[i] == '\n' || buff[i] == '\t')
+				buff[i] = ' ';
 			}
+			buff[read_in] = '\0';
+			replacement += buff;
 		    }
-		} else {
-		    fprintf(stderr, "%s:%d: Unknown replace function: %s\n",
-			    parser.file.latin1(), parser.line_no, reg_var.cap(1).latin1());
 		}
-	    } else { //variable
-		if(reg_var.cap(1).left(1) == ".")
-		    replacement = "";
-		else if(reg_var.cap(1) == "LITERAL_WHITESPACE")
-		    replacement = "\t";
-		else
-		    replacement = place[varMap(reg_var.cap(1))].join(" ");
+	    } else {
+		fprintf(stderr, "%s:%d: Unknown replace function: %s\n",
+			parser.file.latin1(), parser.line_no, val.latin1());
 	    }
-	    debug_msg(2, "Project parser: %d (%s) :: %s -> %s", x, str.latin1(),
-		      reg_var.capturedTexts().join("::").latin1(), replacement.latin1());
-	    str.replace(rep, reg_var.matchedLength(), replacement);
 	}
+	//actually do replacement now..
+	int mlen = var_incr - var_begin;
+	debug_msg(2, "Project Parser [var replace]: '%s' :: %s -> %s", str.latin1(),
+		  str.mid(var_begin, mlen).latin1(), replacement.latin1());
+	str.replace(var_begin, mlen, replacement);
+	var_begin += replacement.length();
     }
diff --git a/qmake/project.h b/qmake/project.h
index 201e63c..ec19f0c 100644
--- a/qmake/project.h
+++ b/qmake/project.h
@@ -7,3 +7,3 @@
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
@@ -36,4 +36,4 @@
 **********************************************************************/
-#ifndef __QMAKE_H__
-#define __QMAKE_H__
+#ifndef __PROJECT_H__
+#define __PROJECT_H__
 
@@ -50,5 +50,5 @@ class QMakeProject
     QMap<QString, QStringList> vars, base_vars, cache;
-    bool parse(QString text, QMap<QString, QStringList> &place);
-    bool doProjectTest(QString func, const QString &params, QMap<QString, QStringList> &place);
-    bool doProjectTest(QString func, QStringList args, QMap<QString, QStringList> &place);
+    bool parse(const QString &text, QMap<QString, QStringList> &place);
+    bool doProjectTest(const QString &func, const QString &params, QMap<QString, QStringList> &place);
+    bool doProjectTest(const QString &func, QStringList args, QMap<QString, QStringList> &place);
     bool doProjectCheckReqs(const QStringList &deps, QMap<QString, QStringList> &place);
@@ -59,3 +59,3 @@ public:
 
-    bool read(QString project, QString pwd);
+    bool read(const QString &project, const QString &pwd, bool just_project=FALSE);
     QString projectFile();
@@ -67,3 +67,3 @@ public:
     QMap<QString, QStringList> &variables();
-    bool isActiveConfig(const QString &x);
+    bool isActiveConfig(const QString &x, bool regex=FALSE);
 
@@ -71,3 +71,3 @@ protected:
     friend class MakefileGenerator;
-    bool read(QString file, QMap<QString, QStringList> &place);
+    bool read(const QString &file, QMap<QString, QStringList> &place);
 
@@ -113,2 +113,2 @@ inline QMap<QString, QStringList> &QMakeProject::variables()
 
-#endif /* __QMAKE_H__ */
+#endif /* __PROJECT_H__ */
diff --git a/qmake/tools/qbitarray.cpp b/qmake/tools/qbitarray.cpp
index 4f4e14b..1aaf963 100644
--- a/qmake/tools/qbitarray.cpp
+++ b/qmake/tools/qbitarray.cpp
@@ -199,3 +199,4 @@ void QBitArray::pad0()
     Resizes the bit array to \a size bits and returns TRUE if the bit
-    array could be resized; otherwise returns FALSE.
+    array could be resized; otherwise returns FALSE. The array becomes
+    a null array if \a size == 0.
 
diff --git a/qmake/tools/qbuffer.cpp b/qmake/tools/qbuffer.cpp
index b213dd9..0fc90e4 100644
--- a/qmake/tools/qbuffer.cpp
+++ b/qmake/tools/qbuffer.cpp
@@ -198,4 +198,4 @@ bool QBuffer::open( int m  )
     if ( m & IO_Truncate ) {                    // truncate buffer
-        a.resize( 0 );
-        a_len = 0;
+        a.resize( 1 );
+        a_len = 1;
     }
diff --git a/qmake/tools/qcomlibrary.cpp b/qmake/tools/qcomlibrary.cpp
index a7162fc..2a1b75a 100644
--- a/qmake/tools/qcomlibrary.cpp
+++ b/qmake/tools/qcomlibrary.cpp
@@ -65,2 +65,6 @@ QComLibrary::~QComLibrary()
 	unload();
+    if ( libiface )
+	libiface->release();
+    if ( entry )
+	entry->release();
 }
@@ -393,25 +397,23 @@ void QComLibrary::createInstanceInternal()
 
-    if ( ! query_done ) {
-
 #ifdef QT_THREAD_SUPPORT
-	QMutexLocker locker( qt_global_mutexpool->get( &cache ) );
+    QMutexLocker locker( qt_global_mutexpool ?
+			 qt_global_mutexpool->get( &cache ) : 0 );
 #endif // QT_THREAD_SUPPORT
 
-	if ( ! cache ) {
-	    cache = new QSettings;
-	    cache->insertSearchPath( QSettings::Windows, "/Trolltech" );
-	    cleanup_cache.set( &cache );
-	}
+    if ( ! cache ) {
+	cache = new QSettings;
+	cache->insertSearchPath( QSettings::Windows, "/Trolltech" );
+	cleanup_cache.set( &cache );
+    }
 
-	reg = cache->readListEntry( regkey );
-	if ( reg.count() == 4 ) {
-	    // check timestamp
-	    if ( lastModified == reg[3] ) {
-		qt_version = reg[0].toUInt(0, 16);
-		flags = reg[1].toUInt(0, 16);
-		key = reg[2].latin1();
+    reg = cache->readListEntry( regkey );
+    if ( reg.count() == 4 ) {
+	// check timestamp
+	if ( lastModified == reg[3] ) {
+	    qt_version = reg[0].toUInt(0, 16);
+	    flags = reg[1].toUInt(0, 16);
+	    key = reg[2].latin1();
 
-		query_done = TRUE;
-		warn_mismatch = FALSE;
-	    }
+	    query_done = TRUE;
+	    warn_mismatch = FALSE;
 	}
@@ -463,7 +465,2 @@ void QComLibrary::createInstanceInternal()
     if ( queried != reg ) {
-
-#ifdef QT_THREAD_SUPPORT
-	QMutexLocker locker( qt_global_mutexpool->get( &cache ) );
-#endif // QT_THREAD_SUPPORT
-
 	cache->writeEntry( regkey, queried );
diff --git a/qmake/tools/qconfig.cpp b/qmake/tools/qconfig.cpp
index 433827c..5297a4e 100644
--- a/qmake/tools/qconfig.cpp
+++ b/qmake/tools/qconfig.cpp
@@ -2,9 +2,9 @@
 
-static const char QT_INSTALL_PREFIX [256] = "/usr/src/coding/projects/userspace/qt-embedded-free-3.1.0-b2";
-static const char QT_INSTALL_BINS   [256] = "/usr/src/coding/projects/userspace/qt-embedded-free-3.1.0-b2/bin";
-static const char QT_INSTALL_DOCS   [256] = "/usr/src/coding/projects/userspace/qt-embedded-free-3.1.0-b2/doc";
-static const char QT_INSTALL_HEADERS[256] = "/usr/src/coding/projects/userspace/qt-embedded-free-3.1.0-b2/include";
-static const char QT_INSTALL_LIBS   [256] = "/usr/src/coding/projects/userspace/qt-embedded-free-3.1.0-b2/lib";
-static const char QT_INSTALL_PLUGINS[256] = "/usr/src/coding/projects/userspace/qt-embedded-free-3.1.0-b2/plugins";
-static const char QT_INSTALL_DATA   [256] = "/usr/src/coding/projects/userspace/qt-embedded-free-3.1.0-b2";
+static const char QT_INSTALL_PREFIX [256] = "/opt/qt-x11-free-3.1.2";
+static const char QT_INSTALL_BINS   [256] = "/opt/qt-x11-free-3.1.2/bin";
+static const char QT_INSTALL_DOCS   [256] = "/opt/qt-x11-free-3.1.2/doc";
+static const char QT_INSTALL_HEADERS[256] = "/opt/qt-x11-free-3.1.2/include";
+static const char QT_INSTALL_LIBS   [256] = "/opt/qt-x11-free-3.1.2/lib";
+static const char QT_INSTALL_PLUGINS[256] = "/opt/qt-x11-free-3.1.2/plugins";
+static const char QT_INSTALL_DATA   [256] = "/opt/qt-x11-free-3.1.2";
 
diff --git a/qmake/tools/qcriticalsection_p.cpp b/qmake/tools/qcriticalsection_p.cpp
index 60fc8bd..c375730 100644
--- a/qmake/tools/qcriticalsection_p.cpp
+++ b/qmake/tools/qcriticalsection_p.cpp
@@ -5,4 +5,2 @@
 **
-** Created : 
-**
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
diff --git a/qmake/tools/qcstring.cpp b/qmake/tools/qcstring.cpp
index cf1b853..4651b97 100644
--- a/qmake/tools/qcstring.cpp
+++ b/qmake/tools/qcstring.cpp
@@ -143,2 +143,13 @@ char *qstrncpy( char *dst, const char *src, uint len )
 /*!
+    \fn uint qstrlen( const char *str );
+
+    \relates QCString
+
+    A safe strlen function.
+
+    Returns the number of characters that precede the terminating '\0'.
+    or 0 if \a str is 0.
+*/
+
+/*!
     \fn int qstrcmp( const char *str1, const char *str2 );
@@ -301,3 +312,4 @@ Q_UINT16 qChecksum( const char *data, uint len )
 #ifdef QT_THREAD_SUPPORT
-	QMutexLocker locker( qt_global_mutexpool->get( &crc_tbl_init ) );
+	QMutexLocker locker( qt_global_mutexpool ?
+			     qt_global_mutexpool->get( &crc_tbl_init ) : 0 );
 #endif // QT_THREAD_SUPPORT
@@ -321,5 +333,11 @@ Q_UINT16 qChecksum( const char *data, uint len )
 
-/*! \fn QByteArray qCompress( const QByteArray& data)
-  \relates QByteArray
-  \overload
+/*!
+    \fn QByteArray qCompress( const QByteArray& data )
+
+    \relates QByteArray
+
+    Compresses the array \a data and returns the compressed byte
+    array.
+
+    \sa qUncompress()
 */
@@ -327,8 +345,8 @@ Q_UINT16 qChecksum( const char *data, uint len )
 /*!
-  \relates QByteArray
+    \relates QByteArray
 
-  Compresses the array \a data which is \a nbytes long and returns the
-  compressed byte array.
+    \overload
 
-  \sa qUncompress()
+    Compresses the array \a data which is \a nbytes long and returns the
+    compressed byte array.
 */
@@ -381,5 +399,19 @@ QByteArray qCompress( const uchar* data, int nbytes )
 
-/*! \fn QByteArray qUncompress( const QByteArray& data )
-  \relates QByteArray
-  \overload
+/*!
+    \fn QByteArray qUncompress( const QByteArray& data )
+
+    \relates QByteArray
+
+    Uncompresses the array \a data and returns the uncompressed byte
+    array.
+
+    Returns an empty QByteArray if the input data was corrupt.
+    \omit
+    ADD THE FOLLOWING FOR Qt 4.0
+    This function will uncompress data compressed with qCompress()
+    from this and any earlier Qt version, back to Qt 3.1 when this
+    feature was added.
+    \endomit
+
+    \sa qCompress()
 */
@@ -387,10 +419,8 @@ QByteArray qCompress( const uchar* data, int nbytes )
 /*!
-  \relates QByteArray
-
-  Uncompresses the array \a data which is \a nbytes long and returns
-  the uncompressed byte array.
+    \relates QByteArray
 
-  Returns an empty QByteArray if the input data was corrupt.
+    \overload
 
-  \sa qCompress()
+    Uncompresses the array \a data which is \a nbytes long and returns
+    the uncompressed byte array.
 */
@@ -938,2 +968,7 @@ int QCString::find( const char *str, int index, bool cs ) const
 {
+    return find( str, index, cs, length() );
+}
+
+int QCString::find( const char *str, int index, bool cs, uint l ) const
+{
     if ( (uint)index >= size() )
@@ -944,3 +979,2 @@ int QCString::find( const char *str, int index, bool cs ) const
 	return index;
-    const uint l = length();
     const uint sl = qstrlen( str );
@@ -1154,4 +1188,5 @@ int QCString::contains( const char *str, bool cs ) const
     int i = -1;
+    uint l = length();
     // use find for the faster hashing algorithm
-    while ( ( i = find ( str, i+1, cs ) ) != -1 )
+    while ( ( i = find ( str, i+1, cs, l ) ) != -1 )
 	count++;
@@ -1175,3 +1210,2 @@ int QCString::contains( const char *str, bool cs ) const
 */
-
 QCString QCString::left( uint len ) const
@@ -1499,3 +1533,3 @@ QCString &QCString::insert( uint index, const char *s )
 	detach();
-	if ( QByteArray::resize(nlen+index-olen+1) ) {
+	if ( QByteArray::resize(nlen+index-olen+1, QByteArray::SpeedOptim ) ) {
 	    memset( data()+olen, ' ', index-olen );
@@ -1503,6 +1537,8 @@ QCString &QCString::insert( uint index, const char *s )
 	}
-    } else if ( QByteArray::resize(nlen+1) ) {	// normal insert
+    } else {
 	detach();
-	memmove( data()+index+len, data()+index, olen-index+1 );
-	memcpy( data()+index, s, len );
+	if ( QByteArray::resize(nlen+1, QByteArray::SpeedOptim ) ) {	// normal insert
+	    memmove( data()+index+len, data()+index, olen-index+1 );
+	    memcpy( data()+index, s, len );
+	}
     }
@@ -1571,3 +1607,3 @@ QCString &QCString::remove( uint index, uint len )
 	memmove( data()+index, data()+index+len, olen-index-len+1 );
-	QByteArray::resize(olen-len+1);
+	QByteArray::resize(olen-len+1, QByteArray::SpeedOptim );
     }
@@ -1633,2 +1669,3 @@ QCString &QCString::replace( char c, const char *after )
 */
+
 QCString &QCString::replace( const char *before, const char *after )
@@ -1648,3 +1685,3 @@ QCString &QCString::replace( const char *before, const char *after )
 	if ( bl ) {
-	    while( (index = find( before, index ) ) != -1 ) {
+	    while( (index = find( before, index, TRUE, len ) ) != -1 ) {
 		memcpy( d+index, after, al );
@@ -1657,3 +1694,3 @@ QCString &QCString::replace( const char *before, const char *after )
 	uint num = 0;
-	while( (index = find( before, index ) ) != -1 ) {
+	while( (index = find( before, index, TRUE, len ) ) != -1 ) {
 	    if ( num ) {
@@ -1688,3 +1725,3 @@ QCString &QCString::replace( const char *before, const char *after )
 	    while( pos < 4095 ) {
-		index = find(before, index);
+		index = find(before, index, TRUE, len);
 		if ( index == -1 )
@@ -1765,3 +1802,3 @@ int QCString::find( const QRegExp& rx, int index ) const
 {
-    QString d = QString::fromLatin1( data() );
+    QString d = QString::fromAscii( data() );
     return d.find( rx, index );
@@ -1785,3 +1822,3 @@ int QCString::findRev( const QRegExp& rx, int index ) const
 {
-    QString d = QString::fromLatin1( data() );
+    QString d = QString::fromAscii( data() );
     return d.findRev( rx, index );
@@ -1810,3 +1847,3 @@ int QCString::contains( const QRegExp &rx ) const
 {
-    QString d = QString::fromLatin1( data() );
+    QString d = QString::fromAscii( data() );
     return d.contains( rx );
@@ -1840,4 +1877,4 @@ QCString &QCString::replace( const QRegExp &rx, const char *str )
 {
-    QString d = QString::fromLatin1( data() );
-    QString r = QString::fromLatin1( str );
+    QString d = QString::fromAscii( data() );
+    QString r = QString::fromAscii( str );
     d.replace( rx, r );
@@ -2201,3 +2238,3 @@ QCString& QCString::operator+=( const char *str )
     uint len2 = qstrlen(str);
-    if ( !QByteArray::resize( len1 + len2 + 1 ) )
+    if ( !QByteArray::resize( len1 + len2 + 1, QByteArray::SpeedOptim ) )
 	return *this;				// no memory
@@ -2217,3 +2254,3 @@ QCString &QCString::operator+=( char c )
     uint len = length();
-    if ( !QByteArray::resize( len + 2 ) )
+    if ( !QByteArray::resize( len + 2, QByteArray::SpeedOptim  ) )
 	return *this;				// no memory
diff --git a/qmake/tools/qdatastream.cpp b/qmake/tools/qdatastream.cpp
index 9c573c7..51a1448 100644
--- a/qmake/tools/qdatastream.cpp
+++ b/qmake/tools/qdatastream.cpp
@@ -752,4 +752,12 @@ QDataStream &QDataStream::readRawBytes( char *s, uint len )
 	register Q_INT8 *p = (Q_INT8*)s;
-	while ( len-- )
-	    *this >> *p++;
+	if ( version() < 4 ) {
+	    while ( len-- ) {
+		Q_INT32 tmp;
+		*this >> tmp;
+		*p++ = tmp;
+	    }
+	} else {
+	    while ( len-- )
+		*this >> *p++;
+	}
     } else {					// read data char array
@@ -1014,5 +1022,11 @@ QDataStream &QDataStream::writeRawBytes( const char *s, uint len )
     if ( printable ) {				// write printable
-	register Q_INT8 *p = (Q_INT8*)s;
-	while ( len-- )
-	    *this << *p++;
+	if ( version() < 4 ) {
+	    register char *p = (char *)s;
+	    while ( len-- )
+		*this << *p++;
+	} else {
+	    register Q_INT8 *p = (Q_INT8*)s;
+	    while ( len-- )
+		*this << *p++;
+	}
     } else {					// write data char array
diff --git a/qmake/tools/qdatetime.cpp b/qmake/tools/qdatetime.cpp
index 93e40a8..3137877 100644
--- a/qmake/tools/qdatetime.cpp
+++ b/qmake/tools/qdatetime.cpp
@@ -7,3 +7,3 @@
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
@@ -37,3 +37,2 @@
 
-// Get the system specific includes and defines
 #include "qplatformdefs.h"
@@ -897,2 +896,8 @@ QDate QDate::addYears( int nyears ) const
     y += nyears;
+
+    QDate tmp(y,m,1);
+    
+    if( d > tmp.daysInMonth() )
+	d = tmp.daysInMonth();
+
     QDate date(y, m, d);
@@ -992,2 +997,3 @@ QDate QDate::currentDate( Qt::TimeSpec ts )
 #else
+    // posix compliant system
     time_t ltime;
@@ -995,6 +1001,17 @@ QDate QDate::currentDate( Qt::TimeSpec ts )
     tm *t;
+
+#  if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
+    // use the reentrant versions of localtime() and gmtime() where available
+    tm res;
+    if ( ts == Qt::LocalTime )
+	t = localtime_r( &ltime, &res );
+    else
+	t = gmtime_r( &ltime, &res );
+#  else
     if ( ts == Qt::LocalTime )
 	t = localtime( &ltime );
-    else		
+    else
 	t = gmtime( &ltime );
+#  endif // QT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS
+
     d.jd = gregorianToJulian( t->tm_year + 1900, t->tm_mon + 1, t->tm_mday );
@@ -1557,3 +1574,3 @@ int QTime::msecsTo( const QTime &t ) const
 
-/*!  
+/*!
     \overload
@@ -1655,2 +1672,3 @@ bool QTime::currentTime( QTime *ct, Qt::TimeSpec ts )
 #elif defined(Q_OS_UNIX)
+    // posix compliant system
     struct timeval tv;
@@ -1659,7 +1677,17 @@ bool QTime::currentTime( QTime *ct, Qt::TimeSpec ts )
     tm *t;
-    if ( ts == Qt::LocalTime ) {
+
+#  if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
+    // use the reentrant versions of localtime() and gmtime() where available
+    tm res;
+    if ( ts == Qt::LocalTime )
+	t = localtime_r( &ltime, &res );
+    else
+	t = gmtime_r( &ltime, &res );
+#  else
+    if ( ts == Qt::LocalTime )
 	t = localtime( &ltime );
-    } else {
+    else
 	t = gmtime( &ltime );
-    }
+#  endif // QT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS
+
     ct->ds = (uint)( MSECS_PER_HOUR * t->tm_hour + MSECS_PER_MIN * t->tm_min +
@@ -1670,3 +1698,3 @@ bool QTime::currentTime( QTime *ct, Qt::TimeSpec ts )
     tm *t;
-    if ( ts == Qt::LocalTime ) 
+    if ( ts == Qt::LocalTime )
 	localtime( &ltime );
@@ -1708,5 +1736,5 @@ bool QTime::isValid( int h, int m, int s, int ms )
     QTime t;
-    t.start();                     // start clock
-    ... // some lengthy task
-    qDebug( "%d\n", t.elapsed() ); // prints the number of msecs elapsed
+    t.start();
+    some_lengthy_task();
+    qDebug( "Time elapsed: %d ms", t.elapsed() );
     \endcode
@@ -1962,2 +1990,18 @@ void QDateTime::setTime_t( uint secsSince1Jan1970UTC, Qt::TimeSpec ts )
     tm *brokenDown = 0;
+
+#if defined(Q_OS_UNIX) && defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
+    // posix compliant system
+    // use the reentrant versions of localtime() and gmtime() where available
+    tm res;
+    if ( ts == Qt::LocalTime )
+	brokenDown = localtime_r( &tmp, &res );
+    if ( !brokenDown ) {
+	brokenDown = gmtime_r( &tmp, &res );
+	if ( !brokenDown ) {
+	    d.jd = QDate::gregorianToJulian( 1970, 1, 1 );
+	    t.ds = 0;
+	    return;
+	}
+    }
+#else
     if ( ts == Qt::LocalTime )
@@ -1972,2 +2016,4 @@ void QDateTime::setTime_t( uint secsSince1Jan1970UTC, Qt::TimeSpec ts )
     }
+#endif
+
     d.jd = QDate::gregorianToJulian( brokenDown->tm_year + 1900,
@@ -2302,3 +2348,3 @@ bool QDateTime::operator>=( const QDateTime &dt ) const
     \overload
-    
+
     Returns the current datetime, as reported by the system clock.
diff --git a/qmake/tools/qdir.cpp b/qmake/tools/qdir.cpp
index 418ea49..5714878 100644
--- a/qmake/tools/qdir.cpp
+++ b/qmake/tools/qdir.cpp
@@ -7,3 +7,3 @@
 **
-** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
 **
@@ -45,5 +45,9 @@
 #include "qstringlist.h"
-#include <stdlib.h>
-#include <ctype.h>
+#include <limits.h>
 
+#if defined(Q_FS_FAT) && !defined(Q_OS_UNIX)
+const bool CaseSensitiveFS = FALSE;
+#else
+const bool CaseSensitiveFS = TRUE;
+#endif
 
@@ -52,2 +56,3 @@
     \class QDir
+    \reentrant
     \brief The QDir class provides access to directory structures and their contents in a platform-independent way.
@@ -232,2 +237,10 @@ QDir::QDir( const QDir &d )
 
+/*!
+    Refreshes the directory information.
+*/
+void QDir::refresh() const
+{
+    QDir* that = (QDir*) this;
+    that->dirty = TRUE;
+}
 
@@ -384,6 +397,32 @@ QString QDir::absFilePath( const QString &fileName,
     QString tmp = absPath();
-    if ( tmp.isEmpty() || (tmp[(int)tmp.length()-1] != '/' && !!fileName &&
-			   fileName[0] != '/') )
-	tmp += '/';
-    tmp += fileName;
+#ifdef Q_OS_WIN32
+    if ( fileName[0].isLetter() && fileName[1] == ':' ) {
+	int drv = fileName.upper()[0].latin1() - 'A' + 1;
+	if ( _getdrive() != drv ) {
+	    if ( qt_winunicode ) {
+		TCHAR buf[PATH_MAX];
+		::_tgetdcwd( drv, buf, PATH_MAX );
+		tmp.setUnicodeCodes( (ushort*)buf, ::_tcslen(buf) );
+	    } else {
+		char buf[PATH_MAX];
+		::_getdcwd( drv, buf, PATH_MAX );
+		tmp = buf;
+	    }
+	    if ( !tmp.endsWith("\\") )
+		tmp += "\\";
+	    tmp += fileName.right( fileName.length() - 2 );
+	    int x;
+	    for ( x = 0; x < (int) tmp.length(); x++ ) {
+		if ( tmp[x] == '\\' )
+		    tmp[x] = '/';
+	    }
+	}
+    } else
+#endif
+    {
+	if ( tmp.isEmpty() || (tmp[(int)tmp.length()-1] != '/' && !!fileName &&
+			       fileName[0] != '/') )
+	    tmp += '/';
+	tmp += fileName;
+    }
     return tmp;
@@ -936,3 +975,4 @@ QDir &QDir::operator=( const QString &path )
     QDir d2( "bin" );
-    if ( d1 != d2 ) qDebug( "They differ\n" ); // This is printed
+    if ( d1 != d2 )
+	qDebug( "They differ" );
     \endcode
@@ -951,3 +991,4 @@ QDir &QDir::operator=( const QString &path )
     d2.convertToAbs();
-    if ( d1 == d2 ) qDebug( "They're the same\n" ); // This is printed
+    if ( d1 == d2 )
+	qDebug( "They're the same" );
     \endcode
@@ -1089,6 +1130,7 @@ QDir QDir::root()
 
-QStringList qt_makeFilterList( const QString &filter )
+QValueList<QRegExp> qt_makeFilterList( const QString &filter )
 {
+    QValueList<QRegExp> regExps;
     if ( filter.isEmpty() )
-	return QStringList();
+	return regExps;
 
@@ -1101,11 +1143,22 @@ QStringList qt_makeFilterList( const QString &filter )
     QStringList::Iterator it = list.begin();
-    QStringList list2;
+    while ( it != list.end() ) {
+	regExps << QRegExp( (*it).stripWhiteSpace(), CaseSensitiveFS, TRUE );
+	++it;
+    }
+    return regExps;
+}
 
-    for ( ; it != list.end(); ++it ) {
-	QString s = *it;
-	list2 << s.stripWhiteSpace();
+bool qt_matchFilterList( const QValueList<QRegExp>& filters,
+			 const QString &fileName )
+{
+    QValueList<QRegExp>::ConstIterator rit = filters.begin();
+    while ( rit != filters.end() ) {
+	if ( (*rit).exactMatch(fileName) )
+	    return TRUE;
+	++rit;
     }
-    return list2;
+    return FALSE;
 }
 
+
 /*!
@@ -1125,7 +1178,3 @@ bool QDir::match( const QStringList &filters, const QString &fileName )
     while ( sit != filters.end() ) {
-#if defined(Q_FS_FAT) && !defined(Q_OS_UNIX)
-	QRegExp rx( *sit, FALSE, TRUE ); // The FAT FS is not case sensitive..
-#else
-	QRegExp rx( *sit, TRUE, TRUE );  // ..while others are.
-#endif
+	QRegExp rx( *sit, CaseSensitiveFS, TRUE );
 	if ( rx.exactMatch(fileName) )
@@ -1149,4 +1198,3 @@ bool QDir::match( const QString &filter, const QString &fileName )
 {
-    QStringList lst = qt_makeFilterList( filter );
-    return match( lst, fileName );
+    return qt_matchFilterList( qt_makeFilterList(filter), fileName );
 }
diff --git a/qmake/tools/qdir_unix.cpp b/qmake/tools/qdir_unix.cpp
index 57fe3c5..6a7adda 100644
--- a/qmake/tools/qdir_unix.cpp
+++ b/qmake/tools/qdir_unix.cpp
@@ -7,3 +7,3 @@
 **
-** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
 **
@@ -53,2 +53,3 @@
 #include <limits.h>
+#include <errno.h>
 
@@ -72,13 +73,12 @@ QString QDir::canonicalPath() const
     QString r;
-
     char cur[PATH_MAX+1];
-    if ( ::getcwd( cur, PATH_MAX ) )
-	if ( ::chdir(QFile::encodeName(dPath)) >= 0 ) {
-	    char tmp[PATH_MAX+1];
-	    if ( ::getcwd( tmp, PATH_MAX ) )
-		r = QFile::decodeName(tmp);
-	    ::chdir( cur );
-	}
-
-    slashify( r );
+    if ( ::getcwd( cur, PATH_MAX ) ) {
+	char tmp[PATH_MAX+1];
+	if( ::realpath( QFile::encodeName( dPath ), tmp ) )
+	    r = QFile::decodeName( tmp );
+	slashify( r );
+
+    	// always make sure we go back to the current dir
+	::chdir( cur );
+    }
     return r;
@@ -92,8 +92,9 @@ bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const
 	name = dirName.left( dirName.length() - 1 );
-    return ::mkdir( QFile::encodeName(filePath(name,acceptAbsPath)), 0777 )
-	== 0;
+    int status =
+	::mkdir( QFile::encodeName(filePath(name,acceptAbsPath)), 0777 );
 #else
-    return ::mkdir( QFile::encodeName(filePath(dirName,acceptAbsPath)), 0777 )
-	== 0;
+    int status =
+	::mkdir( QFile::encodeName(filePath(dirName,acceptAbsPath)), 0777 );
 #endif
+    return status == 0;
 }
@@ -188,3 +189,3 @@ bool QDir::readDirEntries( const QString &nameFilter,
 
-    QStringList filters = qt_makeFilterList( nameFilter );
+    QValueList<QRegExp> filters = qt_makeFilterList( nameFilter );
 
@@ -199,7 +200,2 @@ bool QDir::readDirEntries( const QString &nameFilter,
 
-#if defined(Q_OS_OS2EMX)
-    //QRegExp   wc( nameFilter, FALSE, TRUE );	// wild card, case insensitive
-#else
-    //QRegExp   wc( nameFilter, TRUE, TRUE );	// wild card, case sensitive
-#endif
     QFileInfo fi;
@@ -212,6 +208,15 @@ bool QDir::readDirEntries( const QString &nameFilter,
 
-    while ( (file = readdir(dir)) ) {
+#if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN)
+    union {
+	struct dirent mt_file;
+	char b[sizeof(struct dirent) + MAXNAMLEN + 1];
+    } u;
+    while ( readdir_r(dir, &u.mt_file, &file ) == 0 && file )
+#else
+    while ( (file = readdir(dir)) )
+#endif // QT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS
+    {
 	QString fn = QFile::decodeName(file->d_name);
 	fi.setFile( *this, fn );
-	if ( !match( filters, fn ) && !(allDirs && fi.isDir()) )
+	if ( !qt_matchFilterList(filters, fn) && !(allDirs && fi.isDir()) )
 	     continue;
@@ -278,3 +283,4 @@ const QFileInfoList * QDir::drives()
 #ifdef QT_THREAD_SUPPORT
-	QMutexLocker locker( qt_global_mutexpool->get( &knownMemoryLeak ) );
+	QMutexLocker locker( qt_global_mutexpool ?
+			     qt_global_mutexpool->get( &knownMemoryLeak ) : 0 );
 #endif // QT_THREAD_SUPPORT
diff --git a/qmake/tools/qfile.cpp b/qmake/tools/qfile.cpp
index a578b49..c088b55 100644
--- a/qmake/tools/qfile.cpp
+++ b/qmake/tools/qfile.cpp
@@ -90,3 +90,3 @@ extern bool qt_file_access( const QString& fn, int t );
 	int i = 1;
-	while ( !stream.eof() ) {
+	while ( !stream.atEnd() ) {
 	    line = stream.readLine(); // line of text excluding '\n'
@@ -292,2 +292,3 @@ void QFile::flush()
     Returns TRUE if the end of file has been reached; otherwise returns FALSE.
+    If QFile has not been open()'d, then the behavior is undefined.
 
diff --git a/qmake/tools/qfile_unix.cpp b/qmake/tools/qfile_unix.cpp
index 2d5a856..460bf06 100644
--- a/qmake/tools/qfile_unix.cpp
+++ b/qmake/tools/qfile_unix.cpp
@@ -437,7 +437,10 @@ QIODevice::Offset QFile::size() const
     struct stat st;
+    int ret = 0;
     if ( isOpen() ) {
-	::fstat( fh ? fileno(fh) : fd, &st );
+	ret = ::fstat( fh ? fileno(fh) : fd, &st );
     } else {
-	::stat( QFile::encodeName(fn), &st );
+	ret = ::stat( QFile::encodeName(fn), &st );
     }
+    if ( ret == -1 )
+	return 0;
 #if defined(QT_LARGEFILE_SUPPORT) && !defined(QT_ABI_64BITOFFSET)
@@ -540,3 +543,3 @@ Q_LONG QFile::readBlock( char *p, Q_ULONG len )
 	while( nread < l ) {
-	    *p = ungetchBuffer[ l - nread - 1 ];
+	    *p = ungetchBuffer.at( l - nread - 1 );
 	    p++;
@@ -631,3 +634,5 @@ Q_LONG QFile::writeBlock( const char *p, Q_ULONG len )
   This is a small positive integer, suitable for use with C library
-  functions such as fdopen() and fcntl(), as well as with QSocketNotifier.
+  functions such as fdopen() and fcntl(). On systems that use file 
+  descriptors for sockets (ie. Unix systems, but not Windows) the handle
+  can be used with QSocketNotifier as well.
 
diff --git a/qmake/tools/qfileinfo.cpp b/qmake/tools/qfileinfo.cpp
index 3af7932..a78f4fa 100644
--- a/qmake/tools/qfileinfo.cpp
+++ b/qmake/tools/qfileinfo.cpp
@@ -637,2 +637,4 @@ QDateTime QFileInfo::lastRead() const
 
+    If the QFileInfo is empty it returns QDir::currentDirPath().
+
     This function can be time consuming under Unix (in the order of
@@ -646,3 +648,3 @@ QString QFileInfo::absFilePath() const
     if ( QDir::isRelativePath(fn)
-#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64)
+#if defined(Q_OS_WIN32)
 	 && fn[1] != ':'
diff --git a/qmake/tools/qfileinfo_unix.cpp b/qmake/tools/qfileinfo_unix.cpp
index f7c3a97..364f219 100644
--- a/qmake/tools/qfileinfo_unix.cpp
+++ b/qmake/tools/qfileinfo_unix.cpp
@@ -216,5 +216,5 @@ uint QFileInfo::groupId() const
 	if ( fi.permission( QFileInfo::WriteUser | QFileInfo::ReadGroup ) )
-	    qWarning( "I can change the file; my group can read the file.");
+	    qWarning( "I can change the file; my group can read the file" );
 	if ( fi.permission( QFileInfo::WriteGroup | QFileInfo::WriteOther ) )
-	    qWarning( "The group or others can change the file!" );
+	    qWarning( "The group or others can change the file" );
     \endcode
diff --git a/qmake/tools/qgarray.cpp b/qmake/tools/qgarray.cpp
index 45c45ce..0a522e4 100644
--- a/qmake/tools/qgarray.cpp
+++ b/qmake/tools/qgarray.cpp
@@ -37,5 +37,9 @@
 
-#include "qglobal.h"			// needed to define Q_WS_WIN
-#ifdef Q_WS_WIN
-#include "qt_windows.h"			// needed for bsearch on some platforms
+#include "qglobal.h"
+#if defined(Q_CC_BOR)
+    // needed for qsort() because of a std namespace problem on Borland
+#   include "qplatformdefs.h"
+#elif defined(Q_WS_WIN)
+    // needed for bsearch on some platforms
+#   include "qt_windows.h"
 #endif
@@ -51,3 +55,9 @@
 
-#define USE_MALLOC				// comment to use new/delete
+/*
+  If USE_MALLOC isn't defined, we use new[] and delete[] to allocate
+  memory. The documentation for QMemArray<T>::assign() explicitly
+  mentions that the array is freed using free(), so don't mess around
+  with USE_MALLOC unless you know what you're doing.
+*/
+#define USE_MALLOC
 
@@ -137,3 +147,7 @@ QGArray::QGArray( int size )
     Q_CHECK_PTR( shd->data );
-    shd->len = size;
+    shd->len =
+#ifdef QT_QGARRAY_SPEED_OPTIM
+	shd->maxl =
+#endif
+	size;
 }
@@ -214,8 +228,16 @@ bool QGArray::isEqual( const QGArray &a ) const
 /*!
-  Resizes the array to \a newsize bytes.
+  Resizes the array to \a newsize bytes. \a optim is either
+  MemOptim (the default) or SpeedOptim.
 */
-
-bool QGArray::resize( uint newsize )
+bool QGArray::resize( uint newsize, Optimization optim )
 {
-    if ( newsize == shd->len )			// nothing to do
+#ifndef QT_QGARRAY_SPEED_OPTIM
+    Q_UNUSED(optim);
+#endif
+
+    if ( newsize == shd->len
+#ifdef QT_QGARRAY_SPEED_OPTIM
+	 && newsize == shd->maxl
+#endif
+	) // nothing to do
 	return TRUE;
@@ -225,2 +247,21 @@ bool QGArray::resize( uint newsize )
     }
+
+    uint newmaxl = newsize;
+#ifdef QT_QGARRAY_SPEED_OPTIM
+    if ( optim == SpeedOptim ) {
+	if ( newsize <= shd->maxl &&
+	     ( newsize * 4 > shd->maxl || shd->maxl <= 4 ) ) {
+	    shd->len = newsize;
+	    return TRUE;
+	}
+	newmaxl = 4;
+	while ( newmaxl < newsize )
+	    newmaxl *= 2;
+	// try to spare some memory
+	if ( newmaxl >= 1024 * 1024 && newsize <= newmaxl - (newmaxl >> 2) )
+	    newmaxl -= newmaxl >> 2;
+    }
+    shd->maxl = newmaxl;
+#endif
+
     if ( shd->data ) {				// existing data
@@ -228,3 +269,3 @@ bool QGArray::resize( uint newsize )
 	char *newdata = NEW(char,newsize);	// manual realloc
-	memcpy( newdata, shd->data, QMIN(shd->len,newsize) );
+	memcpy( newdata, shd->data, QMIN(shd->len,newmaxl) );
 	DELETE(shd->data);
@@ -232,6 +273,6 @@ bool QGArray::resize( uint newsize )
 #else
-	shd->data = (char *)realloc( shd->data, newsize );
+	shd->data = (char *)realloc( shd->data, newmaxl );
 #endif
     } else {
-	shd->data = NEW(char,newsize);
+	shd->data = NEW(char,newmaxl);
     }
@@ -243,2 +284,10 @@ bool QGArray::resize( uint newsize )
 
+/*!\overload
+*/
+bool QGArray::resize( uint newsize )
+{
+    return resize( newsize, MemOptim );
+}
+
+
 /*!
@@ -321,3 +370,7 @@ QGArray &QGArray::assign( const char *d, uint len )
     shd->data = (char *)d;
-    shd->len = len;
+    shd->len =
+#ifdef QT_QGARRAY_SPEED_OPTIM
+	shd->maxl =
+#endif
+	len;
     return *this;
@@ -366,3 +419,7 @@ QGArray &QGArray::duplicate( const QGArray &a )
     }
-    shd->len = a.shd->len;
+    shd->len =
+#ifdef QT_QGARRAY_SPEED_OPTIM
+	shd->maxl =
+#endif
+	a.shd->len;
     if ( oldptr )
@@ -404,3 +461,7 @@ QGArray &QGArray::duplicate( const char *d, uint len )
     shd->data = data;
-    shd->len  = len;
+    shd->len =
+#ifdef QT_QGARRAY_SPEED_OPTIM
+	shd->maxl =
+#endif
+	len;
     return *this;
@@ -661,3 +722,4 @@ void QGArray::sort( uint sz )
 #ifdef QT_THREAD_SUPPORT
-    QMutexLocker locker( qt_global_mutexpool->get( &cmp_item_size ) );
+    QMutexLocker locker( qt_global_mutexpool ?
+			 qt_global_mutexpool->get( &cmp_item_size ) : 0 );
 #endif // QT_THREAD_SUPPORT
@@ -679,3 +741,4 @@ int QGArray::bsearch( const char *d, uint sz ) const
 #ifdef QT_THREAD_SUPPORT
-    QMutexLocker locker( qt_global_mutexpool->get( &cmp_item_size ) );
+    QMutexLocker locker( qt_global_mutexpool ?
+			 qt_global_mutexpool->get( &cmp_item_size ) : 0 );
 #endif // QT_THREAD_SUPPORT
diff --git a/qmake/tools/qgdict.cpp b/qmake/tools/qgdict.cpp
index c431ff8..3d49fc7 100644
--- a/qmake/tools/qgdict.cpp
+++ b/qmake/tools/qgdict.cpp
@@ -206,3 +206,6 @@ void QGDict::init( uint len, KeyType kt, bool caseSensitive, bool copyKeys )
 {
-    vec = new QBaseBucket *[vlen = len];		// allocate hash table
+    vlen = len;
+    if ( vlen == 0 )
+	vlen = 17;
+    vec = new QBaseBucket *[vlen];
     Q_CHECK_PTR( vec );
diff --git a/qmake/tools/qglist.cpp b/qmake/tools/qglist.cpp
index 155d585..bd27f8a 100644
--- a/qmake/tools/qglist.cpp
+++ b/qmake/tools/qglist.cpp
@@ -331,8 +331,4 @@ QLNode *QGList::locate( uint index )
 
-    if ( index >= numNodes ) {
-#if defined(QT_CHECK_RANGE)
-	qWarning( "QGList::locate: Index %d out of range", index );
-#endif
+    if ( index >= numNodes )
 	return 0;
-    }
 
diff --git a/qmake/tools/qglobal.cpp b/qmake/tools/qglobal.cpp
index 47cd6bd..342005d 100644
--- a/qmake/tools/qglobal.cpp
+++ b/qmake/tools/qglobal.cpp
@@ -151,3 +151,24 @@ bool qSysInfo( int *wordSize, bool *bigEndian )
 
-#if defined(Q_OS_WIN32) || defined(Q_OS_CYGWIN)
+#if !defined(QWS) && defined(Q_OS_MAC)
+
+#include "qt_mac.h"
+
+int qMacVersion()
+{
+    static int macver = Qt::MV_Unknown;
+    static bool first = TRUE;
+    if(first) {
+	first = FALSE;
+	long gestalt_version;
+	if(Gestalt(gestaltSystemVersion, &gestalt_version) == noErr) {
+	    if(gestalt_version >= 0x1020 && gestalt_version < 0x1030)
+		macver = Qt::MV_10_DOT_2;
+	    else if(gestalt_version >= 0x1010 && gestalt_version < 0x1020)
+		macver = Qt::MV_10_DOT_1;
+	}
+    }
+    return macver;
+}
+Qt::MacintoshVersion qt_macver = (Qt::MacintoshVersion)qMacVersion();
+#elif defined(Q_OS_WIN32) || defined(Q_OS_CYGWIN)
 bool qt_winunicode;
@@ -323,3 +344,15 @@ static const int QT_BUFFER_LENGTH = 8196;	// internal buffer length
 #ifdef Q_OS_MAC
-const unsigned char * p_str(const char * c, int len=-1)
+QString cfstring2qstring(CFStringRef str)
+{
+    CFIndex length = CFStringGetLength(str); 
+    if(const UniChar *chars = CFStringGetCharactersPtr(str)) 
+	return QString((QChar *)chars, length);
+    UniChar *buffer = (UniChar*)malloc(length * sizeof(UniChar)); 
+    CFStringGetCharacters(str, CFRangeMake(0, length), buffer); 
+    QString ret((QChar *)buffer, length);
+    free(buffer); 
+    return ret;
+}
+
+unsigned char * p_str(const char * c, int len=-1)
 {
@@ -339,3 +372,3 @@ const unsigned char * p_str(const char * c, int len=-1)
 
-const unsigned char * p_str(const QString &s)
+unsigned char * p_str(const QString &s)
 {
@@ -643,4 +676,4 @@ void qSystemWarning( const char* msg, int code )
 
-    If \a p is null, a fatal messages says that the program ran out of
-    memory and exits. If \e p is not null, nothing happens.
+    If \a p is 0, a fatal messages says that the program ran out of
+    memory and exits. If \e p is not 0, nothing happens.
 
@@ -654,3 +687,3 @@ void qSystemWarning( const char* msg, int code )
 
-	a = new int[80];                 // Right
+	a = new (nothrow) int[80];       // Right
 	Q_CHECK_PTR( a );
diff --git a/qmake/tools/qgpluginmanager.cpp b/qmake/tools/qgpluginmanager.cpp
index 46c85f5..72246ac 100644
--- a/qmake/tools/qgpluginmanager.cpp
+++ b/qmake/tools/qgpluginmanager.cpp
@@ -5,3 +5,3 @@
 **
-** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2003 Trolltech AS.  All rights reserved.
 **
@@ -477,3 +477,3 @@ bool QGPluginManager::addLibrary( QLibrary* lib )
 
-	for ( QStringList::Iterator f = fl.begin(); f != fl.end(); f++ ) {
+	for ( QStringList::Iterator f = fl.begin(); f != fl.end(); ++f ) {
 	    QLibrary *old = plugDict[*f];
diff --git a/qmake/tools/qgvector.cpp b/qmake/tools/qgvector.cpp
index 1985f03..3c903ed 100644
--- a/qmake/tools/qgvector.cpp
+++ b/qmake/tools/qgvector.cpp
@@ -37,2 +37,8 @@
 
+#include "qglobal.h"
+#if defined(Q_CC_BOR)
+// needed for qsort() because of a std namespace problem on Borland
+#include "qplatformdefs.h"
+#endif
+
 #define	 QGVECTOR_CPP
@@ -395,3 +401,4 @@ void QGVector::sort()				// sort vector
 #ifdef QT_THREAD_SUPPORT
-    QMutexLocker locker( qt_global_mutexpool->get( &sort_vec ) );
+    QMutexLocker locker( qt_global_mutexpool ?
+			 qt_global_mutexpool->get( &sort_vec ) : 0 );
 #endif // QT_THREAD_SUPPORT
diff --git a/qmake/tools/qlibrary.cpp b/qmake/tools/qlibrary.cpp
index 564db30..be1d54b 100644
--- a/qmake/tools/qlibrary.cpp
+++ b/qmake/tools/qlibrary.cpp
@@ -5,5 +5,5 @@
 **
-** Created : 2000-01-01
+** Created : 000101
 **
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2003 Trolltech AS.  All rights reserved.
 **
@@ -73,3 +73,3 @@ QLibraryPrivate::QLibraryPrivate( QLibrary *lib )
     \mainclass
-    \group plugins
+    \ingroup plugins
 
@@ -328,3 +328,4 @@ QString QLibrary::library() const
 #else
-    if ( filename.find( ".so" ) == -1 ) {
+    QString filter = ".so";
+    if ( filename.find(filter) == -1 ) {
 	const int x = filename.findRev( "/" );
@@ -333,5 +334,5 @@ QString QLibrary::library() const
 	    QString file = filename.right( filename.length() - x - 1 );
-	    filename = QString( "%1lib%2.so" ).arg( path ).arg( file );
+	    filename = QString( "%1lib%2.%3" ).arg( path ).arg( file ).arg( filter );
 	} else {
-	    filename = QString( "lib%1.so" ).arg( filename );
+	    filename = QString( "lib%1.%2" ).arg( filename ).arg( filter );
 	}
diff --git a/qmake/tools/qlibrary_unix.cpp b/qmake/tools/qlibrary_unix.cpp
index f0fbdf6..12b9310 100644
--- a/qmake/tools/qlibrary_unix.cpp
+++ b/qmake/tools/qlibrary_unix.cpp
@@ -5,3 +5,3 @@
 **
-** Created : 2000-01-01
+** Created : 000101
 **
@@ -55,3 +55,20 @@
 
-#if defined(QT_HPUX_LD) // for HP-UX < 11.x and 32 bit
+#if defined(Q_OS_MAC)
+
+bool QLibraryPrivate::loadLibrary()
+{
+    return FALSE;
+}
+
+bool QLibraryPrivate::freeLibrary()
+{
+    return FALSE;
+}
+
+void* QLibraryPrivate::resolveSymbol( const char* )
+{
+    return 0;
+}
+
+#elif defined(QT_HPUX_LD) // for HP-UX < 11.x and 32 bit
 
diff --git a/qmake/tools/qmutex_unix.cpp b/qmake/tools/qmutex_unix.cpp
index c861b2d..3eb59cf 100644
--- a/qmake/tools/qmutex_unix.cpp
+++ b/qmake/tools/qmutex_unix.cpp
@@ -45,4 +45,5 @@ typedef pthread_mutex_t     Q_MUTEX_T;
 #if ((defined(PTHREAD_MUTEX_RECURSIVE) && defined(PTHREAD_MUTEX_DEFAULT)) || \
-     defined(Q_OS_FREEBSD)) && !defined(Q_OS_UNIXWARE) && !defined(Q_OS_SOLARIS)
-    // POSIX 1003.1c-1995 - We love this OS
+     defined(Q_OS_FREEBSD)) && !defined(Q_OS_UNIXWARE) && !defined(Q_OS_SOLARIS) && \
+    !defined(Q_OS_MAC)
+// POSIX 1003.1c-1995 - We love this OS
 #  define Q_MUTEX_SET_TYPE(a, b) pthread_mutexattr_settype((a), (b))
@@ -663,3 +664,4 @@ bool QMutex::tryLock()
     Constructs a QMutexLocker and locks \a mutex. The mutex will be
-    unlocked when the QMutexLocker is destroyed.
+    unlocked when the QMutexLocker is destroyed. If \a mutex is zero,
+    QMutexLocker does nothing.
 
diff --git a/qmake/tools/qmutexpool.cpp b/qmake/tools/qmutexpool.cpp
index 9ed2829..a8e7402 100644
--- a/qmake/tools/qmutexpool.cpp
+++ b/qmake/tools/qmutexpool.cpp
@@ -1 +1,36 @@
+/****************************************************************************
+** $Id$
+**
+** ...
+**
+** Copyright (C) 2002 Trolltech AS.  All rights reserved.
+**
+** This file is part of the tools 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 or Qt Professional 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 "qmutexpool_p.h"
@@ -5,3 +40,2 @@
 #include <qthread.h>
-#include <stdio.h>
 
@@ -9,17 +43,2 @@ QMutexPool *qt_global_mutexpool = 0;
 
-// this is an internal class used only for inititalizing the global mutexpool
-class QGlobalMutexPoolInitializer
-{
-public:
-    inline QGlobalMutexPoolInitializer()
-    {
-	/*
-	  Purify will report a leak here. However, this mutex pool must be alive
-	  until *everything* in Qt has been destructed. Unfortunately there is
-	  no way to guarantee this, so we never destroy this mutex pool.
-	*/
-	qt_global_mutexpool = new QMutexPool( TRUE );
-    }
-};
-QGlobalMutexPoolInitializer qt_global_mutexpool_initializer;
 
@@ -87,5 +106,8 @@ QGlobalMutexPoolInitializer qt_global_mutexpool_initializer;
 QMutexPool::QMutexPool( bool recursive, int size )
-    : mutex( FALSE ), mutexes( size ), recurs( recursive )
+    : mutex( FALSE ), count( size ), recurs( recursive )
 {
-    mutexes.fill( 0 );
+    mutexes = new QMutex*[count];
+    for ( int index = 0; index < count; ++index ) {
+	mutexes[index] = 0;
+    }
 }
@@ -99,7 +121,8 @@ QMutexPool::~QMutexPool()
     QMutexLocker locker( &mutex );
-    QMutex **d = mutexes.data();
-    for ( int index = 0; (uint) index < mutexes.size(); index++ ) {
-	delete d[index];
-	d[index] = 0;
+    for ( int index = 0; index < count; ++index ) {
+	delete mutexes[index];
+	mutexes[index] = 0;
     }
+    delete [] mutexes;
+    mutexes = 0;
 }
@@ -112,6 +135,5 @@ QMutex *QMutexPool::get( void *address )
 {
-    QMutex **d = mutexes.data();
-    int index = (int)( (ulong) address % mutexes.size() );
+    int index = (int) ( (unsigned long) address % count );
 
-    if ( ! d[index] ) {
+    if ( ! mutexes[index] ) {
 	// mutex not created, create one
@@ -121,4 +143,4 @@ QMutex *QMutexPool::get( void *address )
 	// 2 threads could be trying to create a mutex as the same index...
-	if ( ! d[index] ) {
-	    d[index] = new QMutex( recurs );
+	if ( ! mutexes[index] ) {
+	    mutexes[index] = new QMutex( recurs );
 	}
@@ -126,3 +148,3 @@ QMutex *QMutexPool::get( void *address )
 
-    return d[index];
+    return mutexes[index];
 }
diff --git a/qmake/tools/qregexp.cpp b/qmake/tools/qregexp.cpp
index 500efed..0c1f060 100644
--- a/qmake/tools/qregexp.cpp
+++ b/qmake/tools/qregexp.cpp
@@ -265,3 +265,3 @@
     \row \i <b>\\d</b>
-	 \i This matches a digit (see QChar::isDigit()).
+	 \i This matches a digit (QChar::isDigit()).
     \row \i <b>\\D</b>
@@ -269,3 +269,3 @@
     \row \i <b>\\s</b>
-	 \i This matches a whitespace (see QChar::isSpace()).
+	 \i This matches a whitespace (QChar::isSpace()).
     \row \i <b>\\S</b>
@@ -273,3 +273,3 @@
     \row \i <b>\\w</b>
-	 \i This matches a word character (see QChar::isLetterOrNumber()).
+	 \i This matches a word character (QChar::isLetterOrNumber() or '_').
     \row \i <b>\\W</b>
@@ -549,3 +549,10 @@
     Perl's extended \c{/x} syntax is not supported, nor are
-    regexp comments (?#comment) or directives, e.g. (?i).
+    directives, e.g. (?i), or regexp comments, e.g. (?#comment). On
+    the other hand, C++'s rules for literal strings can be used to
+    achieve the same:
+    \code
+    QRegExp mark( "\\b" // word boundary
+		  "[Mm]ark" // the word we want to match
+		);
+    \endcode
 
@@ -679,7 +686,7 @@
     \code
-    QRegExp rx( "*.html" );     // invalid regexp: * doesn't quantify anything
-    rx.setWildcard( TRUE );     // now it's a valid wildcard regexp
-    rx.search( "index.html" );  // returns 0 (matched at position 0)
-    rx.search( "default.htm" ); // returns -1 (no match)
-    rx.search( "readme.txt" );  // returns -1 (no match)
+    QRegExp rx( "*.html" );         // invalid regexp: * doesn't quantify anything
+    rx.setWildcard( TRUE );         // now it's a valid wildcard regexp
+    rx.exactMatch( "index.html" );  // returns TRUE
+    rx.exactMatch( "default.htm" ); // returns FALSE
+    rx.exactMatch( "readme.txt" );  // returns FALSE
     \endcode
@@ -717,2 +724,7 @@ const int EOS = -1;
 
+static bool isWord( QChar ch )
+{
+    return ch.isLetterOrNumber() || ch == QChar( '_' );
+}
+
 /*
@@ -1682,5 +1694,5 @@ bool QRegExpEngine::testAnchor( int i, int a, const int *capBegin )
 	if ( mmPos + i != 0 )
-	    before = mmIn[mmPos + i - 1].isLetterOrNumber();
+	    before = isWord( mmIn[mmPos + i - 1] );
 	if ( mmPos + i != mmLen )
-	    after = mmIn[mmPos + i].isLetterOrNumber();
+	    after = isWord( mmIn[mmPos + i] );
 	if ( (a & Anchor_Word) != 0 && (before == after) )
@@ -2634,3 +2646,10 @@ int QRegExpEngine::getEscape()
 	// see QChar::isLetterOrNumber()
-	yyCharClass->addCategories( 0x7ff07f8f );
+	yyCharClass->addCategories( 0x7fe07f8f );
+	yyCharClass->addRange( 0x203f, 0x2040 );
+	yyCharClass->addSingleton( 0x2040 );
+	yyCharClass->addSingleton( 0x30fb );
+	yyCharClass->addRange( 0xfe33, 0xfe34 );
+	yyCharClass->addRange( 0xfe4d, 0xfe4f );
+	yyCharClass->addSingleton( 0xff3f );
+	yyCharClass->addSingleton( 0xff65 );
 	return Tok_CharClass;
@@ -2654,2 +2673,3 @@ int QRegExpEngine::getEscape()
 	yyCharClass->addCategories( 0x000f8070 );
+	yyCharClass->addSingleton( 0x005f ); // '_'
 	return Tok_CharClass;
@@ -3185,3 +3205,4 @@ static QRegExpEngine *newEngine( const QString& pattern, bool caseSensitive )
 #ifdef QT_THREAD_SUPPORT
-	QMutexLocker locker( qt_global_mutexpool->get( &engineCache ) );
+	QMutexLocker locker( qt_global_mutexpool ?
+			     qt_global_mutexpool->get( &engineCache ) : 0 );
 #endif
@@ -3201,7 +3222,8 @@ static void derefEngine( QRegExpEngine *eng, const QString& pattern )
 {
-    if ( eng != 0 && eng->deref() ) {
-#ifndef QT_NO_REGEXP_OPTIM
 #ifdef QT_THREAD_SUPPORT
-	QMutexLocker locker( qt_global_mutexpool->get( &engineCache ) );
+    QMutexLocker locker( qt_global_mutexpool ?
+			 qt_global_mutexpool->get( &engineCache ) : 0 );
 #endif
+    if ( eng != 0 && eng->deref() ) {
+#ifndef QT_NO_REGEXP_OPTIM
 	if ( engineCache == 0 ) {
@@ -3567,9 +3589,2 @@ int QRegExp::match( const QString& str, int index, int *len,
 
-/*!
-    \overload
-
-    This convenience function searches with a \c CaretMode of \c
-    CaretAtZero which is the most common usage.
-*/
-
 int QRegExp::search( const QString& str, int offset ) const
@@ -3627,9 +3642,2 @@ int QRegExp::search( const QString& str, int offset, CaretMode caretMode ) const
 
-/*!
-    \overload
-
-    This convenience function searches with a \c CaretMode of \c
-    CaretAtZero which is the most common usage.
-*/
-
 int QRegExp::searchRev( const QString& str, int offset ) const
@@ -3696,3 +3704,3 @@ int QRegExp::matchedLength() const
 #ifndef QT_NO_REGEXP_CAPTURE
-/*! 
+/*!
   Returns the number of captures contained in the regular expression.
diff --git a/qmake/tools/qsemaphore_unix.cpp b/qmake/tools/qsemaphore_unix.cpp
index fcf28da..4516049 100644
--- a/qmake/tools/qsemaphore_unix.cpp
+++ b/qmake/tools/qsemaphore_unix.cpp
@@ -185,2 +185,9 @@ int QSemaphore::operator+=(int n)
 
+    if ( n < 0 || n > d->max ) {
+#ifdef QT_CHECK_RANGE
+	qWarning( "QSemaphore::operator+=: paramter %d out of range", n );
+#endif // QT_CHECK_RANGE
+	n = n < 0 ? 0 : d->max;
+    }
+
     while (d->value + n > d->max)
@@ -189,10 +196,2 @@ int QSemaphore::operator+=(int n)
     d->value += n;
-
-#ifdef QT_CHECK_RANGE
-    if (d->value > d->max) {
-	qWarning("QSemaphore::operator+=: attempt to allocate more resources than available");
-	d->value = d->max;
-    }
-#endif
-
     ret = d->value;
@@ -214,11 +213,10 @@ int QSemaphore::operator-=(int n)
 
-    d->value -= n;
-
+    if ( n < 0 || n > d->value ) {
 #ifdef QT_CHECK_RANGE
-    if (d->value < 0) {
-	qWarning("QSemaphore::operator-=: attempt to deallocate more resources than taken");
-	d->value = 0;
+	qWarning( "QSemaphore::operator-=: paramter %d out of range", n );
+#endif // QT_CHECK_RANGE
+	n = n < 0 ? 0 : d->value;
     }
-#endif
 
+    d->value -= n;
     ret = d->value;
diff --git a/qmake/tools/qsettings.cpp b/qmake/tools/qsettings.cpp
index 5de105c..35fc039 100644
--- a/qmake/tools/qsettings.cpp
+++ b/qmake/tools/qsettings.cpp
@@ -5,3 +5,3 @@
 **
-** Created: 2000.06.26
+** Created : 000626
 **
@@ -65,25 +65,25 @@ static inline int qt_open( const char *pathname, int flags, mode_t mode )
 /*!
-  \class QSettings
-  \brief The QSettings class provides persistent platform-independent application settings.
-
-  \ingroup io
-  \ingroup misc
-  \mainclass
-
-  On Unix systems, QSettings uses text files to store settings. On Windows
-  systems, QSettings uses the system registry.  On Mac OS X, QSettings will
-  behave as on Unix, and store to text files.
-
-  Each setting comprises an identifying key and the data associated with
-  the key. A key is a unicode string which consists of \e two or more
-  subkeys. A subkey is a slash, '/', followed by one or more unicode
-  characters (excluding slashes, newlines, carriage returns and equals,
-  '=', signs). The associated data, called the entry or value, may be a
-  boolean, an integer, a double, a string or a list of strings. Entry
-  strings may contain any unicode characters.
-
-  If you want to save and restore the entire desktop's settings, i.e.
-  which applications are running, use QSettings to save the settings
-  for each individual application and QSessionManager to save the
-  desktop's session.
+    \class QSettings
+    \brief The QSettings class provides persistent platform-independent application settings.
+
+    \ingroup io
+    \ingroup misc
+    \mainclass
+
+    On Unix systems, QSettings uses text files to store settings. On Windows
+    systems, QSettings uses the system registry.  On Mac OS X, QSettings uses
+    the Carbon preferences API.
+
+    Each setting comprises an identifying key and the data associated with
+    the key. A key is a unicode string which consists of \e two or more
+    subkeys. A subkey is a slash, '/', followed by one or more unicode
+    characters (excluding slashes, newlines, carriage returns and equals,
+    '=', signs). The associated data, called the entry or value, may be a
+    boolean, an integer, a double, a string or a list of strings. Entry
+    strings may contain any unicode characters.
+
+    If you want to save and restore the entire desktop's settings, i.e.
+    which applications are running, use QSettings to save the settings
+    for each individual application and QSessionManager to save the
+    desktop's session.
 
@@ -103,10 +103,9 @@ static inline int qt_open( const char *pathname, int flags, mode_t mode )
 
-    A typical usage pattern for application startup:
+    A typical usage pattern for reading application startup:
     \code
     QSettings settings;
-    settings.insertSearchPath( QSettings::Windows, "/MyCompany" );
-    // No search path needed for Unix; see notes further on.
-    // Use default values if the keys don't exist
-    QString bgColor = settings.readEntry( "/MyApplication/background color", "white" );
-    int width = settings.readNumEntry( "/MyApplication/geometry/width", 640 );
+    settings.setPath( "MyCompany.com", "MyApplication" );
+
+    QString bgColor = settings.readEntry( "/colors/background", "white" );
+    int width = settings.readNumEntry( "/geometry/width", 640 );
     // ...
@@ -117,6 +116,6 @@ static inline int qt_open( const char *pathname, int flags, mode_t mode )
     QSettings settings;
-    settings.insertSearchPath( QSettings::Windows, "/MyCompany" );
-    // No search path needed for Unix; see notes further on.
-    settings.writeEntry( "/MyApplication/background color", bgColor );
-    settings.writeEntry( "/MyApplication/geometry/width", width );
+    settings.setPath( "MyCompany.com", "MyApplication" );
+
+    settings.writeEntry( "/colors/background", bgColor );
+    settings.writeEntry( "/geometry/width", width );
     // ...
@@ -124,2 +123,18 @@ static inline int qt_open( const char *pathname, int flags, mode_t mode )
 
+    QSettings can build a key prefix that is prepended to all keys. To
+    build the key prefix, use beginGroup() and endGroup().
+    \code
+    QSettings settings;
+
+    settings.beginGroup( "/MainWindow" );
+	settings.beginGroup( "/Geometry" );
+	    int x = settings.readEntry( "/x" );
+	    // ...
+	settings.endGroup();
+	settings.beginGroup( "/Toolbars" );
+	    // ...
+	settings.endGroup();
+    settings.endGroup();
+    \endcode
+
     You can get a list of entry-holding keys by calling entryList(), and
@@ -141,6 +156,2 @@ static inline int qt_open( const char *pathname, int flags, mode_t mode )
 
-    If you wish to use a different search path call insertSearchPath()
-    as often as necessary to add your preferred paths. Call
-    removeSearchPath() to remove any unwanted paths.
-
     Since settings for Windows are stored in the registry there are size
@@ -154,3 +165,21 @@ static inline int qt_open( const char *pathname, int flags, mode_t mode )
 
-    These limitations are not enforced on Unix.
+    These limitations are not enforced on Unix or Mac OS X.
+
+    If you wish to use a different search path call insertSearchPath()
+    as often as necessary to add your preferred paths. Call
+    removeSearchPath() to remove any unwanted paths.
+
+    \section1 Notes for Mac OS X Applications
+
+    Internal to the CFPreferences API it is not defined (for Mac OS 9
+    support) where the settings will ultimitely be stored. However, at the
+    time of this writing the settings will be stored (either on a global or
+    user basis, preferring locally) into a plist file in
+    $ROOT/System/Library/Preferences (in XML format). QSettings will create
+    an appropriate plist file (com.<first group name>.plist) out of the
+    full path to a key.
+
+    For further information on CFPreferences see also
+    \link http://developer.apple.com/techpubs/macosx/CoreFoundation/PreferenceServices/preferenceservices_carbon.html
+    Apple's Specifications\endlink
 
@@ -302,3 +331,3 @@ static HANDLE openlock( const QString &name, int /*type*/ )
 
-    if ( !LockFile( fd, 0, 0, -1, -1 ) ) {
+    if ( !LockFile( fd, 0, 0, (DWORD)-1, (DWORD)-1 ) ) { // ### (DWORD)-1 ???
 #ifdef QT_CHECK_STATE
@@ -310,3 +339,3 @@ static HANDLE openlock( const QString &name, int /*type*/ )
 
-void closelock( HANDLE fd )
+static void closelock( HANDLE fd )
 {
@@ -315,3 +344,3 @@ void closelock( HANDLE fd )
 
-    if ( !UnlockFile( fd, 0, 0, -1, -1 ) ) {
+    if ( !UnlockFile( fd, 0, 0, (DWORD)-1, (DWORD)-1 ) ) { // ### (DWORD)-1 ???
 #ifdef QT_CHECK_STATE
@@ -457,5 +486,7 @@ QSettingsPrivate::QSettingsPrivate( QSettings::Format format )
 {
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     if ( format != QSettings::Ini )
 	return;
+#else
+    Q_UNUSED( format );
 #endif
@@ -508,2 +539,4 @@ QSettingsPrivate::QSettingsPrivate( QSettings::Format format )
 	    qWarning("QSettings: error creating %s", dir.path().latin1());
+#else
+	    ;
 #endif
@@ -532,2 +565,4 @@ QSettingsGroup QSettingsPrivate::readGroup()
 	QStringList::Iterator it = searchPaths.begin();
+	if ( !globalScope )
+	    ++it;
 	while (it != searchPaths.end()) {
@@ -566,2 +601,4 @@ void QSettingsPrivate::removeGroup(const QString &key)
 	QStringList::Iterator it = searchPaths.begin();
+	if ( !globalScope )
+	    ++it;
 	while (it != searchPaths.end()) {
@@ -617,2 +654,4 @@ void QSettingsPrivate::writeGroup(const QString &key, const QString &value)
 	QStringList::Iterator it = searchPaths.begin();
+	if ( !globalScope )
+	    ++it;
 	while (it != searchPaths.end()) {
@@ -651,2 +690,4 @@ QDateTime QSettingsPrivate::modificationTime()
     QStringList::Iterator it = searchPaths.begin();
+    if ( !globalScope )
+	++it;
     while (it != searchPaths.end()) {
@@ -660,3 +701,3 @@ QDateTime QSettingsPrivate::modificationTime()
 
-static bool verifyKey( const QString &key )
+bool qt_verify_key( const QString &key )
 {
@@ -669,4 +710,10 @@ static inline QString groupKey( const QString &group, const QString &key )
 {
-    if ( group.endsWith( "/" ) || key.startsWith( "/" ) )
+    if ( group.isEmpty() || ( group.length() == 1 && group[0] == '/' ) ) {
+	// group is empty, or it contains a single '/', so we just return the key
+	if ( key.startsWith( "/" ) )
+	    return key;
+	return "/" + key;
+    } else if ( group.endsWith( "/" ) || key.startsWith( "/" ) ) {
 	return group + key;
+    }
     return group + "/" + key;
@@ -688,3 +735,3 @@ static inline QString groupKey( const QString &group, const QString &key )
   first folder (listed below) to the last, returning the first
-  settings found, and ignoring any folders for which the user doesn't 
+  settings found, and ignoring any folders for which the user doesn't
   have read permission.
@@ -712,3 +759,3 @@ static inline QString groupKey( const QString &group, const QString &key )
   If a setting is found in the HKEY_CURRENT_USER space, this setting
-  is overwritten independently of write permissions in the 
+  is overwritten independently of write permissions in the
   HKEY_LOCAL_MACHINE space.
@@ -759,3 +806,3 @@ void QSettings::insertSearchPath( System s, const QString &path)
 {
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     if ( d->sysd ) {
@@ -766,3 +813,12 @@ void QSettings::insertSearchPath( System s, const QString &path)
 
-    if ( !verifyKey( path ) ) {
+#if !defined(Q_WS_WIN)
+    if ( s == Windows )
+	return;
+#endif
+#if !defined(Q_WS_WIN)
+    if ( s == Mac )
+	return;
+#endif
+
+    if ( !qt_verify_key( path ) ) {
 #if defined(QT_CHECK_STATE)
@@ -773,3 +829,3 @@ void QSettings::insertSearchPath( System s, const QString &path)
 
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     if ( d->sysd && s != Unix ) {
@@ -778,3 +834,3 @@ void QSettings::insertSearchPath( System s, const QString &path)
 #endif
-#ifdef Q_OS_MAC
+#if !defined(QWS) && defined(Q_OS_MAC)
 	if(s != Mac) //mac is respected on the mac as well
@@ -784,5 +840,11 @@ void QSettings::insertSearchPath( System s, const QString &path)
 
+    QString realPath = path;
+#if defined(Q_WS_WIN)
+    QString defPath = d->globalScope ? d->searchPaths.first() : d->searchPaths.last();
+    realPath = defPath + path;
+#endif
+
     QStringList::Iterator it = d->searchPaths.find(d->searchPaths.last());
     if (it != d->searchPaths.end()) {
-	d->searchPaths.insert(it, path);
+	d->searchPaths.insert(it, realPath);
     }
@@ -800,3 +862,3 @@ void QSettings::removeSearchPath( System s, const QString &path)
 {
-    if ( !verifyKey( path ) ) {
+    if ( !qt_verify_key( path ) ) {
 #if defined(QT_CHECK_STATE)
@@ -813,3 +875,3 @@ void QSettings::removeSearchPath( System s, const QString &path)
 #endif
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     if ( d->sysd && s != Unix ) {
@@ -818,3 +880,3 @@ void QSettings::removeSearchPath( System s, const QString &path)
 #endif
-#ifdef Q_OS_MAC
+#if !defined(QWS) && defined(Q_OS_MAC)
 	if(s != Mac) //mac is respected on the mac as well
@@ -839,3 +901,3 @@ QSettings::QSettings()
 
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     d->sysd = 0;
@@ -856,3 +918,3 @@ QSettings::QSettings( Format format )
 
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     d->sysd = 0;
@@ -874,3 +936,3 @@ QSettings::~QSettings()
 
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     if ( d->sysd )
@@ -889,3 +951,3 @@ bool QSettings::sync()
 {
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     if ( d->sysd )
@@ -907,2 +969,4 @@ bool QSettings::sync()
 	QStringList::Iterator pit = d->searchPaths.begin();
+	if ( !d->globalScope )
+	    ++pit;
 	while (pit != d->searchPaths.end()) {
@@ -919,5 +983,5 @@ bool QSettings::sync()
 
-	it++;
+	++it;
 
-	if (file.name().isNull() || file.name().isEmpty()) {
+	if ( file.name().isEmpty() ) {
 
@@ -965,3 +1029,3 @@ bool QSettings::sync()
 		    stream << grpit.key() << "=" << v << endl;
-		    grpit++;
+		    ++grpit;
 		}
@@ -971,3 +1035,3 @@ bool QSettings::sync()
 
-	    hdit++;
+	    ++hdit;
 	}
@@ -1010,3 +1074,3 @@ bool QSettings::readBoolEntry(const QString &key, bool def, bool *ok )
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
@@ -1020,9 +1084,8 @@ bool QSettings::readBoolEntry(const QString &key, bool def, bool *ok )
 
-    QString theKey = groupKey( group(), key );
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     if ( d->sysd )
-	return d->sysReadBoolEntry( theKey, def, ok );
+	return d->sysReadBoolEntry( groupKey( group(), key ), def, ok );
 #endif
 
-    QString value = readEntry( theKey, ( def ? "true" : "false" ), ok );
+    QString value = readEntry( key, ( def ? "true" : "false" ), ok );
 
@@ -1062,3 +1125,3 @@ double QSettings::readDoubleEntry(const QString &key, double def, bool *ok )
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
@@ -1072,9 +1135,8 @@ double QSettings::readDoubleEntry(const QString &key, double def, bool *ok )
 
-    QString theKey = groupKey( group(), key );
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     if ( d->sysd )
-	return d->sysReadDoubleEntry( theKey, def, ok );
+	return d->sysReadDoubleEntry( groupKey( group(), key ), def, ok );
 #endif
 
-    QString value = readEntry( theKey, QString::number(def), ok );
+    QString value = readEntry( key, QString::number(def), ok );
     bool conv_ok;
@@ -1108,3 +1170,3 @@ int QSettings::readNumEntry(const QString &key, int def, bool *ok )
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
@@ -1117,10 +1179,8 @@ int QSettings::readNumEntry(const QString &key, int def, bool *ok )
 
-    QString theKey = groupKey( group(), key );
-
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     if ( d->sysd )
-	return d->sysReadNumEntry( theKey, def, ok );
+	return d->sysReadNumEntry( groupKey( group(), key ), def, ok );
 #endif
 
-    QString value = readEntry( theKey, QString::number( def ), ok );
+    QString value = readEntry( key, QString::number( def ), ok );
     bool conv_ok;
@@ -1154,3 +1214,3 @@ QString QSettings::readEntry(const QString &key, const QString &def, bool *ok )
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
@@ -1166,3 +1226,3 @@ QString QSettings::readEntry(const QString &key, const QString &def, bool *ok )
 
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     if ( d->sysd )
@@ -1208,7 +1268,9 @@ QString QSettings::readEntry(const QString &key, const QString &def, bool *ok )
     QSettingsGroup grp = d->readGroup();
-    QString retval = grp[realkey];
-    if ( retval.isNull() )
-	retval = def;
-    else if ( ok ) // everything is ok
-	*ok = TRUE;
+    QSettingsGroup::const_iterator it = grp.find( realkey ), end = grp.end();
+    QString retval = def;
+    if ( it != end ) {
+	// found the value we needed
+	retval = *it;
+	if ( ok ) *ok = TRUE;
+    }
     return retval;
@@ -1230,3 +1292,3 @@ bool QSettings::writeEntry(const QString &key, bool value)
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
@@ -1237,10 +1299,8 @@ bool QSettings::writeEntry(const QString &key, bool value)
 
-    QString theKey = groupKey( group(), key );
-
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     if ( d->sysd )
-	return d->sysWriteEntry( theKey, value );
+	return d->sysWriteEntry( groupKey( group(), key ), value );
 #endif
     QString s(value ? "true" : "false");
-    return writeEntry(theKey, s);
+    return writeEntry(key, s);
 }
@@ -1262,3 +1322,3 @@ bool QSettings::writeEntry(const QString &key, double value)
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
@@ -1269,10 +1329,8 @@ bool QSettings::writeEntry(const QString &key, double value)
 
-    QString theKey = groupKey( group(), key );
-
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     if ( d->sysd )
-	return d->sysWriteEntry( theKey, value );
+	return d->sysWriteEntry( groupKey( group(), key ), value );
 #endif
     QString s(QString::number(value));
-    return writeEntry(theKey, s);
+    return writeEntry(key, s);
 }
@@ -1293,3 +1351,3 @@ bool QSettings::writeEntry(const QString &key, int value)
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
@@ -1300,10 +1358,8 @@ bool QSettings::writeEntry(const QString &key, int value)
 
-    QString theKey = groupKey( group(), key );
-
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     if ( d->sysd )
-	return d->sysWriteEntry( theKey, value );
+	return d->sysWriteEntry( groupKey( group(), key ), value );
 #endif
     QString s(QString::number(value));
-    return writeEntry(theKey, s);
+    return writeEntry(key, s);
 }
@@ -1329,3 +1385,3 @@ bool QSettings::writeEntry(const QString &key, const char *value)
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
@@ -1336,5 +1392,3 @@ bool QSettings::writeEntry(const QString &key, const char *value)
 
-    QString theKey = groupKey( group(), key );
-
-    return writeEntry(theKey, QString(value));
+    return writeEntry(key, QString(value));
 }
@@ -1356,3 +1410,3 @@ bool QSettings::writeEntry(const QString &key, const QString &value)
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
@@ -1365,3 +1419,3 @@ bool QSettings::writeEntry(const QString &key, const QString &value)
 
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     if ( d->sysd )
@@ -1417,3 +1471,3 @@ bool QSettings::removeEntry(const QString &key)
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
@@ -1426,3 +1480,3 @@ bool QSettings::removeEntry(const QString &key)
 
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     if ( d->sysd )
@@ -1496,3 +1550,3 @@ QStringList QSettings::entryList(const QString &key) const
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
@@ -1505,3 +1559,3 @@ QStringList QSettings::entryList(const QString &key) const
 
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     if ( d->sysd )
@@ -1546,3 +1600,3 @@ QStringList QSettings::entryList(const QString &key) const
 	itkey = it.key();
-	it++;
+	++it;
 
@@ -1593,3 +1647,3 @@ QStringList QSettings::subkeyList(const QString &key) const
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
@@ -1602,3 +1656,3 @@ QStringList QSettings::subkeyList(const QString &key) const
 
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     if ( d->sysd )
@@ -1608,2 +1662,3 @@ QStringList QSettings::subkeyList(const QString &key) const
     QString realkey;
+    int subkeycount = 2;
     if (theKey[0] == '/') {
@@ -1620,2 +1675,4 @@ QStringList QSettings::subkeyList(const QString &key) const
 
+	subkeycount = list.count();
+
 	if (list.count() == 1) {
@@ -1634,2 +1691,3 @@ QStringList QSettings::subkeyList(const QString &key) const
 	}
+
     } else
@@ -1637,5 +1695,16 @@ QStringList QSettings::subkeyList(const QString &key) const
 
+    QStringList ret;
+    if ( subkeycount == 1 ) {
+	QMap<QString,QSettingsHeading>::Iterator it = d->headings.begin();
+	while ( it != d->headings.end() ) {
+	    if ( it.key() != "General" && ! ret.contains( it.key() ) )
+		ret << it.key();
+	    ++it;
+	}
+
+	return ret;
+    }
+
     QSettingsGroup grp = d->readGroup();
     QSettingsGroup::Iterator it = grp.begin();
-    QStringList ret;
     QString itkey;
@@ -1643,3 +1712,3 @@ QStringList QSettings::subkeyList(const QString &key) const
 	itkey = it.key();
-	it++;
+	++it;
 
@@ -1672,3 +1741,3 @@ QDateTime QSettings::lastModficationTime(const QString &key)
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
@@ -1681,3 +1750,3 @@ QDateTime QSettings::lastModficationTime(const QString &key)
 
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     if ( d->sysd )
@@ -1717,5 +1786,13 @@ QDateTime QSettings::lastModficationTime(const QString &key)
     by \a value. The list is stored as a sequence of strings separated
-    by \a separator, so none of the strings in the list should contain
-    the separator. If the list is empty or null the key's value will
-    be an empty string.
+    by \a separator (using QStringList::join()), so none of the
+    strings in the list should contain the separator. If the list is
+    empty or null the key's value will be an empty string.
+
+    \warning The list should not contain empty or null strings, as
+    readListEntry() will use QStringList::split() to recreate the
+    list.  As the documentation states, QStringList::split() will omit
+    empty strings from the list.  Because of this, it is impossible to
+    retrieve identical list data that is stored with this function.
+    We recommend using the writeEntry() and readListEntry() overloads
+    that do not take a \a separator argument.
 
@@ -1770,2 +1847,9 @@ bool QSettings::writeEntry(const QString &key, const QStringList &value)
 
+    \warning As the documentation states, QStringList::split() will
+    omit empty strings from the list.  Because of this, it is
+    impossible to retrieve identical list data with this function.  We
+    recommend using the readListEntry() and writeEntry() overloads
+    that do not take a \a separator argument.
+
+
     Note that if you want to iterate over the list, you should iterate
@@ -1849,15 +1933,22 @@ QStringList QSettings::readListEntry(const QString &key, bool *ok )
 
+#ifdef Q_OS_MAC
+void qt_setSettingsBasePath(const QString &); //qsettings_mac.cpp
+#endif
+
 /*!
-  Insert platform-dependent paths from platform-independent information.
+    Insert platform-dependent paths from platform-independent information.
+
+    The \a domain should be an Internet domain name
+    controlled by the producer of the software, eg. Trolltech products
+    use "trolltech.com".
 
-  The \a domain should be an Internet domain name
-  controlled by the producer of the software, eg. Trolltech products
-  use "trolltech.com".
+    The \a product should be the official name of the product.
 
-  The \a product should be the official name of the product.
+    The \a scope should be
+    QSettings::User for user-specific settings, or
+    QSettings::Global for system-wide settings (generally
+    these will be read-only to many users).
 
-  The \a scope should be
-  QSettings::User for user-specific settings, or
-  QSettings::Global for system-wide settings (generally
-  these will be read-only to many users).
+    Not all information is relevant on all systems (e.g. scoping is
+    currently used only if QSettings accesses the Windows registry).
 */
@@ -1875,3 +1966,3 @@ void QSettings::setPath( const QString &domain, const QString &product, Scope sc
 //    scope.
-//    
+//
 //    On MacOS X, if there is no "." in domain, append ".com", then reverse the
@@ -1882,2 +1973,4 @@ void QSettings::setPath( const QString &domain, const QString &product, Scope sc
 //    scope.
+    d->globalScope = scope == Global;
+
     QString actualSearchPath;
@@ -1888,7 +1981,7 @@ void QSettings::setPath( const QString &domain, const QString &product, Scope sc
     insertSearchPath( Windows, actualSearchPath );
-#elif defined(Q_WS_MAC)
+#elif !defined(QWS) && defined(Q_OS_MAC)
     QString topLevelDomain = domain.right( domain.length() - lastDot - 1 ) + ".";
-    if ( topLevelDomain.isEmpty() )
-	topLevelDomain = "com.";
-    actualSearchPath = "/" + topLevelDomain + domain.left( lastDot ) + product;
+    if ( !topLevelDomain.isEmpty() )
+	qt_setSettingsBasePath( topLevelDomain );
+    actualSearchPath = "/" + domain.left( lastDot ) + product;
     insertSearchPath( Mac, actualSearchPath );
@@ -1898,4 +1991,2 @@ void QSettings::setPath( const QString &domain, const QString &product, Scope sc
 #endif
-
-    d->globalScope = scope == Global;
 }
@@ -1904,2 +1995,9 @@ void QSettings::setPath( const QString &domain, const QString &product, Scope sc
     Appends \a group to the current key prefix.
+
+    \code
+    QSettings settings;
+    settings.beginGroup( "/MainWindow" );
+    // read values
+    settings.endGroup();
+    \endcode
 */
@@ -1914,2 +2012,9 @@ void QSettings::beginGroup( const QString &group )
     by a single call to endGroup().
+
+    \code
+    QSettings settings;
+    settings.beginGroup( "/MainWindow/Geometry" );
+    // read values
+    settings.endGroup();
+    \endcode
 */
@@ -1947,3 +2052,3 @@ QString QSettings::group() const
 	    if ( group[0] != '/' )
-		group = "/" + group;
+		group.prepend( "/" );
 	    d->groupPrefix += group;
diff --git a/qmake/tools/qstring.cpp b/qmake/tools/qstring.cpp
index 56df62b..7f1fac3 100644
--- a/qmake/tools/qstring.cpp
+++ b/qmake/tools/qstring.cpp
@@ -7,3 +7,3 @@
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
@@ -49,3 +49,2 @@
 #endif
-#include <ctype.h>
 #include <limits.h>
@@ -54,2 +53,3 @@
 #include <stdlib.h>
+#include <string.h>
 #if defined(Q_WS_WIN)
@@ -61,2 +61,6 @@
 
+#ifdef QT_NO_UNICODETABLES
+# include <ctype.h>
+#endif
+
 
@@ -11789,2 +11793,3 @@ static inline QChar::Direction direction( const QChar &c )
 #else
+    Q_UNUSED(c);
     return QChar::DirL;
@@ -11801,2 +11806,3 @@ static inline bool mirrored( const QChar &c )
 #else
+    Q_UNUSED(c);
     return FALSE;
@@ -11902,3 +11908,3 @@ static uint computeNewMax( uint len )
 	newMax *= 2;
-    // try to spare some memory
+    // try to save some memory
     if ( newMax >= 1024 * 1024 && len <= newMax - (newMax >> 2) )
@@ -12893,3 +12899,3 @@ void QString::compose()
 
-QChar* QString::asciiToUnicode( const QByteArray& ba, uint* len )
+QChar* QString::latin1ToUnicode( const QByteArray& ba, uint* len )
 {
@@ -12912,3 +12918,3 @@ QChar* QString::asciiToUnicode( const QByteArray& ba, uint* len )
 
-static QChar* internalAsciiToUnicode( const QByteArray& ba, uint* len )
+static QChar* internalLatin1ToUnicode( const QByteArray& ba, uint* len )
 {
@@ -12942,3 +12948,3 @@ static QChar* internalAsciiToUnicode( const QByteArray& ba, uint* len )
 
-QChar* QString::asciiToUnicode( const char *str, uint* len, uint maxlen )
+QChar* QString::latin1ToUnicode( const char *str, uint* len, uint maxlen )
 {
@@ -12952,3 +12958,3 @@ QChar* QString::asciiToUnicode( const char *str, uint* len, uint maxlen )
 	    // Faster?
-	    l = qstrlen(str);
+	    l = strlen( str );
 	}
@@ -12965,3 +12971,3 @@ QChar* QString::asciiToUnicode( const char *str, uint* len, uint maxlen )
 
-static QChar* internalAsciiToUnicode( const char *str, uint* len,
+static QChar* internalLatin1ToUnicode( const char *str, uint* len,
 				      uint maxlen = (uint)-1 )
@@ -12976,3 +12982,3 @@ static QChar* internalAsciiToUnicode( const char *str, uint* len,
 	    // Faster?
-	    l = qstrlen(str);
+	    l = strlen( str );
 	}
@@ -12996,3 +13002,3 @@ static QChar* internalAsciiToUnicode( const char *str, uint* len,
 */
-char* QString::unicodeToAscii(const QChar *uc, uint l)
+char* QString::unicodeToLatin1(const QChar *uc, uint l)
 {
@@ -13159,31 +13165,2 @@ QStringData* QString::makeSharedNull()
 
-// Uncomment this to get some useful statistics.
-// #define Q2HELPER(x) x
-
-#ifdef Q2HELPER
-static int stat_construct_charstar=0;
-static int stat_construct_charstar_size=0;
-static int stat_construct_null=0;
-static int stat_construct_int=0;
-static int stat_construct_int_size=0;
-static int stat_construct_ba=0;
-static int stat_get_ascii=0;
-static int stat_get_ascii_size=0;
-static int stat_copy_on_write=0;
-static int stat_copy_on_write_size=0;
-static int stat_fast_copy=0;
-Q_EXPORT void qt_qstring_stats()
-{
-	qDebug("construct_charstar = %d (%d chars)", stat_construct_charstar, stat_construct_charstar_size);
-	qDebug("construct_null = %d", stat_construct_null);
-	qDebug("construct_int = %d (%d chars)", stat_construct_int, stat_construct_int_size);
-	qDebug("construct_ba = %d", stat_construct_ba);
-	qDebug("get_ascii = %d (%d chars)", stat_get_ascii, stat_get_ascii_size);
-	qDebug("copy_on_write = %d (%d chars)", stat_copy_on_write, stat_copy_on_write_size);
-	qDebug("fast_copy = %d", stat_fast_copy);
-}
-#else
-#define Q2HELPER(x)
-#endif
-
 /*!
@@ -13213,3 +13190,2 @@ QString::QString( const QString &s ) :
 {
-    Q2HELPER(stat_fast_copy++)
     d->ref();
@@ -13232,5 +13208,3 @@ QString::QString( int size, bool /*dummy*/ )
     if ( size ) {
-	Q2HELPER(stat_construct_int++)
 	int l = size;
-	Q2HELPER(stat_construct_int_size+=l)
 	QChar* uc = QT_ALLOC_QCHAR_VEC( l );
@@ -13238,3 +13212,2 @@ QString::QString( int size, bool /*dummy*/ )
     } else {
-	Q2HELPER(stat_construct_null++)
 	d = shared_null ? shared_null : (shared_null=new QStringData);
@@ -13251,5 +13224,11 @@ QString::QString( const QByteArray& ba )
 {
-    Q2HELPER(stat_construct_ba++)
+#ifndef QT_NO_TEXTCODEC
+    if ( QTextCodec::codecForCStrings() ) {
+	d = 0;
+	*this = fromAscii( ba.data(), ba.size() );
+	return;
+    }
+#endif
     uint l;
-    QChar *uc = internalAsciiToUnicode(ba,&l);
+    QChar *uc = internalLatin1ToUnicode(ba,&l);
     d = new QStringData(uc,l,l);
@@ -13304,8 +13283,35 @@ QString::QString( const char *str )
 {
-    Q2HELPER(stat_construct_charstar++)
+#ifndef QT_NO_TEXTCODEC
+    if ( QTextCodec::codecForCStrings() ) {
+	d = 0;
+	*this = fromAscii( str );
+	return;
+    }
+#endif
+    uint l;
+    QChar *uc = internalLatin1ToUnicode(str,&l);
+    d = new QStringData(uc,l,l);
+}
+
+#ifndef QT_NO_STL
+/*!
+    Constructs a string that is a deep copy of \a str.
+
+    This is the same as fromAscii(\a str).
+*/
+
+QString::QString( const std::string &str )
+{
+#ifndef QT_NO_TEXTCODEC
+    if ( QTextCodec::codecForCStrings() ) {
+	d = 0;
+	*this = fromAscii( str.c_str() );
+	return;
+    }
+#endif
     uint l;
-    QChar *uc = internalAsciiToUnicode(str,&l);
-    Q2HELPER(stat_construct_charstar_size+=l)
+    QChar *uc = internalLatin1ToUnicode(str.c_str(),&l);
     d = new QStringData(uc,l,l);
 }
+#endif
 
@@ -13335,6 +13341,6 @@ void QString::deref()
 {
-    if ( d->deref() ) {
+    if ( d && d->deref() ) {
 	if ( d != shared_null )
 	    delete d;
-	d = 0; // helps debugging
+	d = 0;
     }
@@ -13354,2 +13360,11 @@ void QStringData::deleteSelf()
 /*!
+    \fn QString& QString::operator=( const std::string& s )
+
+    \overload
+
+    Makes a deep copy of \a s and returns a reference to the deep
+    copy.
+*/
+
+/*!
     \fn QString& QString::operator=( char c )
@@ -13370,3 +13385,2 @@ QString &QString::operator=( const QString &s )
 {
-    Q2HELPER(stat_fast_copy++)
     s.d->ref();
@@ -13385,3 +13399,3 @@ QString &QString::operator=( const QCString& cs )
 {
-    return setLatin1(cs);
+    return setAscii(cs);
 }
@@ -13401,3 +13415,3 @@ QString &QString::operator=( const char *str )
 {
-    return setLatin1(str);
+    return setAscii(str);
 }
@@ -13473,4 +13487,3 @@ void QString::truncate( uint newLen )
 
-    If \a newLen is 0, then the string becomes empty, unless the
-    string is null, in which case it remains null.
+    If \a newLen is 0, then the string becomes empty (non-null).
 
@@ -13488,8 +13501,8 @@ void QString::truncate( uint newLen )
 	QString result;
-	int resultLength = 0;
-	result.setLength( newLen ) // allocate some space
+	int len = 0;
+	result.setLength( maxLen );     // allocate some space
 	while ( ... ) {
-	    result[resultLength++] = ... // fill (part of) the space with data
+	    result[len++] = ...         // fill part of the space
 	}
-	result.truncate[resultLength]; // and get rid of the undefined junk
+	result.truncate( len );         // and get rid of the rest
     \endcode
@@ -13507,4 +13520,2 @@ void QString::setLength( uint newLen )
 	// detach, grow or shrink
-	Q2HELPER(stat_copy_on_write++)
-	Q2HELPER(stat_copy_on_write_size+=d->len)
 	uint newMax = computeNewMax( newLen );
@@ -13532,17 +13543,16 @@ void QString::setLength( uint newLen )
 
+    The following example shows how we could create a 'status' string
+    when processing a list of files:
     \code
-	QString firstName( "Joe" );
-	QString lastName( "Bloggs" );
-	QString fullName;
-	fullName = QString( "First name is '%1', last name is '%2'" )
-		    .arg( firstName )
-		    .arg( lastName );
-
-	// fullName == First name is 'Joe', last name is 'Bloggs'
+    QString status = QString( "Processing file %1 of %2: %3" )
+			.arg( i )         // current file's number
+			.arg( total )     // number of files to process
+			.arg( fileName ); // current file's name
     \endcode
 
-    Note that using arg() to construct sentences as we've done in the
-    example above does not usually translate well into other languages
-    because sentence structure and word order often differ between
-    languages.
+    It is generally fine to use filenames and numbers as we have done
+    in the example above. But note that using arg() to construct
+    natural language sentences does not usually translate well into
+    other languages because sentence structure and word order often
+    differ between languages.
 
@@ -13776,3 +13786,3 @@ QString &QString::sprintf( const char* cformat, ... )
     }
-    QString format = fromLatin1( cformat );
+    QString format = fromAscii( cformat );
 
@@ -13915,3 +13925,3 @@ QString &QString::sprintf( const char* cformat, ... )
 	    }
-	    replacement = fromLatin1( out );
+	    replacement = fromAscii( out );
 	}
@@ -14126,4 +14136,6 @@ int QString::find( const QString& str, int index, bool cs ) const
 
+#ifndef MACOSX_101
     if ( sl == 1 )
 	return find( *str.unicode(), index, cs );
+#endif
 
@@ -14223,2 +14235,5 @@ int QString::findRev( QChar c, int index, bool cs ) const
 {
+#ifdef MACOSX_101
+    return findRev( QString( c ), index, cs );
+#else
     const uint l = length();
@@ -14239,2 +14254,3 @@ int QString::findRev( QChar c, int index, bool cs ) const
     return uc - end;
+#endif
 }
@@ -14275,4 +14291,6 @@ int QString::findRev( const QString& str, int index, bool cs ) const
 
+#ifndef MACOSX_101
     if ( sl == 1 )
 	return findRev( *str.unicode(), index, cs );
+#endif
 
@@ -14981,15 +14999,20 @@ QString QString::lower() const
 {
-    QString s(*this);
-    int l=length();
-    if ( l ) {
-	s.real_detach(); // could do this only when we find a change
-	register QChar *p=s.d->unicode;
-	if ( p ) {
-	    while ( l-- ) {
+    int l = length();
+    register QChar *p = d->unicode;
+    while ( l ) {
+	if ( *p != ::lower(*p) ) {
+	    QString s( *this );
+	    s.real_detach();
+	    p = s.d->unicode + ( p - d->unicode );
+	    while ( l ) {
 		*p = ::lower( *p );
+		l--;
 		p++;
 	    }
+	    return s;
 	}
+	l--;
+	p++;
     }
-    return s;
+    return *this;
 }
@@ -15009,15 +15032,20 @@ QString QString::upper() const
 {
-    QString s(*this);
-    int l=length();
-    if ( l ) {
-	s.real_detach(); // could do this only when we find a change
-	register QChar *p=s.d->unicode;
-	if ( p ) {
-	    while ( l-- ) {
+    int l = length();
+    register QChar *p = d->unicode;
+    while ( l ) {
+	if ( *p != ::upper(*p) ) {
+	    QString s( *this );
+	    s.real_detach();
+	    p = s.d->unicode + ( p - d->unicode );
+	    while ( l ) {
 		*p = ::upper( *p );
+		l--;
 		p++;
 	    }
+	    return s;
 	}
+	l--;
+	p++;
     }
-    return s;
+    return *this;
 }
@@ -15139,4 +15167,4 @@ QString &QString::insert( uint index, const QString &s )
 
-    Inserts the character in \a s into the string at position \a index
-    \a len number of times and returns a reference to the string.
+    Inserts the first \a len characters in \a s into the string at
+    position \a index and returns a reference to the string.
 */
@@ -15253,2 +15281,12 @@ QString &QString::insert( uint index, QChar c ) // insert char
 
+/*! \fn QString& QString::prepend( const std::string &s )
+  \overload
+
+  Inserts \a s at the beginning of the string and returns a reference to the string.
+
+  Equivalent to insert(0, \a s).
+
+  \sa insert()
+ */
+
 /*!
@@ -15850,5 +15888,5 @@ long QString::toLong( bool *ok, int base ) const
     const QChar *p = unicode();
-    long val = 0;
+    ulong val = 0;
     int l = length();
-    const long max_mult = INT_MAX / base;
+    const ulong max_mult = LONG_MAX / base;
     bool is_ok = FALSE;
@@ -15885,3 +15923,3 @@ long QString::toLong( bool *ok, int base ) const
 	if ( val > max_mult ||
-	    (val == max_mult && dv > (INT_MAX % base) + neg) )
+	    (val == max_mult && dv > (LONG_MAX % base) + neg) )
 	    goto bye;
@@ -15890,6 +15928,4 @@ long QString::toLong( bool *ok, int base ) const
     }
-    if ( neg )
-	val = -val;
     while ( l && p->isSpace() )                 // skip trailing space
-	l--,p++;
+	l--, p++;
     if ( !l )
@@ -15899,3 +15935,3 @@ bye:
 	*ok = is_ok;
-    return is_ok ? val : 0;
+    return is_ok ? ( neg ? -( (long) val ) : (long) val ) : 0L;
 }
@@ -15917,3 +15953,3 @@ ulong QString::toULong( bool *ok, int base ) const
     int l = length();
-    const ulong max_mult = UINT_MAX / base;
+    const ulong max_mult = ULONG_MAX / base;
     bool is_ok = FALSE;
@@ -15942,3 +15978,3 @@ ulong QString::toULong( bool *ok, int base ) const
 	}
-	if ( val > max_mult || (val == max_mult && dv > UINT_MAX % base) )
+	if ( val > max_mult || (val == max_mult && dv > ULONG_MAX % base) )
 	    goto bye;
@@ -15969,3 +16005,3 @@ short QString::toShort( bool *ok, int base ) const
     long v = toLong( ok, base );
-    if ( ok && *ok && (v < -32768 || v > 32767) ) {
+    if ( ok && *ok && (v < SHRT_MIN || v > SHRT_MAX) ) {
 	*ok = FALSE;
@@ -15988,3 +16024,3 @@ ushort QString::toUShort( bool *ok, int base ) const
     ulong v = toULong( ok, base );
-    if ( ok && *ok && (v > 65535) ) {
+    if ( ok && *ok && (v > USHRT_MAX) ) {
 	*ok = FALSE;
@@ -16015,3 +16051,8 @@ int QString::toInt( bool *ok, int base ) const
 {
-    return (int)toLong( ok, base );
+    long v = toLong( ok, base );
+    if ( ok && *ok && (v < INT_MIN || v > INT_MAX) ) {
+	*ok = FALSE;
+	v = 0;
+    }
+    return (int)v;
 }
@@ -16030,3 +16071,8 @@ uint QString::toUInt( bool *ok, int base ) const
 {
-    return (uint)toULong( ok, base );
+    ulong v = toULong( ok, base );
+    if ( ok && *ok && (v > UINT_MAX) ) {
+	*ok = FALSE;
+	v = 0;
+    }
+    return (uint)v;
 }
@@ -16054,3 +16100,3 @@ double QString::toDouble( bool *ok ) const
     if ( ok )
-	*ok = ( a && *a && (end == 0 || (end - a) == (int)length()) );
+	*ok = ( a && *a && (end == 0 || *end == '\0') );
     return val;
@@ -16100,7 +16146,7 @@ QString &QString::setNum( long n, int base )
 	neg = TRUE;
-	if ( n == INT_MIN ) {
+	if ( n == LONG_MIN ) {
 	    // Cannot always negate this special case
 	    QString s1, s2;
-	    s1.setNum(n/base);
-	    s2.setNum((-(n+base))%base);
+	    s1.setNum(n/base, base );
+	    s2.setNum((-(n+base))%base, base );
 	    *this = s1 + s2;
@@ -16463,2 +16509,11 @@ void QString::setExpand( uint index, QChar c )
 
+/*! \fn QString& QString::append( const std::string &str )
+  \overload
+
+  Appends \a str to the string and returns a reference to the result.
+
+  Equivalent to operator+=().
+ */
+
+
 /*! \fn QString& QString::append( const char *str )
@@ -16492,2 +16547,3 @@ QString& QString::operator+=( const QString &str )
 */
+#ifndef QT_NO_CAST_ASCII
 QString& QString::operator+=( const char *str )
@@ -16495,2 +16551,7 @@ QString& QString::operator+=( const char *str )
     if ( str ) {
+#ifndef QT_NO_TEXTCODEC
+	if ( QTextCodec::codecForCStrings() )
+	    return operator+=( fromAscii( str ) );
+#endif
+
 	uint len1 = length();
@@ -16510,2 +16571,3 @@ QString& QString::operator+=( const char *str )
 }
+#endif
 
@@ -16531,2 +16593,6 @@ QString &QString::operator+=( char c )
 {
+#ifndef QT_NO_TEXTCODEC
+    if ( QTextCodec::codecForCStrings() )
+	return operator+=( fromAscii( &c, 1 ) );
+#endif
     setLength(length()+1);
@@ -16543,2 +16609,9 @@ QString &QString::operator+=( char c )
 
+/*!
+  \fn QString &QString::operator+=( const std::string &str )
+  \overload
+
+  Appends \a str to the string and returns a reference to the string.
+*/
+
 
@@ -16548,4 +16621,4 @@ QString &QString::operator+=( char c )
 
-    Returns a latin-1 copy of this character, if this character is in
-    the latin-1 character set. If not, this function returns 0.
+    Returns the Latin-1 value of this character, or 0 if it
+    cannot be represented in Latin-1.
 */
@@ -16554,3 +16627,3 @@ QString &QString::operator+=( char c )
 /*!
-    Returns a Latin-1 representation of the string. Note that the
+    Returns a Latin-1 representation of the string. The
     returned value is undefined if the string contains non-Latin-1
@@ -16565,3 +16638,3 @@ QString &QString::operator+=( char c )
 
-    \sa utf8(), local8Bit()
+    \sa fromLatin1(), ascii(), utf8(), local8Bit()
 */
@@ -16569,6 +16642,5 @@ const char* QString::latin1() const
 {
-    if ( !d->ascii ) {
-	Q2HELPER(stat_get_ascii++)
-	Q2HELPER(stat_get_ascii_size+=d->len)
-	d->ascii = unicodeToAscii( d->unicode, d->len );
+    if ( !d->ascii  || !d->islatin1 ) {
+	d->ascii = unicodeToLatin1( d->unicode, d->len );
+	d->islatin1 = TRUE;
     }
@@ -16578,10 +16650,29 @@ const char* QString::latin1() const
 /*!
-  \fn const char* QString::ascii() const
-  \obsolete
+    Returns an 8-bit ASCII representation of the string.
 
-  This function simply calls latin1() and returns the result.
+    If a codec has been set using QTextCodec::codecForCStrings(),
+    it is used to convert Unicode to 8-bit char. Otherwise, this function
+    does the same as latin1().
+
+    \sa fromAscii(), latin1(), utf8(), local8Bit()
 */
+const char* QString::ascii() const
+{
+#ifndef QT_NO_TEXTCODEC
+    if ( QTextCodec::codecForCStrings() ) {
+	if ( !d->ascii || d->islatin1 ) {
+	    QCString s = QTextCodec::codecForCStrings()->fromUnicode( *this );
+	    s.detach();
+	    d->ascii = s.data();
+	    d->islatin1 = FALSE;
+	    s.resetRawData( s.data(), s.size() ); // we have stolen the data
+	}
+	return d->ascii;
+    }
+#endif // QT_NO_TEXTCODEC
+    return latin1();
+}
 
 /*!
-    Returns the string encoded in UTF8 format.
+    Returns the string encoded in UTF-8 format.
 
@@ -16589,3 +16680,3 @@ const char* QString::latin1() const
 
-    \sa QString::fromUtf8(), local8Bit(), latin1()
+    \sa fromUtf8(), ascii(), latin1(), local8Bit()
 */
@@ -16635,3 +16726,4 @@ QString QString::fromUtf8( const char* utf8, int len )
 
-    if ( len < 0 ) len = qstrlen( utf8 );
+    if ( len < 0 )
+	len = strlen( utf8 );
     QString result;
@@ -16676,6 +16768,10 @@ QString QString::fromUtf8( const char* utf8, int len )
     Returns the Unicode string decoded from the first \a len
-    characters of \a chars, ignoring the rest of \a chars. If \a len
-    is -1 then the length of \a chars is used. If \a len is bigger
-    than the length of \a chars then it will use the length of \a
-    chars.
+    characters of \a ascii, ignoring the rest of \a ascii. If \a len
+    is -1 then the length of \a ascii is used. If \a len is bigger
+    than the length of \a ascii then it will use the length of \a
+    ascii.
+
+    If a codec has been set using QTextCodec::codecForCStrings(),
+    it is used to convert Unicode to 8-bit char. Otherwise, this function
+    does the same as fromLatin1().
 
@@ -16684,8 +16780,34 @@ QString QString::fromUtf8( const char* utf8, int len )
     \c QT_NO_CAST_ASCII, in which case you can explicitly create a
-    QString from Latin-1 text using this function.
+    QString from 8-bit ASCII text using this function.
 
     \code
-	QString str = QString::fromLatin1( "123456789", 5 );
+	QString str = QString::fromAscii( "123456789", 5 );
 	// str == "12345"
     \endcode
+ */
+QString QString::fromAscii( const char* ascii, int len )
+{
+#ifndef QT_NO_TEXTCODEC
+    if ( QTextCodec::codecForCStrings() ) {
+	if ( !ascii )
+	    return QString::null;
+	if ( len < 0 )
+	    len = strlen( ascii );
+	if ( len == 0 || *ascii == '\0' )
+	    return QString::fromLatin1( "" );
+	return QTextCodec::codecForCStrings()->toUnicode( ascii, len );
+    }
+#endif
+    return fromLatin1( ascii, len );
+}
+
+
+/*!
+    Returns the Unicode string decoded from the first \a len
+    characters of \a chars, ignoring the rest of \a chars. If \a len
+    is -1 then the length of \a chars is used. If \a len is bigger
+    than the length of \a chars then it will use the length of \a
+    chars.
+
+    \sa fromAscii()
 */
@@ -16697,3 +16819,3 @@ QString QString::fromLatin1( const char* chars, int len )
 	 len = -1;
-    uc = internalAsciiToUnicode( chars, &l, len );
+    uc = internalLatin1ToUnicode( chars, &l, len );
     return QString( new QStringData(uc, l, l), TRUE );
@@ -16711,4 +16833,4 @@ QString QString::fromLatin1( const char* chars, int len )
     this is the QTextCodec::codecForLocale(). On Windows, it is a
-    system-defined encoding. On Mac OS X, this always uses utf8 as the
-    encoding.
+    system-defined encoding. On Mac OS X, this always uses UTF-8 as
+    the encoding.
 
@@ -16717,6 +16839,5 @@ QString QString::fromLatin1( const char* chars, int len )
 
-    \sa QString::fromLocal8Bit(), latin1(), utf8()
+    \sa fromLocal8Bit(), ascii(), latin1(), utf8()
 */
 
-
 QCString QString::local8Bit() const
@@ -16742,3 +16863,3 @@ QCString QString::local8Bit() const
 #ifdef Q_WS_QWS
-    return utf8(); // ##### if there is ANY 8 bit format supported?
+    return utf8(); // ### if there is any 8 bit format supported?
 #endif
@@ -16773,3 +16894,4 @@ QString QString::fromLocal8Bit( const char* local8Bit, int len )
     QTextCodec* codec = QTextCodec::codecForLocale();
-    if ( len < 0 ) len = qstrlen(local8Bit);
+    if ( len < 0 )
+	len = strlen( local8Bit );
     return codec
@@ -16806,2 +16928,8 @@ QString QString::fromLocal8Bit( const char* local8Bit, int len )
 
+/*!
+    \fn QString::operator std::string() const
+
+    Returns ascii().
+*/
+
 
@@ -16821,4 +16949,2 @@ const unsigned short *QString::ucs2() const
 	// detach, grow or shrink
-	Q2HELPER(stat_copy_on_write++)
-	Q2HELPER(stat_copy_on_write_size += len)
 	uint newMax = computeNewMax( len + 1 );
@@ -16985,4 +17111,2 @@ QString& QString::setUnicode( const QChar *unicode, uint len )
 	// detach, grown or shrink
-	Q2HELPER(stat_copy_on_write++)
-	Q2HELPER(stat_copy_on_write_size+=d->len)
 	uint newMax = computeNewMax( len );
@@ -17020,2 +17144,24 @@ QString& QString::setUnicodeCodes( const ushort* unicode_as_ushorts, uint len )
 /*!
+    Sets this string to \a str, interpreted as a classic 8-bit ASCII C
+    string. If \a len is -1 (the default), then it is set to
+    strlen(str).
+
+    If \a str is 0 a null string is created. If \a str is "", an empty
+    string is created.
+
+    \sa isNull(), isEmpty()
+*/
+
+QString &QString::setAscii( const char *str, int len )
+{
+#ifndef QT_NO_TEXTCODEC
+    if ( QTextCodec::codecForCStrings() ) {
+	*this = QString::fromAscii( str, len );
+	return *this;
+    }
+#endif // QT_NO_TEXTCODEC
+    return setLatin1( str, len );
+}
+
+/*!
     Sets this string to \a str, interpreted as a classic Latin1 C
@@ -17035,3 +17181,3 @@ QString &QString::setLatin1( const char *str, int len )
     if ( len < 0 )
-	len = qstrlen(str);
+	len = strlen( str );
     if ( len == 0 ) {                           // won't make a null string
@@ -17053,3 +17199,2 @@ void QString::checkSimpleText() const
     QChar *end = p + d->len;
-    d->simpletext = 1;
     while( p < end ) {
@@ -17058,3 +17203,3 @@ void QString::checkSimpleText() const
 	if ( uc > 0x058f && ( uc < 0x1100 || uc > 0xfb0f ) ) {
-	    d->simpletext = 0;
+	    d->issimpletext = FALSE;
 	    return;
@@ -17063,2 +17208,3 @@ void QString::checkSimpleText() const
     }
+    d->issimpletext = TRUE;
 }
diff --git a/qmake/tools/qtextstream.cpp b/qmake/tools/qtextstream.cpp
index 75c6531..ddca5bd 100644
--- a/qmake/tools/qtextstream.cpp
+++ b/qmake/tools/qtextstream.cpp
@@ -1091,3 +1091,3 @@ QTextStream &QTextStream::writeBlock( const QChar* p, uint len )
     if ( latin1 ) {
-	char *str = QString::unicodeToAscii( p, len );
+	char *str = QString::unicodeToLatin1( p, len );
 	dev->writeBlock( str, len );
diff --git a/qmake/tools/qucom.cpp b/qmake/tools/qucom.cpp
index 6086a79..658da97 100644
--- a/qmake/tools/qucom.cpp
+++ b/qmake/tools/qucom.cpp
@@ -298,4 +298,3 @@ bool QUType_int::canConvertFrom( QUObject *o, QUType *t )
 {
-    if ( isEqual( t, &static_QUType_double ) ||
-	 isEqual( t, &static_QUType_float ) )
+    if ( isEqual( t, &static_QUType_double ) )
 	return TRUE;
@@ -307,4 +306,3 @@ bool QUType_int::canConvertTo( QUObject * /*o*/, QUType *t )
 {
-    return isEqual( t,  &static_QUType_double ) ||
-	isEqual( t, &static_QUType_float );
+    return isEqual( t,  &static_QUType_double );
 }
@@ -315,4 +313,2 @@ bool QUType_int::convertFrom( QUObject *o, QUType *t )
 	o->payload.i = (long)o->payload.d;
-    else if ( isEqual( t, &static_QUType_float ) )
-	o->payload.i = (long)o->payload.f;
     else
@@ -329,5 +325,2 @@ bool QUType_int::convertTo( QUObject *o, QUType *t )
 	o->type = &static_QUType_double;
-    } else if ( isEqual( t,  &static_QUType_float ) ) {	
-	o->payload.f = (float)o->payload.i;
-	o->type = &static_QUType_float;
     } else
@@ -347,44 +340,2 @@ int QUType_int::serializeFrom( QUObject *, QUBuffer * )
 
-// {5938712A-C496-11D5-8CB2-00C0F03BC0F3}
-const QUuid TID_QUType_uint( 0x5938712a, 0xc496, 0x11d5, 0x8c, 0xb2, 0x00, 0xc0, 0xf0, 0x3b, 0xc0, 0xf3);
-QUType_uint static_QUType_uint;
-const QUuid *QUType_uint::uuid() const  { return &TID_QUType_uint; }
-const char *QUType_uint::desc() const { return "uint"; }
-
-void QUType_uint::set( QUObject *o, uint v )
-{
-    o->payload.ui = v;
-    o->type = this;
-}
-
-bool QUType_uint::canConvertFrom( QUObject *o, QUType *t )
-{
-    return t->canConvertTo( o, this );
-}
-
-bool QUType_uint::canConvertTo( QUObject * /*o*/, QUType * /*t*/ )
-{
-    return FALSE;
-}
-
-bool QUType_uint::convertFrom( QUObject *o, QUType *t )
-{
-    return t->convertTo( o, this );
-}
-
-bool QUType_uint::convertTo( QUObject * /*o*/, QUType * /*t*/ )
-{
-    return FALSE;
-}
-
-int QUType_uint::serializeTo( QUObject *, QUBuffer * )
-{
-    return 0;
-}
-
-int QUType_uint::serializeFrom( QUObject *, QUBuffer * )
-{
-    return 0;
-}
-
 // {2D0974E5-0BA6-4ec2-8837-C198972CB48C}
@@ -403,4 +354,3 @@ bool QUType_double::canConvertFrom( QUObject *o, QUType *t )
 {
-    if ( isEqual( t, &static_QUType_int ) ||
-	 isEqual( t, &static_QUType_float) )
+    if ( isEqual( t, &static_QUType_int ) )
 	return TRUE;
@@ -412,4 +362,3 @@ bool QUType_double::canConvertTo( QUObject * /*o*/, QUType *t )
 {
-    return isEqual( t,  &static_QUType_int ) ||
-	isEqual( t,  &static_QUType_float );
+    return isEqual( t,  &static_QUType_int );
 }
@@ -420,5 +369,3 @@ bool QUType_double::convertFrom( QUObject *o, QUType *t )
 	o->payload.d = (double)o->payload.i;
-    else if ( isEqual( t, &static_QUType_float ) )
-	o->payload.d = (double)o->payload.f;
-    else
+     else
 	return t->convertTo( o, this );
@@ -452,66 +399,2 @@ int QUType_double::serializeFrom( QUObject *, QUBuffer * )
 
-
-// {544C5175-6993-4486-B04D-CEC4D21BF4B9 }
-const QUuid TID_QUType_float( 0x544c5175, 0x6993, 0x4486, 0xb0, 0x4d, 0xce, 0xc4, 0xd2, 0x1b, 0xf4, 0xb9 );
-QUType_float static_QUType_float;
-const QUuid *QUType_float::uuid() const { return &TID_QUType_float; }
-const char *QUType_float::desc() const {return "float"; }
-
-void QUType_float::set( QUObject *o, float v )
-{
-    o->payload.f = v;
-    o->type = this;
-}
-
-bool QUType_float::canConvertFrom( QUObject *o, QUType *t )
-{
-    if ( isEqual( t, &static_QUType_int ) ||
-	 isEqual( t, &static_QUType_double ) )
-	return TRUE;
-
-    return t->canConvertTo( o, this );
-}
-
-bool QUType_float::canConvertTo( QUObject * /*o*/, QUType *t )
-{
-    return isEqual( t,  &static_QUType_int ) ||
-	isEqual( t,  &static_QUType_double );
-}
-
-bool QUType_float::convertFrom( QUObject *o, QUType *t )
-{
-    if ( isEqual( t, &static_QUType_int ) )
-	o->payload.f = (float)o->payload.i;
-    else if ( isEqual( t, &static_QUType_double ) )
-	o->payload.f = (float)o->payload.d;
-    else
-	return t->convertTo( o, this );
-
-    o->type = this;
-    return TRUE;
-}
-
-bool QUType_float::convertTo( QUObject *o, QUType *t )
-{
-    if ( isEqual( t,  &static_QUType_int ) ) {
-	o->payload.i = (int) o->payload.f;
-	o->type = &static_QUType_int;
-    } else if ( isEqual( t,  &static_QUType_double ) ) {
-	o->payload.d = (double) o->payload.f;
-	o->type = &static_QUType_double;
-    } else
-	return FALSE;
-    return TRUE;
-}
-
-int QUType_float::serializeTo( QUObject *, QUBuffer * )
-{
-    return 0;
-}
-
-int QUType_float::serializeFrom( QUObject *, QUBuffer * )
-{
-    return 0;
-}
-
 // {EFCDD1D4-77A3-4b8e-8D46-DC14B8D393E9}
@@ -595,3 +478,2 @@ bool QUType_QString::canConvertFrom( QUObject *o, QUType *t )
 	 isEqual( t, &static_QUType_double ) ||
-	 isEqual( t, &static_QUType_float ) ||
 	 isEqual( t, &static_QUType_int ) )
@@ -606,4 +488,3 @@ bool QUType_QString::canConvertTo( QUObject * /*o*/, QUType *t )
 	isEqual( t,  &static_QUType_int ) ||
-	isEqual( t,  &static_QUType_double ) ||
-	isEqual( t,  &static_QUType_float );
+	isEqual( t,  &static_QUType_double );
 }
@@ -617,4 +498,2 @@ bool QUType_QString::convertFrom( QUObject *o, QUType *t )
 	str = new QString( QString::number( o->payload.d ) );
-    else if ( isEqual( t, &static_QUType_float ) )
-	str = new QString( QString::number( o->payload.f ) );
     else if ( isEqual( t, &static_QUType_int ) )
@@ -643,5 +522,2 @@ bool QUType_QString::convertTo( QUObject *o, QUType *t )
 	o->type = &static_QUType_double;
-    } else if ( isEqual( t,  &static_QUType_float ) ) {
-	o->payload.d = str->toFloat();
-	o->type = &static_QUType_float;
     } else {
diff --git a/qmake/tools/qwaitcondition_unix.cpp b/qmake/tools/qwaitcondition_unix.cpp
index 99c1014..6684617 100644
--- a/qmake/tools/qwaitcondition_unix.cpp
+++ b/qmake/tools/qwaitcondition_unix.cpp
@@ -126,3 +126,3 @@ struct QWaitConditionPrivate {
 	// Sleep until there are no busy worker threads
-	while( count > 0 ) {
+	while( mycount > 0 ) {
 	    mymutex.unlock();
@@ -226,3 +226,5 @@ bool QWaitCondition::wait(unsigned long time)
 {
-    pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+    pthread_mutex_t mutex;
+    pthread_mutex_init( &mutex, 0 );
+    pthread_mutex_lock( &mutex );
 
@@ -234,3 +236,3 @@ bool QWaitCondition::wait(unsigned long time)
 	timespec ti;
-	ti.tv_nsec = (tv.tv_usec * 1000) + (time % 1000) * 1000;
+	ti.tv_nsec = ( tv.tv_usec + ( time % 1000 ) * 1000 ) * 1000;
 	ti.tv_sec = tv.tv_sec + (time / 1000) + ( ti.tv_nsec / 1000000000 );
@@ -247,2 +249,5 @@ bool QWaitCondition::wait(unsigned long time)
 
+    pthread_mutex_unlock( &mutex );
+    pthread_mutex_destroy( &mutex );
+
     return (ret == 0);
@@ -293,3 +298,3 @@ bool QWaitCondition::wait(QMutex *mutex, unsigned long time)
 	timespec ti;
-	ti.tv_nsec = (tv.tv_usec * 1000) + (time % 1000) * 1000;
+	ti.tv_nsec = ( tv.tv_usec + ( time % 1000 ) * 1000 ) * 1000;
 	ti.tv_sec = tv.tv_sec + (time / 1000) + ( ti.tv_nsec / 1000000000 );