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
@@ -9,5 +9,5 @@ CXX		= g++
 #qmake code
 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
 
@@ -15,5 +15,5 @@ OBJS=project.o main.o makefile.o unixmake2.o unixmake.o borland_bmake.o \
 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 \
       qconfig.o
@@ -99,4 +99,7 @@ qdir.o: $(OPIEDIR)/qmake/tools/qdir.cpp
         $(CXX) -c -o $@ $(CXXFLAGS) $(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
         $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qfileinfo_unix.cpp
@@ -144,4 +147,7 @@ borland_bmake.o: generators/win32/borland_bmake.cpp
         $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/borland_bmake.cpp
 
+mingw_make.o: generators/win32/mingw_make.cpp
+        $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/mingw_make.cpp
+
 msvc_objectmodel.o: generators/win32/msvc_objectmodel.cpp
         $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp
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
@@ -6,5 +6,5 @@
 ** Created : 970521
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the network module of the Qt GUI Toolkit.
@@ -60,6 +60,20 @@
 #endif
 
+static QString mkdir_p_asstring(const QString &dir)
+{
+    QString ret =  "@$(CHK_DIR_EXISTS) \"" + dir + "\" ";
+    if(Option::target_mode == Option::TARG_WIN_MODE)
+        ret += "$(MKDIR)";
+    else
+        ret += "|| $(MKDIR)";
+    ret += " \"" + dir + "\"";
+    return ret;
+}
+
 static bool createDir(const QString& fullPath)
 {
+    if(QFile::exists(fullPath))
+        return FALSE;
+
     QDir dirTmp;
     bool ret = TRUE;
@@ -78,6 +92,6 @@ 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)
 {
@@ -89,10 +103,10 @@ static char *gimme_buffer(off_t s)
     static int big_buffer_size = 0;
     if(!big_buffer || big_buffer_size < s)
-         big_buffer = (char *)realloc(big_buffer, s);
+        big_buffer = (char *)realloc(big_buffer, s);
     return big_buffer;
 }
 
 bool
-MakefileGenerator::generateMocList(QString fn_target)
+MakefileGenerator::generateMocList(const QString &fn_target)
 {
     if(!findMocDestination(fn_target).isEmpty())
@@ -174,5 +188,6 @@ MakefileGenerator::generateMocList(QString fn_target)
             if(interesting) {
                 *(big_buffer+x+len) = '\0';
-                debug_msg(2, "Mocgen: %s:%d Found MOC symbol %s", fn_target.latin1(), line_count, big_buffer+x);
+                debug_msg(2, "Mocgen: %s:%d Found MOC symbol %s", fn_target.latin1(), 
+                          line_count, big_buffer+x);
 
                 int ext_pos = fn_target.findRev('.');
@@ -186,5 +201,6 @@ 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))))
                         break;
@@ -192,8 +208,8 @@ MakefileGenerator::generateMocList(QString fn_target)
                 if(cpp_ext) {
                     mocFile += fn_target.mid(dir_pos+1, ext_pos - dir_pos-1) + Option::moc_ext;
-                    findDependencies(fn_target).append(mocFile);
                     project->variables()["_SRCMOC"].append(mocFile);
                 } else if(project->variables()["HEADERS"].findIndex(fn_target) != -1) {
-                    for(QStringList::Iterator hit = Option::h_ext.begin(); hit != Option::h_ext.end(); ++hit) {
+                    for(QStringList::Iterator hit = Option::h_ext.begin(); 
+                        hit != Option::h_ext.end(); ++hit) {
                         if((fn_target.right(ext_len) == (*hit))) {
                             mocFile += Option::moc_mod + fn_target.mid(dir_pos+1, ext_pos - dir_pos-1) +
@@ -226,11 +242,10 @@ MakefileGenerator::generateMocList(QString fn_target)
 
 bool
-MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QString fn, bool recurse)
+MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, const QString &f, bool recurse)
 {
-    fn = fileFixify(fn);
-    QStringList &fndeps = findDependencies(fn);
+    QStringList &fndeps = findDependencies(f);
     if(!fndeps.isEmpty())
         return TRUE;
-
+    QString fn = fileFixify(f, QDir::currentDirPath(), Option::output_dir);
     fn = Option::fixPathToLocalOS(fn, FALSE);
     QString fix_env_fn = Option::fixPathToLocalOS(fn);
@@ -289,6 +304,8 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
                       (*(big_buffer+x) == ' ' || *(big_buffer+x) == '\t'))
                     x++;
-                if(total_size_read >= x + 8 && !strncmp(big_buffer + x, "include ", 8)) {
-                    for(x+=8; //skip spaces after keyword
+                if(total_size_read >= x + 8 && !strncmp(big_buffer + x, "include", 7) &&
+                   (*(big_buffer + x + 7) == ' ' || *(big_buffer + x + 7) == '\t' ||
+                    *(big_buffer + x + 7) == '<' || *(big_buffer + x + 7) == '"')) {
+                    for(x+=7; //skip spaces after keyword
                         x < total_size_read && (*(big_buffer+x) == ' ' || *(big_buffer+x) == '\t');
                         x++);
@@ -329,5 +346,5 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
             // skip whitespaces
             while(x < total_size_read &&
-                  (*(big_buffer+x) == ' ' || *(big_buffer+x) == '\t')) 
+                  (*(big_buffer+x) == ' ' || *(big_buffer+x) == '\t'))
                 x++;
             if(*(big_buffer + x) == '<') {
@@ -343,5 +360,5 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
                     (*(big_buffer + x + 7) == ' ' || *(big_buffer + x + 7) == '>')) {
                     for(x += 8; *(big_buffer + x) != '>'; x++) {
-                        if(total_size_read >= x + 9 && *(big_buffer + x) == 'i' && 
+                        if(total_size_read >= x + 9 && *(big_buffer + x) == 'i' &&
                            !strncmp(big_buffer + x, "impldecl", 8)) {
                             for(x += 8; *(big_buffer + x) != '='; x++);
@@ -370,5 +387,5 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
                             if(where == "in implementation") {
                                 QString cpp = fn.left(fn.length() - Option::ui_ext.length()) +
-                                                      Option::cpp_ext.first();
+                                                      Option::cpp_ext.first();
                                 outdeps = &findDependencies(cpp);
                             }
@@ -384,4 +401,5 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
 
         if(!inc.isEmpty()) {
+            bool from_source_dir = TRUE;
             debug_msg(5, "%s:%d Found dependency to %s", fix_env_fn.latin1(),
                       line_count, inc.latin1());
@@ -405,4 +423,5 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
                !stat(fix_env_fndir + inc, &fst) && !S_ISDIR(fst.st_mode)) {
                 fqn = fndir + inc;
+                goto handle_fqn;
             } else {
                 if((Option::target_mode == Option::TARG_MAC9_MODE && inc.find(':')) ||
@@ -416,15 +435,15 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
                            !S_ISDIR(fst.st_mode)) {
                             fqn = mdd->real_dir + QDir::separator() + inc;
-                            break;
+                            goto handle_fqn;
                         }
                     }
                 }
             }
-            if(fqn.isEmpty()) {
+            if(fqn.isEmpty() && Option::mkfile::do_dep_heuristics) {
                 //these are some hacky heuristics it will try to do on an include
                 //however these can be turned off at runtime, I'm not sure how
                 //reliable these will be, most likely when problems arise turn it off
                 //and see if they go away..
-                if(Option::mkfile::do_dep_heuristics && depHeuristics.contains(inc)) {
+                if(depHeuristics.contains(inc)) {
                     fqn = depHeuristics[inc];
                 } else if(Option::mkfile::do_dep_heuristics) { //some heuristics..
@@ -448,9 +467,32 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
                                     fqn += Option::dir_sep;
                                 fqn += inc_file;
-                                break;
+                                from_source_dir = FALSE;  //uics go in the output_dir (so don't fix them)
+                                fqn = fileFixify(fqn, QDir::currentDirPath(), Option::output_dir);
+                                goto handle_fqn;
+                            }
+                        }
+                    }
+                    if(project->isActiveConfig("lex_included")) { //is this the lex file?
+                        QString rhs = Option::lex_mod + Option::cpp_ext.first();
+                        if(inc.endsWith(rhs)) {
+                            QString lhs = inc.left(inc.length() - rhs.length()) + Option::lex_ext;
+                            QStringList ll = project->variables()["LEXSOURCES"];
+                            for(QStringList::Iterator it = ll.begin(); it != ll.end(); ++it) {
+                                QString s = (*it), d;
+                                int slsh = s.findRev(Option::dir_sep);
+                                if(slsh != -1) {
+                                    d = s.left(slsh + 1);
+                                    s = s.right(s.length() - slsh - 1);
+                                }
+                                if(!project->isEmpty("QMAKE_ABSOLUTE_SOURCE_PATH"))
+                                    d = project->first("QMAKE_ABSOLUTE_SOURCE_PATH");
+                                if(s == lhs) {
+                                    fqn = d + inc;
+                                    goto handle_fqn;
+                                }
                             }
                         }
                     }
-                    if(fqn.isEmpty()) { //is it from a .y?
+                    { //is it from a .y?
                         QString rhs = Option::yacc_mod + Option::h_ext.first();
                         if(inc.endsWith(rhs)) {
@@ -468,5 +510,32 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
                                 if(s == lhs) {
                                     fqn = d + inc;
-                                    break;
+                                    goto handle_fqn;
+                                }
+                            }
+                        }
+                    }
+                            if(mocAware() &&        //is it a moc file?
+                       (inc.endsWith(Option::cpp_ext.first()) || inc.endsWith(Option::moc_ext))) {
+                        QString mocs[] = { QString("_HDRMOC"), QString("_SRCMOC"), QString::null };
+                        for(int moc = 0; !mocs[moc].isNull(); moc++) {
+                            QStringList &l = project->variables()[mocs[moc]];
+                            for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+                                QString file = Option::fixPathToTargetOS((*it));
+                                if(file.section(Option::dir_sep, -(inc.contains('/')+1)) == inc) {
+                                    fqn = (*it);
+                                    if(mocs[moc] == "_HDRMOC") {
+                                        //Since it is include, no need to link it in as well
+                                        project->variables()["_SRCMOC"].append((*it));
+                                        l.remove(it);
+                                    } else if(!findMocSource(fqn).endsWith(fn)) {
+                                        /* Not really a very good test, but this will at least avoid 
+                                           confusion if it really does happen (since tmake/qmake
+                                           previously didn't even allow this the test is mostly accurate) */
+                                        warn_msg(WarnLogic,
+                                                 "Found potential multiple MOC include %s (%s) in '%s'",
+                                                 inc.latin1(), fqn.latin1(), fix_env_fn.latin1());
+                                    }
+                                    from_source_dir = FALSE; //mocs go in the output_dir (so don't fix them)
+                                    goto handle_fqn;
                                 }
                             }
@@ -475,10 +544,12 @@ MakefileGenerator::generateDependencies(QPtrList<MakefileDependDir> &dirs, QStri
                     depHeuristics.insert(inc, fqn);
                 }
-                if(!Option::mkfile::do_dep_heuristics || fqn.isEmpty()) //I give up
-                    continue;
             }
-
-            fqn = fileFixify(Option::fixPathToTargetOS(fqn, FALSE));
-            debug_msg(4, "Resolved dependancy of %s to %s", inc.latin1(), fqn.latin1());
+        handle_fqn:
+            if(fqn.isEmpty()) //I give up
+              continue;
+            fqn = Option::fixPathToTargetOS(fqn, FALSE);
+            if(from_source_dir)
+                fqn = fileFixify(fqn);
+            debug_msg(4, "Resolved dependency of %s to %s", inc.latin1(), fqn.latin1());
             if(outdeps && outdeps->findIndex(fqn) == -1)
                 outdeps->append(fqn);
@@ -498,5 +569,5 @@ 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;
 }
@@ -614,5 +685,9 @@ MakefileGenerator::init()
     /* get deps and mocables */
     QDict<void> cache_found_files;
-    QString cache_file(Option::output_dir + QDir::separator() + ".qmake.internal.cache");
+    QString cache_file(".qmake.internal.cache");
+    if(!project->isEmpty("QMAKE_INTERNAL_CACHE_FILE"))
+        cache_file = Option::fixPathToLocalOS(project->first("QMAKE_INTERNAL_CACHE_FILE"));
+    if(cache_file.find(QDir::separator()) == -1) //guess they know what they are doing..
+        cache_file.prepend(Option::output_dir + QDir::separator());
     if((Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT ||
         Option::mkfile::do_deps || Option::mkfile::do_mocs) && !noIO()) {
@@ -629,5 +704,5 @@ MakefileGenerator::init()
                                                      l.replace("\"","")));
             }
-            debug_msg(1, "Dependancy Directories: %s", incDirs.join(" :: ").latin1());
+            debug_msg(1, "Dependency Directories: %s", incDirs.join(" :: ").latin1());
             if(Option::output.name() != "-" && project->isActiveConfig("qmake_cache")) {
                 QFile cachef(cache_file);
@@ -684,5 +759,5 @@ MakefileGenerator::init()
                                     }
                                     if(found) {
-                                        debug_msg(2, "Dependancies (cached): %s -> %s", file.latin1(),
+                                        debug_msg(2, "Dependencies (cached): %s -> %s", file.latin1(),
                                                   files.join(" :: ").latin1());
                                         findDependencies(file) = files;
@@ -744,4 +819,5 @@ MakefileGenerator::init()
                     if(!(*val_it).isEmpty()) {
                         QString file = Option::fixPathToLocalOS((*val_it));
+                        QStringList file_list(file);
                         if(!QFile::exists(file)) {
                             bool found = FALSE;
@@ -770,5 +846,5 @@ MakefileGenerator::init()
                                 if(regex.findRev(Option::dir_sep) != -1) {
                                     dir = regex.left(regex.findRev(Option::dir_sep) + 1);
-                                    real_dir = fileFixify(Option::fixPathToLocalOS(dir), 
+                                    real_dir = fileFixify(Option::fixPathToLocalOS(dir),
                                                           QDir::currentDirPath(), Option::output_dir);
                                     regex = regex.right(regex.length() - dir.length());
@@ -783,7 +859,12 @@ MakefileGenerator::init()
                                         continue;
                                     } else {
-                                        (*val_it) = dir + d[0];
-                                        for(int i = 1; i < (int)d.count(); i++)
-                                            l.insert(val_it, dir + d[i]);
+                                        file_list.clear();
+                                        for(int i = 0; i < (int)d.count(); i++) {
+                                            file_list.append(dir + d[i]);
+                                            if(i == (int)d.count() - 1)
+                                                (*val_it) = dir + d[i];
+                                            else
+                                                l.insert(val_it, dir + d[i]);
+                                        }
                                     }
                                 } else {
@@ -796,37 +877,41 @@ 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));
                         }
                     }
@@ -854,9 +939,10 @@ MakefileGenerator::init()
                         QStringList &l = v[moc_sources[x]];
                         for(QStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) {
-                            if(!(*val_it).isEmpty()) {
-                                mc = mocablesToMOC[(*val_it)];
+                            QString f = fileFixify((*val_it));
+                            if(!f.isEmpty()) {
+                                mc = mocablesToMOC[f];
                                 if(mc.isEmpty())
                                     mc = "*qmake_ignore*";
-                                cachet << (*val_it) << " = " << mc << endl;
+                                cachet << f << " = " << mc << endl;
                             }
                         }
@@ -947,8 +1033,9 @@ MakefileGenerator::init()
     //UI files
     {
+        QStringList &includepath = project->variables()["INCLUDEPATH"];
         if(!project->isEmpty("UI_DIR"))
-            project->variables()["INCLUDEPATH"].append(project->first("UI_DIR"));
+            includepath.append(project->first("UI_DIR"));
         else if(!project->isEmpty("UI_HEADERS_DIR"))
-            project->variables()["INCLUDEPATH"].append(project->first("UI_HEADERS_DIR"));
+            includepath.append(project->first("UI_HEADERS_DIR"));
         QStringList &decls = v["UICDECLS"], &impls = v["UICIMPLS"];
         QStringList &l = v["FORMS"];
@@ -961,17 +1048,18 @@ MakefileGenerator::init()
                 if( d == ".")
                     d = QDir::currentDirPath();
-                d = fileFixify(d);
-                if( !project->variables()["INCLUDEPATH"].contains(d))
-                    project->variables()["INCLUDEPATH"].append(d);
+                d = fileFixify(d, QDir::currentDirPath(), Option::output_dir);
+                if(!includepath.contains(d))
+                    includepath.append(d);
             } else {
                 if(decl.isEmpty() && !project->isEmpty("UI_HEADERS_DIR"))
                     decl = project->first("UI_HEADERS_DIR");
-                if ( !decl.isEmpty() || (project->isEmpty("UI_HEADERS_DIR") && !project->isEmpty("UI_SOURCES_DIR")) ) {
+                if(!decl.isEmpty() || (project->isEmpty("UI_HEADERS_DIR") && 
+                                       !project->isEmpty("UI_SOURCES_DIR")) ) {
                     QString d = fi.dirPath();
                     if( d == ".")
                         d = QDir::currentDirPath();
-                    d = fileFixify(d);
-                    if( !project->variables()["INCLUDEPATH"].contains(d))
-                        project->variables()["INCLUDEPATH"].append(d);
+                    d = fileFixify(d, QDir::currentDirPath(), Option::output_dir);
+                    if(includepath.contains(d))
+                        includepath.append(d);
                 }
                 if(impl.isEmpty() && !project->isEmpty("UI_SOURCES_DIR"))
@@ -984,5 +1072,19 @@ 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();
             logicWarn(impl, "SOURCES");
@@ -1031,7 +1133,7 @@ MakefileGenerator::init()
         v["OBJECTS"] += (v["IMAGEOBJECTS"] = createObjectList("QMAKE_IMAGE_COLLECTION"));
     }
-
-    if(!project->isEmpty("QMAKE_ABSOLUTE_SOURCE_PATH"))
-        project->variables()["INCLUDEPATH"].append(Option::output_dir);
+    if(Option::output_dir != QDir::currentDirPath()) 
+        project->variables()["INCLUDEPATH"].append(fileFixify(Option::output_dir, Option::output_dir,
+                                                              Option::output_dir));
 
     //moc files
@@ -1067,5 +1169,5 @@ 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")) {
         QString stem = prl_file, dir, extn;
@@ -1105,5 +1207,5 @@ MakefileGenerator::processPrlFile(QString &file)
         debug_msg(1, "Processing PRL file: %s", real_prl_file.latin1());
         if(!proj.read(fileFixify(real_prl_file, QDir::currentDirPath(), Option::output_dir),
-                      QDir::currentDirPath())) {
+                      QDir::currentDirPath(), TRUE)) {
             fprintf(stderr, "Error processing prl file: %s\n", real_prl_file.latin1());
         } else {
@@ -1197,4 +1299,6 @@ MakefileGenerator::writePrlFile(QTextStream &t)
     if(!project->isEmpty("CONFIG"))
         t << "QMAKE_PRL_CONFIG = " << project->variables()["CONFIG"].join(" ") << endl;
+    if(!project->isEmpty("VERSION"))
+        t << "QMAKE_PRL_VERSION = " << project->first("VERSION") << endl;
     if(project->isActiveConfig("staticlib") || project->isActiveConfig("explicitlib")) {
         QStringList libs;
@@ -1229,6 +1333,5 @@ MakefileGenerator::write()
         if(!project->isEmpty("DESTDIR"))
             prl.prepend(var("DESTDIR"));
-        QString local_prl = fileFixify(prl, QDir::currentDirPath(), Option::output_dir);
-        fixEnvVariables(local_prl);
+        QString local_prl = Option::fixPathToLocalOS(fileFixify(prl, QDir::currentDirPath(), Option::output_dir));
         QFile ft(local_prl);
         if(ft.open(IO_WriteOnly)) {
@@ -1241,5 +1344,5 @@ 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();
 
@@ -1303,5 +1406,5 @@ 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);
             p.replace(stringSrc, (*sit));
@@ -1321,18 +1424,34 @@ MakefileGenerator::writeUicSrc(QTextStream &t, const QString &ui)
         QString deps = findDependencies((*it)).join(" \\\n\t\t"), decl, impl;
         {
-            QString tmp = (*it);
+            QString tmp = (*it), impl_dir, decl_dir;
             decl = tmp.replace(QRegExp("\\" + Option::ui_ext + "$"), Option::h_ext.first());
+            decl = fileFixify(decl, QDir::currentDirPath(), Option::output_dir);
+                    int dlen = decl.findRev(Option::dir_sep) + 1;    
             tmp = (*it);
             impl = tmp.replace(QRegExp("\\" + Option::ui_ext + "$"), Option::cpp_ext.first());
-                int dlen = (*it).findRev(Option::dir_sep) + 1;
+            impl = fileFixify(impl, QDir::currentDirPath(), Option::output_dir);
+                    int ilen = decl.findRev(Option::dir_sep) + 1;    
             if(!project->isEmpty("UI_DIR")) {
+                impl_dir = project->first("UI_DIR");
                 decl = project->first("UI_DIR") + decl.right(decl.length() - dlen);
-                impl = project->first("UI_DIR") + impl.right(impl.length() - dlen);
+                impl = project->first("UI_DIR") + impl.right(impl.length() - ilen);
             } else {
-                if(!project->isEmpty("UI_HEADERS_DIR"))
+                if(!project->isEmpty("UI_HEADERS_DIR")) {
+                    decl_dir = project->first("UI_HEADERS_DIR");
                     decl = project->first("UI_HEADERS_DIR") + decl.right(decl.length() - dlen);
-                if(!project->isEmpty("UI_SOURCES_DIR"))
-                    impl = project->first("UI_SOURCES_DIR") + impl.right(impl.length() - dlen);
-            }
+                }
+                if(!project->isEmpty("UI_SOURCES_DIR")) {
+                    impl_dir = project->first("UI_SOURCES_DIR");
+                    impl = project->first("UI_SOURCES_DIR") + impl.right(impl.length() - ilen);
+                }
+            } 
+            if(decl_dir.isEmpty()) 
+                decl_dir = decl.left(dlen);
+            if(impl_dir.isEmpty()) 
+                impl_dir = impl.left(ilen);
+            if(!impl_dir.isEmpty()) 
+                createDir(Option::output_dir + Option::dir_sep + impl_dir);
+            if(!decl_dir.isEmpty() && decl_dir != impl_dir) 
+                createDir(Option::output_dir + Option::dir_sep + decl_dir);
         }
         t << decl << ": " << (*it) << " " << deps << "\n\t"
@@ -1371,5 +1490,5 @@ 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");
             p.replace(stringSrc, (*sit));
@@ -1414,7 +1533,11 @@ MakefileGenerator::writeYaccSrc(QTextStream &t, const QString &src)
     for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
         QFileInfo fi((*it));
-        QString dir = fileFixify(Option::output_dir);
+        QString dir;
+        if(fi.dirPath() != ".")
+            dir = fi.dirPath() + Option::dir_sep;
+        dir = fileFixify(dir, QDir::currentDirPath(), Option::output_dir);
         if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep)
             dir += Option::dir_sep;
+
         QString impl = dir + fi.baseName(TRUE) + Option::yacc_mod + Option::cpp_ext.first();
         QString decl = dir + fi.baseName(TRUE) + Option::yacc_mod + Option::h_ext.first();
@@ -1424,5 +1547,5 @@ MakefileGenerator::writeYaccSrc(QTextStream &t, const QString &src)
             mangle = fi.baseName(TRUE);
             yaccflags += " -p " + mangle;
-        } 
+        }
         QString out_h = default_out_h, out_c = default_out_c;
         if(!mangle.isEmpty()) {
@@ -1453,5 +1576,8 @@ MakefileGenerator::writeLexSrc(QTextStream &t, const QString &src)
     for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
         QFileInfo fi((*it));
-        QString dir = fileFixify(Option::output_dir);
+        QString dir;
+        if(fi.dirPath() != ".")
+            dir = fi.dirPath() + Option::dir_sep;
+        dir = fileFixify(dir, QDir::currentDirPath(), Option::output_dir);
         if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep)
             dir += Option::dir_sep;
@@ -1464,5 +1590,5 @@ MakefileGenerator::writeLexSrc(QTextStream &t, const QString &src)
         }
         QString out_c = default_out_c;
-        if(!stub.isEmpty()) 
+        if(!stub.isEmpty())
             out_c.replace(stringBase, stub);
 
@@ -1495,5 +1621,5 @@ 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");
             p.replace( stringSrc, src);
@@ -1542,74 +1668,103 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs)
 
         bool do_default = TRUE;
-        QString target, dst="$(INSTALL_ROOT)" + Option::fixPathToTargetOS(project->variables()[pvar].first(), FALSE);
+        const QString root = "$(INSTALL_ROOT)";
+        QString target, dst= fileFixify(project->variables()[pvar].first());
+#ifndef Q_WS_WIN
         if(dst.right(1) != Option::dir_sep)
             dst += Option::dir_sep;
-         QStringList tmp, &uninst = project->variables()[(*it) + ".uninstall"];
-         //other
-         tmp = project->variables()[(*it) + ".extra"];
-         if(!tmp.isEmpty()) {
+#endif
+        QStringList tmp, &uninst = project->variables()[(*it) + ".uninstall"];
+        //other
+        tmp = project->variables()[(*it) + ".extra"];
+        if(!tmp.isEmpty()) {
             do_default = FALSE;
             if(!target.isEmpty())
-                target += "\n\t";
-             target += tmp.join(" ");
-         }
-         //masks
-         tmp = project->variables()[(*it) + ".files"];
-         if(!tmp.isEmpty()) {
+                target += "\n\t";
+            target += tmp.join(" ");
+        }
+        //masks
+        tmp = project->variables()[(*it) + ".files"];
+        if(!tmp.isEmpty()) {
             if(!target.isEmpty())
-                target += "\n";
+                target += "\n";
             do_default = FALSE;
             for(QStringList::Iterator wild_it = tmp.begin(); wild_it != tmp.end(); ++wild_it) {
                 QString wild = Option::fixPathToLocalOS((*wild_it), FALSE), wild_var = fileFixify(wild);
+                QString dirstr = QDir::currentDirPath(), filestr = wild;
+                int slsh = filestr.findRev(Option::dir_sep);
+                if(slsh != -1) {
+                    dirstr = filestr.left(slsh+1);
+                    filestr = filestr.right(filestr.length() - slsh - 1);
+                }
+                if(dirstr.right(Option::dir_sep.length()) != Option::dir_sep)
+                    dirstr += Option::dir_sep;
                 if(QFile::exists(wild)) { //real file
+                    QString file = wild;
                     QFileInfo fi(wild);
-                    target += QString("\t-") + (fi.isDir() ? "$(COPY_DIR)" : "$(COPY_FILE)") +
-                              " \"" + Option::fixPathToTargetOS(fileFixify(wild), FALSE) + "\" \"" + fileFixify(dst) + "\"\n";
+                    if(!target.isEmpty())
+                        target += "\t";
+                    target += QString(fi.isDir() ? "-$(COPY_DIR)" : "-$(COPY_FILE)") + " \"" +
+                              Option::fixPathToTargetOS(fileFixify(wild), FALSE) + "\" \"" + root + dst + "\"\n";
                     if(!project->isActiveConfig("debug") &&
                        !fi.isDir() && fi.isExecutable() && !project->isEmpty("QMAKE_STRIP"))
-                        target += QString("\t") + var("QMAKE_STRIP") + " \"" + fileFixify(dst + wild) + "\"\n";
-                    uninst.append(QString("-$(DEL_FILE) -r") + " \"" + fileFixify(dst + wild) + "\"");
+                        target += QString("\t-") + var("QMAKE_STRIP") + " \"" + root + fileFixify(dst + filestr) + "\"\n";
+                    if(!uninst.isEmpty())
+                        uninst.append("\n\t");
+                    uninst.append(
+#ifdef Q_WS_WIN
+                    QString("-$(DEL_FILE)")
+#else
+                    QString("-$(DEL_FILE) -r")
+#endif
+                    + " \"" + root + fileFixify(dst + filestr) + "\"");
                     continue;
                 }
-                        QString dirstr = QDir::currentDirPath(), f = wild;          //wild
-                int slsh = f.findRev(Option::dir_sep);
-                if(slsh != -1) {
-                    dirstr = f.left(slsh+1);
-                    f = f.right(f.length() - slsh - 1);
-                }
-                if(dirstr.right(Option::dir_sep.length()) != Option::dir_sep)
-                    dirstr += Option::dir_sep;
-                if(!uninst.isEmpty())
-                    uninst.append("\n\t");
-                uninst.append(QString("-$(DEL_FILE) -r") + " " + fileFixify(dst + f) + "");
-                
-                QDir dir(dirstr, f);
+                        QDir dir(dirstr, filestr);          //wild
                 for(uint x = 0; x < dir.count(); x++) {
                     QString file = dir[x];
                     if(file == "." || file == "..") //blah
                         continue;
+                    if(!uninst.isEmpty())
+                        uninst.append("\n\t");
+                    uninst.append(
+#ifdef Q_WS_WIN
+                        QString("-$(DEL_FILE)")
+#else
+                        QString("-$(DEL_FILE) -r")
+#endif
+                        + " \"" + root + fileFixify(dst + file) + "\"");
                     QFileInfo fi(file);
-                    target += QString("\t-") + (fi.isDir() ? "$(COPY_DIR)" : "$(COPY_FILE)") +
-                              " \"" + Option::fixPathToTargetOS(fileFixify(dirstr + file), FALSE) +
-                              "\" \"" + fileFixify(dst) + "\"\n";
+                    if(!target.isEmpty())
+                        target += "\t";
+                    target += QString(fi.isDir() ? "-$(COPY_DIR)" : "-$(COPY_FILE)") + " \"" + 
+                              Option::fixPathToTargetOS(fileFixify(dirstr + file), FALSE) +
+                              "\" \"" + root + fileFixify(dst) + "\"\n";
                     if(!project->isActiveConfig("debug") &&
                        !fi.isDir() && fi.isExecutable() && !project->isEmpty("QMAKE_STRIP"))
-                        target += QString("\t") + var("QMAKE_STRIP") + " \"" + fileFixify(dst + file) + "\"\n";
+                        target += QString("\t-") + var("QMAKE_STRIP") + " \"" + root + fileFixify(dst + file) + "\"\n";
                 }
             }
-         }
-         //default?
+        }
+        //default?
         if(do_default)
             target = defaultInstall((*it));
 
         if(!target.isEmpty()) {
-            t << "install_" << (*it) << ": " << "\n\t"
-              << "@test -d " << dst << " || mkdir -p " << dst << "\n\t"
-              << target << endl << endl;
+            t << "install_" << (*it) << ": " << "\n\t";
+            const QStringList &dirs = project->variables()[pvar];
+            for(QStringList::ConstIterator pit = dirs.begin(); pit != dirs.end(); ++pit) {
+                QString tmp_dst = fileFixify((*pit));
+#ifndef Q_WS_WIN
+                if(tmp_dst.right(1) != Option::dir_sep)
+                    tmp_dst += Option::dir_sep;
+#endif
+                t << mkdir_p_asstring(root+tmp_dst) << "\n\t";
+            }
+            t << target << endl << endl;
             all_installs += QString("install_") + (*it) + " ";
             if(!uninst.isEmpty()) {
                 t << "uninstall_" << (*it) << ": " << "\n\t"
-                  << uninst.join(" ") << "\n\t"
-                  << "-$(DEL_DIR) \"" << dst << "\"" << endl << endl;
+                  << uninst.join("") << "\n\t"
+                  << "-$(DEL_DIR) \"" << ( root + dst ) << "\"" << endl << endl;
                 all_uninstalls += "uninstall_" + (*it) + " ";
             }
@@ -1788,5 +1943,5 @@ MakefileGenerator::writeHeader(QTextStream &t)
     t << "#############################################################################" << endl;
     t << "# Makefile for building: " << var("TARGET") << endl;
-    t << "# Generated by qmake (" << qmake_version() << ") on: " << ctime(&foo);
+    t << "# Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: " << ctime(&foo);
     t << "# Project:  " << fileFixify(project->projectFile()) << endl;
     t << "# Template: " << var("TEMPLATE") << endl;
@@ -1803,5 +1958,5 @@ MakefileGenerator::writeMakeQmake(QTextStream &t)
 {
     QString ofile = Option::fixPathToTargetOS(fileFixify(Option::output.name()));
-    if(project->isEmpty("QMAKE_FAILED_REQUIREMENTS") &&
+    if(project->isEmpty("QMAKE_FAILED_REQUIREMENTS") && !project->isActiveConfig("no_autoqmake") &&
        !project->isEmpty("QMAKE_INTERNAL_PRL_FILE")) {
         QStringList files = fileFixify(Option::mkfile::project_files);
@@ -1847,7 +2002,13 @@ QString
 MakefileGenerator::fileFixify(const QString& file0, const QString &out_d, const QString &in_d, bool force_fix) const
 {
+    if(file0.isEmpty()) 
+        return file0;
+    QString key = file0;
+    if(!in_d.isEmpty() || !out_d.isEmpty() || force_fix)
+        key.prepend(in_d + "--" + out_d + "--" + QString::number((int)force_fix) + "-");
+    if(fileFixed.contains(key)) 
+        return fileFixed[key];
+
     QString file = file0;
-    if(file.isEmpty())
-        return file;
     int depth = 4;
     if(Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE ||
@@ -1891,4 +2052,10 @@ MakefileGenerator::fileFixify(const QString& file0, const QString &out_d, const
                     out_dir = out_fi.filePath();
             }
+            QString in_canonical_dir = QDir(in_dir).canonicalPath(),
+                   out_canonical_dir = QDir(out_dir).canonicalPath();
+            if(!in_canonical_dir.isEmpty())
+                in_dir = in_canonical_dir;
+            if(!out_canonical_dir.isEmpty())
+                out_dir = out_canonical_dir;
         }
         if(out_dir != in_dir || !QDir::isRelativePath(qfile)) {
@@ -1900,4 +2067,9 @@ 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);
             if(file == match_dir) {
@@ -1930,7 +2102,10 @@ MakefileGenerator::fileFixify(const QString& file0, const QString &out_d, const
     }
     file = Option::fixPathToTargetOS(file, FALSE);
+    if(file.isEmpty())
+        file = ".";
     if(!quote.isNull())
         file = quote + file + quote;
     debug_msg(3, "Fixed %s :: to :: %s (%d)", orig_file.latin1(), file.latin1(), depth);
+    ((MakefileGenerator*)this)->fileFixed.insert(key, file);
     return file;
 }
@@ -2040,6 +2215,7 @@ MakefileGenerator::openOutput(QFile &file) const
 //Factory thing
 #include "unixmake.h"
-#include "borland_bmake.h"
 #include "msvc_nmake.h"
+#include "borland_bmake.h"
+#include "mingw_make.h"
 #include "msvc_dsp.h"
 #include "msvc_vcproj.h"
@@ -2062,5 +2238,5 @@ MakefileGenerator::create(QMakeProject *proj)
         mkfile = new UnixMakefileGenerator(proj);
     } else if(gen == "MSVC") {
-            // Visual Studio =< v6.0
+        // Visual Studio =< v6.0
         if(proj->first("TEMPLATE").find(QRegExp("^vc.*")) != -1)
             mkfile = new DspMakefileGenerator(proj);
@@ -2068,5 +2244,5 @@ MakefileGenerator::create(QMakeProject *proj)
             mkfile = new NmakeMakefileGenerator(proj);
     } else if(gen == "MSVC.NET") {
-            // Visual Studio >= v7.0
+        // Visual Studio >= v7.0
         if(proj->first("TEMPLATE").find(QRegExp("^vc.*")) != -1)
             mkfile = new VcprojGenerator(proj);
@@ -2075,4 +2251,6 @@ MakefileGenerator::create(QMakeProject *proj)
     } else if(gen == "BMAKE") {
         mkfile = new BorlandMakefileGenerator(proj);
+    } else if(gen == "MINGW") {
+        mkfile = new MingwMakefileGenerator(proj);
     } else if(gen == "METROWERKS") {
         mkfile = new MetrowerksMakefileGenerator(proj);
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
@@ -6,5 +6,5 @@
 ** Created : 970521
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the network module of the Qt GUI Toolkit.
@@ -48,5 +48,5 @@ class MakefileGenerator
     QStringList createObjectList(const QString &var);
     QString build_args();
-    QMap<QString, QString> depHeuristics, depKeyMap;
+    QMap<QString, QString> depHeuristics, depKeyMap, fileFixed;
     QMap<QString, QString> mocablesToMOC, mocablesFromMOC;
     QMap<QString, QStringList> depends;
@@ -69,8 +69,8 @@ protected:
     class MakefileDependDir {
     public:
-        MakefileDependDir(QString r, QString l) : real_dir(r), local_dir(l) { }
+        MakefileDependDir(const QString &r, const QString &l) : real_dir(r), local_dir(l) { }
         QString real_dir, local_dir;
     };
-    bool generateDependencies(QPtrList<MakefileDependDir> &dirs, QString x, bool recurse);
+    bool generateDependencies(QPtrList<MakefileDependDir> &dirs, const QString &x, bool recurse);
 
     QString buildArgs();
@@ -78,5 +78,5 @@ protected:
     QString specdir();
     QString cleanFilePath(const QString &file) const;
-    bool generateMocList(QString fn);
+    bool generateMocList(const QString &fn);
 
     QString findMocSource(const QString &moc_file) const;
diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp
index 5ff6250..1515216 100644
--- a/qmake/generators/projectgenerator.cpp
+++ b/qmake/generators/projectgenerator.cpp
@@ -43,4 +43,20 @@
 #include <qregexp.h>
 
+QString project_builtin_regx() //calculate the builtin regular expression..
+{ 
+    QString ret;
+    QStringList builtin_exts(".c");
+    builtin_exts << Option::ui_ext << Option::yacc_ext << Option::lex_ext << ".ts";
+    builtin_exts += Option::h_ext + Option::cpp_ext;
+    for(QStringList::Iterator ext_it = builtin_exts.begin(); 
+        ext_it != builtin_exts.end(); ++ext_it) {
+        if(!ret.isEmpty())
+            ret += "; ";
+        ret += QString("*") + (*ext_it);
+    }
+    return ret;
+}
+
+
 
 ProjectGenerator::ProjectGenerator(QMakeProject *p) : MakefileGenerator(p), init_flag(FALSE)
@@ -68,19 +84,11 @@ ProjectGenerator::init()
     //the scary stuff
     if(project->first("TEMPLATE_ASSIGN") != "subdirs") {
-        QString builtin_regex;
-        { //calculate the builtin regular expression..
-            QStringList builtin_exts(".c");
-            builtin_exts << Option::ui_ext << Option::yacc_ext << Option::lex_ext;
-            builtin_exts += Option::h_ext + Option::cpp_ext;
-            for(QStringList::Iterator ext_it = builtin_exts.begin(); 
-                ext_it != builtin_exts.end(); ++ext_it) {
-                if(!builtin_regex.isEmpty())
-                    builtin_regex += "; ";
-                builtin_regex += QString("*") + (*ext_it);
-            }
-        }
+        QString builtin_regex = project_builtin_regx();
         QStringList dirs = Option::projfile::project_dirs;
-        if(Option::projfile::do_pwd)
+        if(Option::projfile::do_pwd) {
+            if(!v["INCLUDEPATH"].contains("."))
+                v["INCLUDEPATH"] += ".";
             dirs.prepend(QDir::currentDirPath());
+        }
 
         for(QStringList::Iterator pd = dirs.begin(); pd != dirs.end(); pd++) {
@@ -141,7 +149,6 @@ ProjectGenerator::init()
             if(add_depend && !dir.isEmpty() && !v["DEPENDPATH"].contains(dir)) {
                 QFileInfo fi(dir);
-                if(fi.absFilePath() != QDir::currentDirPath()) {
+                if(fi.absFilePath() != QDir::currentDirPath()) 
                     v["DEPENDPATH"] += fileFixify(dir);
-                }
             }
         }
@@ -242,10 +249,17 @@ ProjectGenerator::init()
                 if(!tmp.isEmpty()) {
                     for(QStringList::Iterator dep_it = tmp.begin(); dep_it != tmp.end(); ++dep_it) {
-                        QString file_no_path = (*dep_it).right(
-                            (*dep_it).length() - ((*dep_it).findRev(Option::dir_sep)+1));
+                        QString file_dir = (*dep_it).section(Option::dir_sep, 0, -2),
+                            file_no_path = (*dep_it).section(Option::dir_sep, -1);
+                        if(!file_dir.isEmpty()) {
+                            for(MakefileDependDir *mdd = deplist.first(); mdd; mdd = deplist.next()) {
+                                if(mdd->local_dir == file_dir && !v["INCLUDEPATH"].contains(mdd->real_dir))
+                                    v["INCLUDEPATH"] += mdd->real_dir;
+                            }
+                        }
                         if(no_qt_files && file_no_path.find(QRegExp("^q[a-z_0-9].h$")) != -1)
                             no_qt_files = FALSE;
                         QString h_ext;
-                        for(QStringList::Iterator hit = Option::h_ext.begin(); hit != Option::h_ext.end(); ++hit) {
+                        for(QStringList::Iterator hit = Option::h_ext.begin(); 
+                            hit != Option::h_ext.end(); ++hit) {
                             if((*dep_it).endsWith((*hit))) {
                                 h_ext = (*hit);
@@ -261,9 +275,11 @@ ProjectGenerator::init()
                             for(QStringList::Iterator cppit = Option::cpp_ext.begin();
                                 cppit != Option::cpp_ext.end(); ++cppit) {
-                                QString src((*dep_it).left((*dep_it).length() - h_ext.length()) + (*cppit));
+                                QString src((*dep_it).left((*dep_it).length() - h_ext.length()) + 
+                                            (*cppit));
                                 if(QFile::exists(src)) {
                                     bool exists = FALSE;
                                     QStringList &srcl = v["SOURCES"];
-                                    for(QStringList::Iterator src_it = srcl.begin(); src_it != srcl.end(); ++src_it) {
+                                    for(QStringList::Iterator src_it = srcl.begin(); 
+                                        src_it != srcl.end(); ++src_it) {
                                         if((*src_it).lower() == src.lower()) {
                                             exists = TRUE;
@@ -338,5 +354,6 @@ ProjectGenerator::writeMakefile(QTextStream &t)
           << getWritableVar("CONFIG", FALSE)
           << getWritableVar("CONFIG_REMOVE", FALSE)
-          << getWritableVar("DEPENDPATH") << endl;
+          << getWritableVar("DEPENDPATH")
+          << getWritableVar("INCLUDEPATH") << endl;
 
         t << "# Input" << "\n";
@@ -345,5 +362,6 @@ ProjectGenerator::writeMakefile(QTextStream &t)
           << getWritableVar("LEXSOURCES") 
           << getWritableVar("YACCSOURCES") 
-          << getWritableVar("SOURCES");
+          << getWritableVar("SOURCES")
+          << getWritableVar("TRANSLATIONS");
     }
     for(it = Option::after_user_vars.begin(); it != Option::after_user_vars.end(); ++it)
@@ -404,4 +422,6 @@ ProjectGenerator::addFile(QString file)
         else if(file.endsWith(Option::yacc_ext))
             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
@@ -6,5 +6,5 @@
 ** Created : 970521
 **
-** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the network module of the Qt GUI Toolkit.
@@ -73,9 +73,8 @@ 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" );
         }
     }
@@ -84,5 +83,5 @@ UnixMakefileGenerator::init()
     if( project->isEmpty("QMAKE_COPY_DIR") )
         project->variables()["QMAKE_COPY_DIR"].append( "$(COPY) -pR" );
-    //If the TARGET looks like a path split it into DESTDIR and the resulting TARGET 
+    //If the TARGET looks like a path split it into DESTDIR and the resulting TARGET
     if(!project->isEmpty("TARGET")) {
         QString targ = project->first("TARGET");
@@ -139,5 +138,5 @@ UnixMakefileGenerator::init()
     if(!project->isEmpty("QMAKE_LIBDIR")) {
         if ( !project->isEmpty("QMAKE_RPATH") )
-            project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR", " " + var("QMAKE_RPATH"), 
+            project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR", " " + var("QMAKE_RPATH"),
                                                                   " " + var("QMAKE_RPATH"), "");
         project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue( "QMAKE_LIBDIR", "-L", " -L", "" );
@@ -167,5 +166,5 @@ UnixMakefileGenerator::init()
             if ( !project->isEmpty("QMAKE_LIBDIR_QT") ) {
                 if ( !project->isEmpty("QMAKE_RPATH") )
-                    project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR_QT", " " + var("QMAKE_RPATH"), 
+                    project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR_QT", " " + var("QMAKE_RPATH"),
                                                                           " " + var("QMAKE_RPATH"), "");
                 project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR_QT", "-L", " -L", "");
@@ -177,19 +176,7 @@ 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", "");
         if ( is_qt )
@@ -200,8 +187,4 @@ UnixMakefileGenerator::init()
     if(project->isActiveConfig("global_init_link_order"))
         project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
-    if ( project->isActiveConfig("x11sm") )
-        project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_X11SM"];
-    if ( project->isActiveConfig("dylib") )
-        project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_DYNLOAD"];
     if ( project->isActiveConfig("x11inc") )
         project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_X11"];
@@ -211,4 +194,20 @@ UnixMakefileGenerator::init()
         project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_X11"];
     }
+    if ( project->isActiveConfig("x11sm") )
+        project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_X11SM"];
+    if ( project->isActiveConfig("dylib") )
+        project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_DYNLOAD"];
+    if ( project->isActiveConfig("thread") ) {
+        if(project->isActiveConfig("qt"))
+            project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT");
+        if ( !project->isEmpty("QMAKE_CFLAGS_THREAD"))
+            project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_THREAD"];
+        if( !project->isEmpty("QMAKE_CXXFLAGS_THREAD"))
+            project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_THREAD"];
+        project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_THREAD"];
+        project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_THREAD"];
+        if(!project->isEmpty("QMAKE_LFLAGS_THREAD"))
+            project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_THREAD"];
+    }
     if ( project->isActiveConfig("moc") )
         setMocAware(TRUE);
@@ -341,5 +340,5 @@ UnixMakefileGenerator::uniqueSetLFlags(const QStringList &list1, QStringList &li
         } else if(QFile::exists((*it))) {
             unique = (list2.findIndex((*it)) == -1);
-        } 
+        }
         if(unique)
             ret.append((*it));
@@ -352,5 +351,5 @@ void
 UnixMakefileGenerator::processPrlVariable(const QString &var, const QStringList &l)
 {
-    if(var == "QMAKE_PRL_LIBS") 
+    if(var == "QMAKE_PRL_LIBS")
         project->variables()["QMAKE_CURRENT_PRL_LIBS"] += uniqueSetLFlags(l, project->variables()["QMAKE_LIBS"]);
     else
@@ -358,4 +357,88 @@ 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
 UnixMakefileGenerator::processPrlFiles()
@@ -403,5 +486,5 @@ UnixMakefileGenerator::processPrlFiles()
                         QString prl = "/System/Library/Frameworks/" + opt +
                                       ".framework/" + opt + Option::prl_ext;
-                        if(processPrlFile(prl)) 
+                        if(processPrlFile(prl))
                             ret = TRUE;
                         l_out.append("-framework");
@@ -435,10 +518,11 @@ 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);
     if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep)
         destdir += Option::dir_sep;
-    targetdir = "$(INSTALL_ROOT)" + Option::fixPathToTargetOS(targetdir, FALSE);
+    targetdir = fileFixify(targetdir);
     if(targetdir.right(1) != Option::dir_sep)
         targetdir += Option::dir_sep;
@@ -459,17 +543,16 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
             if(slsh != -1)
                 dst_prl = dst_prl.right(dst_prl.length() - slsh - 1);
-            dst_prl = targetdir + dst_prl;
-            ret += "-$(COPY) " + project->first("QMAKE_INTERNAL_PRL_FILE") + " " + dst_prl;
+            dst_prl = root + targetdir + dst_prl;
+            ret += "-$(COPY) \"" + project->first("QMAKE_INTERNAL_PRL_FILE") + "\" \"" + dst_prl + "\"";
             if(!uninst.isEmpty())
                 uninst.append("\n\t");
             uninst.append("-$(DEL_FILE) \"" + dst_prl + "\"");
         }
-        QString os = project->variables()["QMAKESPEC"].first().section( '-', 0, 0 );
-        if ( os != "cygwin" ) {
+        if ( project->isEmpty("QMAKE_CYGWIN_SHLIB") ) {
             if ( !project->isActiveConfig("staticlib") && !project->isActiveConfig("plugin") ) {
-                if ( os == "hpux" ) {
-                    links << "$(TARGET0)";
-                } else {
+                if ( project->isEmpty("QMAKE_HPUX_SHLIB") ) {
                     links << "$(TARGET0)" << "$(TARGET1)" << "$(TARGET2)";
+                } else {
+                    links << "$(TARGET0)";
                 }
             }
@@ -479,13 +562,15 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
     if(!destdir.isEmpty())
         src_targ = Option::fixPathToTargetOS(destdir + target, FALSE);
-    QString dst_targ = fileFixify(targetdir + target);
+    QString dst_targ = root + fileFixify(targetdir + target);
     if(!ret.isEmpty())
         ret += "\n\t";
     ret += QString(resource ? "-$(COPY_DIR)" : "-$(COPY)") + " \"" +
            src_targ + "\" \"" + dst_targ + "\"";
-    if(!project->isEmpty("QMAKE_STRIP")) {
+    if(!project->isActiveConfig("debug") && !project->isEmpty("QMAKE_STRIP")) {
         ret += "\n\t-" + var("QMAKE_STRIP");
+        if(!project->isEmpty("QMAKE_STRIPFLAGS_LIB") && project->first("TEMPLATE") == "lib")
+            ret += " " + var("QMAKE_STRIPFLAGS_LIB");
         if(resource)
-            ret = " \"" + dst_targ + "/Contents/MacOS/$(QMAKE_TARGET)";
+            ret = " \"" + dst_targ + "/Contents/MacOS/$(QMAKE_TARGET)\"";
         else
             ret += " \"" + dst_targ + "\"";
@@ -507,5 +592,5 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
                 if(lslash != -1)
                     link = link.right(link.length() - (lslash + 1));
-                QString dst_link = fileFixify(targetdir + link);
+                QString dst_link = root + fileFixify(targetdir + link);
                 ret += "\n\t-$(SYMLINK) \"$(TARGET)\" \"" + dst_link + "\"";
                 if(!uninst.isEmpty())
@@ -518,3 +603,2 @@ 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
@@ -56,4 +56,5 @@ protected:
     virtual void processPrlFiles();
 
+    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
@@ -80,7 +80,6 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
                            !project->variables()["QMAKE_INCREMENTAL"].isEmpty() &&
                            (!project->variables()["QMAKE_APP_FLAG"].isEmpty() ||
-                            !project->isActiveConfig("staticlib"))),
+                            !project->isActiveConfig("staticlib"))), 
          src_incremental=FALSE, moc_incremental=FALSE;
-    QString os = project->variables()["QMAKESPEC"].first().section( '-', 0, 0 );
 
     t << "####### Compiler, tools and options" << endl << endl;
@@ -109,5 +108,12 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
     t << "LEXFLAGS = " << var("QMAKE_LEXFLAGS") << endl;
     t << "YACCFLAGS= " << var("QMAKE_YACCFLAGS") << endl;
-    t << "INCPATH  = " << varGlue("INCLUDEPATH","-I", " -I", "") << " -I" << specdir() << endl;
+    t << "INCPATH  = " << "-I" << specdir();
+    if(!project->isActiveConfig("no_include_pwd")) {
+        QString pwd = fileFixify(QDir::currentDirPath());
+        if(pwd.isEmpty())
+            pwd = ".";
+        t << " -I" << pwd;
+    }
+    t << varGlue("INCLUDEPATH"," -I", " -I", "") << endl;
 
     if(!project->isActiveConfig("staticlib")) {
@@ -137,5 +143,6 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
     t << "DEL_DIR  = " << var("QMAKE_DEL_DIR") << endl;
     t << "MOVE     = " << var("QMAKE_MOVE") << endl;
-    t << "PRO      = " << fileFixify(project->projectFile()  )<< endl;
+    t << "CHK_DIR_EXISTS= " << var("QMAKE_CHK_DIR_EXISTS") << endl;
+    t << "MKDIR    = " << var("QMAKE_MKDIR") << endl;
     t << endl;
 
@@ -213,6 +220,5 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
     if(do_incremental && !moc_incremental && !src_incremental)
         do_incremental = FALSE;
-            t << "DIST   = " << varList("DISTFILES") << endl;
-    t << "PRO      = " << fileFixify(project->projectFile()) << endl;
+            t << "DIST   = " << valList(fileFixify(project->variables()["DISTFILES"])) << endl;
     t << "QMAKE_TARGET = " << var("QMAKE_ORIG_TARGET") << endl;
     t << "DESTDIR  = " << var("DESTDIR") << endl;
@@ -222,13 +228,12 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
     } else if (!project->isActiveConfig("staticlib") && project->variables()["QMAKE_APP_FLAG"].isEmpty()) {
                 t << "TARGETA= " << var("TARGETA") << endl;
-        if (os == "hpux") {
-                    t << "TARGETD= " << var("TARGET_x") << endl;
-                    t << "TARGET0= " << var("TARGET_") << endl;
-        }
-        else {
+        if (project->isEmpty("QMAKE_HPUX_SHLIB")) {
                     t << "TARGETD= " << var("TARGET_x.y.z") << endl;
                     t << "TARGET0= " << var("TARGET_") << endl;
                     t << "TARGET1= " << var("TARGET_x") << endl;
                     t << "TARGET2= " << var("TARGET_x.y") << endl;
+        } else {
+                    t << "TARGETD= " << var("TARGET_x") << endl;
+                    t << "TARGET0= " << var("TARGET_") << endl;
         }
     }
@@ -262,5 +267,5 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
         if(!project->variables()["OBJECTS_DIR"].isEmpty())
             odir = project->first("OBJECTS_DIR");
-        t << "###### Dependancies" << endl << endl;
+        t << "###### Dependencies" << endl << endl;
         t << odir << ".deps/%.d: %.cpp\n\t"
           << "@echo Creating depend for $<" << "\n\t"
@@ -387,5 +392,6 @@ 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())
                 t << "\n\t" << "test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
@@ -400,5 +406,6 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
               << endl << endl;
 
-            t << "$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) " << var("TARGETDEPS") << "\n\t";
+            t << "$(TARGET): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC) " 
+              << var("POST_TARGETDEPS") << "\n\t";
             if(!destdir.isEmpty())
                 t << "test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
@@ -461,11 +468,11 @@ 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 {
             t << "all: " << deps << " " << varGlue("ALL_DEPS",""," ","") << " " <<
                 var("DESTDIR_TARGET") << endl << endl;
-            t << var("DESTDIR_TARGET") << ":  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) " <<
-                var("TARGETDEPS");
+            t << var("DESTDIR_TARGET") << ": " << var("PRE_TARGETDEPS") 
+              << " $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) " << var("POST_TARGETDEPS");
         }
         if(!destdir.isEmpty())
@@ -484,18 +491,5 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
                 t << "\n\t" << var("QMAKE_POST_LINK") << "\n\t";
             t << endl << endl;
-        } else if ( os == "hpux" ) {
-            t << "\n\t"
-              << "-$(DEL_FILE) $(TARGET) $(TARGET0)" << "\n\t"
-              << var("QMAKE_LINK_SHLIB_CMD") << "\n\t";
-            t << varGlue("QMAKE_LN_SHLIB",""," "," $(TARGET) $(TARGET0)");
-            if(!destdir.isEmpty())
-                t  << "\n\t"
-                   << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET)\n\t"
-                   << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET0)\n\t"
-                   << "-$(MOVE) $(TARGET) $(TARGET0) " << var("DESTDIR");
-            if(!project->isEmpty("QMAKE_POST_LINK"))
-                t << "\n\t" << var("QMAKE_POST_LINK");
-            t << endl << endl;
-        } else {
+        } else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
             t << "\n\t"
               << "-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)" << "\n\t"
@@ -514,4 +508,17 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
                 t << "\n\t" << var("QMAKE_POST_LINK");
             t << endl << endl;
+        } else {
+            t << "\n\t"
+              << "-$(DEL_FILE) $(TARGET) $(TARGET0)" << "\n\t"
+              << var("QMAKE_LINK_SHLIB_CMD") << "\n\t";
+            t << varGlue("QMAKE_LN_SHLIB",""," "," $(TARGET) $(TARGET0)");
+            if(!destdir.isEmpty())
+                t  << "\n\t"
+                   << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET)\n\t"
+                   << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET0)\n\t"
+                   << "-$(MOVE) $(TARGET) $(TARGET0) " << var("DESTDIR");
+            if(!project->isEmpty("QMAKE_POST_LINK"))
+                t << "\n\t" << var("QMAKE_POST_LINK");
+            t << endl << endl;
         }
         t << endl << endl;
@@ -519,8 +526,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
         if (! project->isActiveConfig("plugin")) {
             t << "staticlib: $(TARGETA)" << endl << endl;
-            t << "$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)";
+            t << "$(TARGETA): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC)";
             if(do_incremental)
                 t << " $(INCREMENTAL_OBJECTS) $(INCREMENTAL_OBJMOC)";
-            t << var("TARGETDEPS") << "\n\t"
+            t << var("POST_TARGETDEPS") << "\n\t"
               << "-$(DEL_FILE) $(TARGETA) " << "\n\t"
               << var("QMAKE_AR_CMD");
@@ -532,9 +539,10 @@ 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"
           << "staticlib: " << var("DESTDIR") << "$(TARGET)" << "\n\n";
         if(project->isEmpty("QMAKE_AR_SUBLIBS")) {
-            t << var("DESTDIR") << "$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(TARGETDEPS) " << "\n\t";
+            t << var("DESTDIR") << "$(TARGET): " << var("PRE_TARGETDEPS") 
+              << " $(UICDECLS) $(OBJECTS) $(OBJMOC) " << var("POST_TARGETDEPS") << "\n\t";
             if(!project->isEmpty("DESTDIR")) {
                 QString destdir = project->first("DESTDIR");
@@ -547,23 +555,23 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
             if(!project->isEmpty("QMAKE_RANLIB"))
                 t << "\t" << "$(RANLIB) $(TARGET)" << "\n";
-            if(!project->isEmpty("DESTDIR"))
+            if(!project->isEmpty("DESTDIR")) 
                 t << "\t" << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET)" << "\n"
                   << "\t" << "-$(MOVE) $(TARGET) " << var("DESTDIR") << "\n";
         } else {
-            int cnt = 0, max_files = project->first("QMAKE_MAX_FILES_PER_AR").toInt();
+            int max_files = project->first("QMAKE_MAX_FILES_PER_AR").toInt();
             QStringList objs = project->variables()["OBJECTS"] + project->variables()["OBJMOC"],
                         libs = project->variables()["QMAKE_AR_SUBLIBS"];
             libs.prepend("$(TARGET)");
-            for(QStringList::Iterator libit = libs.begin(), objit = objs.begin();
+            for(QStringList::Iterator libit = libs.begin(), objit = objs.begin(); 
                 libit != libs.end(); ++libit) {
                 QStringList build;
-                for(cnt = 0; cnt < max_files && objit != objs.end(); ++objit, cnt++)
+                for(int cnt = 0; cnt < max_files && objit != objs.end(); ++objit, cnt++) 
                     build << (*objit);
                 QString ar;
                 if((*libit) == "$(TARGET)") {
-                    t << var("DESTDIR") << "$(TARGET): $(UICDECLS) " << " $(TARGETDEPS) "
-                      << valList(build) << "\n\t";
+                    t << var("DESTDIR") << "$(TARGET): " << var("PRE_TARGETDEPS") 
+                      << " $(UICDECLS) " << var("POST_TARGETDEPS") << valList(build) << "\n\t";
                     ar = project->variables()["QMAKE_AR_CMD"].first();
-                    ar = ar.replace("$(OBJMOC)", "").replace("$(OBJECTS)",
+                    ar = ar.replace("$(OBJMOC)", "").replace("$(OBJECTS)", 
                                                              build.join(" "));
                 } else {
@@ -581,5 +589,5 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
                 if(!project->isEmpty("QMAKE_RANLIB"))
                     t << "\t" << "$(RANLIB) " << (*libit) << "\n";
-                if(!project->isEmpty("DESTDIR"))
+                if(!project->isEmpty("DESTDIR")) 
                     t << "\t" << "-$(DEL_FILE) " << var("DESTDIR") << (*libit) << "\n"
                       << "\t" << "-$(MOVE) " << (*libit) << " " << var("DESTDIR") << "\n";
@@ -593,10 +601,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
     if(!project->isActiveConfig("no_mocdepend")) {
         //this is an implicity depend on moc, so it will be built if necesary, however
-        //moc itself shouldn't have this dependancy - this is a little kludgy but it is
+        //moc itself shouldn't have this dependency - this is a little kludgy but it is
         //better than the alternative for now.
         QString moc = project->first("QMAKE_MOC"), target = project->first("TARGET");
         fixEnvVariables(target);
         fixEnvVariables(moc);
-        if(target != moc)
+        if(target != moc) 
             t << "$(MOC): \n\t"
               << "( cd $(QTDIR)/src/moc ; $(MAKE) )"  << endl << endl;
@@ -644,5 +652,5 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
         for(QStringList::Iterator formit = forms.begin(); formit != forms.end(); ++formit) {
             QString ui_h = fileFixify((*formit) + Option::h_ext.first());
-            if(QFile::exists(ui_h) )
+            if(QFile::exists(ui_h) ) 
                ui_headers << ui_h;
         }
@@ -654,5 +662,5 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
       << "$(GZIP) " << var("QMAKE_ORIG_TARGET") << ".tar ) && "
       << "$(MOVE) `dirname " << ddir_c << "`" << Option::dir_sep << var("QMAKE_ORIG_TARGET") << ".tar.gz . && "
-      << "$(DEL_DIR) " << ddir_c
+      << "$(DEL_FILE) -r " << ddir_c
       << endl << endl;
 
@@ -678,4 +686,43 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
     t << endl;
 
+    t << "yaccclean:" << "\n";
+    if(!var("YACCSOURCES").isEmpty()) {
+        QStringList clean, &l = project->variables()["YACCSOURCES"];
+        for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+            QFileInfo fi((*it));
+            QString dir;
+            if(fi.dirPath() != ".")
+                dir = fi.dirPath() + Option::dir_sep;
+            dir = fileFixify(dir, QDir::currentDirPath(), Option::output_dir);
+            if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep)
+                dir += Option::dir_sep;
+            clean <<  dir + fi.baseName(TRUE) + Option::yacc_mod + Option::cpp_ext.first();
+            clean << dir + fi.baseName(TRUE) + Option::yacc_mod + Option::h_ext.first();
+        }
+        if(!clean.isEmpty()) {
+            t << "\t-$(DEL_FILE) " << clean.join(" ") << "\n";
+            clean_targets += " yaccclean";
+        }
+    }
+
+    t << "lexclean:" << "\n";
+    if(!var("LEXSOURCES").isEmpty()) {
+        QStringList clean, &l = project->variables()["LEXSOURCES"];
+        for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+            QFileInfo fi((*it));
+            QString dir;
+            if(fi.dirPath() != ".")
+                dir = fi.dirPath() + Option::dir_sep;
+            dir = fileFixify(dir, QDir::currentDirPath(), Option::output_dir);
+            if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep)
+                dir += Option::dir_sep;
+            clean <<  dir + fi.baseName(TRUE) + Option::lex_mod + Option::cpp_ext.first();
+        }
+        if(!clean.isEmpty()) {
+            t << "\t-$(DEL_FILE) " << clean.join(" ") << "\n";
+            clean_targets += " lexclean";
+        }
+    }
+
     if(do_incremental) {
         t << "incrclean:" << "\n";
@@ -711,6 +758,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
     if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep)
         destdir += Option::dir_sep;
-    t << "distclean: " << "clean\n\t"
-      << "-$(DEL_FILE) " << destdir << "$(TARGET)" << " " << "$(TARGET)" << "\n";
+    t << "distclean: " << "clean\n";
+    if(project->first("TEMPLATE") == "app" &&
+       project->isActiveConfig("resource_fork") && !project->isActiveConfig("console"))
+        t << "\t-$(DEL_FILE) -r " << destdir.section(Option::dir_sep, 0, -4) << "\n";
+    else
+        t << "\t-$(DEL_FILE) " << destdir << "$(TARGET)" << " " << "$(TARGET)" << "\n";
     if(!project->isActiveConfig("staticlib") && project->variables()["QMAKE_APP_FLAG"].isEmpty() &&
        !project->isActiveConfig("plugin"))
@@ -807,5 +858,5 @@ UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
     t << "DEL_FILE =    " << var("QMAKE_DEL_FILE") << endl;
             t << "SUBTARGETS =";     // subdirectory targets are sub-directory
-    for( it.toFirst(); it.current(); ++it)
+    for( it.toFirst(); it.current(); ++it) 
         t << " \\\n\t\t" << it.current()->target;
     t << endl << endl;
@@ -836,5 +887,5 @@ UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
             QString tar = it.current()->target;
             ++it;
-            if (it.current())
+            if (it.current()) 
                 t << it.current()->target << ": " << tar << endl;
         }
@@ -845,5 +896,5 @@ 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 {
         t << "all: $(SUBTARGETS)" << endl;
@@ -859,9 +910,9 @@ UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
             if(!(*it)->directory.isEmpty())
                 t << "[ -d " << (*it)->directory << " ] && cd " << (*it)->directory << " ; ";
-            t << "grep \"^qmake_all:\" " << (*it)->makefile
+            t << "grep \"^qmake_all:\" " << (*it)->makefile 
               << " && $(MAKE) -f " << (*it)->makefile << " qmake_all" << "; ) || true";
         }
         t << endl;
-        t << "clean uninstall install uiclean mocclean: qmake_all FORCE";
+        t << "clean uninstall install uiclean mocclean lexclean yaccclean: qmake_all FORCE";
         for( it.toFirst(); it.current(); ++it) {
             t << "\n\t ( ";
@@ -907,4 +958,6 @@ void UnixMakefileGenerator::init2()
 #endif
         project->variables()["TARGET"].first().prepend(project->first("DESTDIR"));
+       if ( !project->variables()["QMAKE_CYGWIN_EXE"].isEmpty() )
+            project->variables()["TARGET_EXT"].append(".exe");
     } else if ( project->isActiveConfig("staticlib") ) {
         project->variables()["TARGET"].first().prepend("lib");
@@ -918,5 +971,4 @@ void UnixMakefileGenerator::init2()
         else
             project->variables()["QMAKE_AR_CMD"].append("$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)");
-        QString os = project->variables()["QMAKESPEC"].first().section( '-', 0, 0 );
         if( project->isActiveConfig("plugin") ) {
             project->variables()["TARGET_x.y.z"].append("lib" +
@@ -924,5 +976,5 @@ void UnixMakefileGenerator::init2()
             if(project->isActiveConfig("lib_version_first"))
                 project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
-                                                        project->first("VER_MAJ") + "." +
+                                                        project->first("VER_MAJ") + "." + 
                                                         project->first("QMAKE_EXTENSION_SHLIB"));
             else
@@ -934,14 +986,14 @@ void UnixMakefileGenerator::init2()
             if(project->isActiveConfig("qt"))
                 project->variables()["DEFINES"].append("QT_PLUGIN");
-        } else if ( os == "hpux" ) {
+        } else if ( !project->isEmpty("QMAKE_HPUX_SHLIB") ) {
             project->variables()["TARGET_"].append("lib" + project->first("TARGET") + ".sl");
             if(project->isActiveConfig("lib_version_first"))
-                project->variables()["TARGET_x"].append("lib" + project->first("VER_MAJ") + "." +
+                project->variables()["TARGET_x"].append("lib" + project->first("VER_MAJ") + "." + 
                                                         project->first("TARGET"));
             else
-                project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
+                project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." + 
                                                         project->first("VER_MAJ"));
             project->variables()["TARGET"] = project->variables()["TARGET_x"];
-        } else if ( os == "aix" ) {
+        } else if ( !project->isEmpty("QMAKE_AIX_SHLIB") ) {
             project->variables()["TARGET_"].append("lib" + project->first("TARGET") + ".a");
             if(project->isActiveConfig("lib_version_first")) {
@@ -1012,6 +1064,13 @@ void UnixMakefileGenerator::init2()
         if ( !project->variables()["DESTDIR"].isEmpty() )
             project->variables()["DESTDIR_TARGET"].first().prepend(project->first("DESTDIR"));
-        if ( !project->variables()["QMAKE_LFLAGS_SONAME"].isEmpty() && !project->variables()["TARGET_x"].isEmpty() )
-            project->variables()["QMAKE_LFLAGS_SONAME"].first() += project->first("TARGET_x");
+        if ( !project->variables()["QMAKE_LFLAGS_SONAME"].isEmpty()) {
+            if(project->isActiveConfig("plugin")) {
+                if(!project->variables()["TARGET"].isEmpty() )
+                    project->variables()["QMAKE_LFLAGS_SONAME"].first() += project->first("TARGET");
+            } else {
+                if(!project->variables()["TARGET_x"].isEmpty() )
+                    project->variables()["QMAKE_LFLAGS_SONAME"].first() += project->first("TARGET_x");
+            }
+        }
         if ( project->variables()["QMAKE_LINK_SHLIB_CMD"].isEmpty() )
             project->variables()["QMAKE_LINK_SHLIB_CMD"].append(
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
@@ -133,4 +133,6 @@ BorlandMakefileGenerator::writeBorlandParts(QTextStream &t)
     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;
 
@@ -151,13 +153,17 @@ 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;
 
     t << "####### Build rules" << endl << endl;
     t << "all: " << varGlue("ALL_DEPS",""," "," ") << " $(TARGET)" << endl << endl;
-    t << "$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) " << var("TARGETDEPS");
+    t << "$(TARGET): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC) " 
+      << var("POST_TARGETDEPS");
     if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) {
         t << "\n\t" << "$(LINK) @&&|" << "\n\t"
@@ -170,4 +176,8 @@ 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()) {
         QStringList dlldirs = project->variables()["DLLDESTDIR"];
@@ -214,5 +224,4 @@ BorlandMakefileGenerator::writeBorlandParts(QTextStream &t)
       << 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 ","");
@@ -221,6 +230,4 @@ BorlandMakefileGenerator::writeBorlandParts(QTextStream &t)
         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 ", "");
@@ -245,4 +252,8 @@ BorlandMakefileGenerator::writeBorlandParts(QTextStream &t)
 
     t << endl << endl;
+
+    t << "distclean: clean"
+      << "\n\t-del $(TARGET)"
+      << endl << endl;
 }
 
@@ -365,5 +376,5 @@ BorlandMakefileGenerator::init()
                 int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt");
                 if ( hver == -1 )
-                    hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt-mt");
+                    hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qtmt");
                 if(hver != -1) {
                     QString ver;
@@ -427,4 +438,26 @@ BorlandMakefileGenerator::init()
         project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"];
     }
+    if ( project->isActiveConfig("stl") ) {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_ON"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_ON"];
+    } else {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_OFF"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_OFF"];
+    }
+    if ( project->isActiveConfig("exceptions") ) {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_ON"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_ON"];
+    } else {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_OFF"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_OFF"];
+    }
+    if ( project->isActiveConfig("rtti") ) {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_ON"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_ON"];
+    } else {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_OFF"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_OFF"];
+    }
+
     if ( project->isActiveConfig("thread") ) {
         project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_RTMT"];
@@ -453,5 +486,5 @@ BorlandMakefileGenerator::init()
         project->variables()["RES_FILE"] = project->variables()["RC_FILE"];
         project->variables()["RES_FILE"].first().replace(".rc",".res");
-        project->variables()["TARGETDEPS"] += project->variables()["RES_FILE"];
+        project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"];
     }
     MakefileGenerator::init();
@@ -475,3 +508,2 @@ 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
@@ -6,5 +6,5 @@
 ** Created : 970521
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the network module of the Qt GUI Toolkit.
@@ -35,6 +35,6 @@
 **
 **********************************************************************/
-#ifndef __BORLANDMAKE_H__
-#define __BORLANDMAKE_H__
+#ifndef __BORLAND_BMAKE_H__
+#define __BORLAND_BMAKE_H__
 
 #include "winmakefile.h"
@@ -56,4 +56,3 @@ 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
@@ -509,4 +509,28 @@ DspMakefileGenerator::init()
     init_flag = TRUE;
 
+    const bool thread = project->isActiveConfig("thread");
+
+    if ( project->isActiveConfig("stl") ) {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_ON"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_ON"];
+    } else {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_OFF"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_OFF"];
+    }
+    if ( project->isActiveConfig("exceptions") ) {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_ON"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_ON"];
+    } else {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_OFF"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_OFF"];
+    }
+    if ( project->isActiveConfig("rtti") ) {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_ON"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_ON"];
+    } else {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_OFF"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_OFF"];
+    }
+
     /* this should probably not be here, but I'm using it to wrap the .t files */
     if(project->first("TEMPLATE") == "vcapp" )
@@ -569,5 +593,5 @@ DspMakefileGenerator::init()
             }
         } else {
-            if(project->isActiveConfig("thread"))
+            if( thread )
                 project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"];
             else
@@ -579,5 +603,5 @@ DspMakefileGenerator::init()
                 if(hver != -1) {
                     QString ver;
-                    ver.sprintf("qt%s" QTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "-mt" : ""), hver);
+                    ver.sprintf("qt%s" QTDLL_POSTFIX "%d.lib", (thread ? "-mt" : ""), hver);
                     QStringList &libs = project->variables()["QMAKE_LIBS"];
                     for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit)
@@ -623,5 +647,5 @@ DspMakefileGenerator::init()
         project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"];
     }
-    if ( project->isActiveConfig("thread") ) {
+    if ( thread ) {
         if(project->isActiveConfig("qt"))
             project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT" );
@@ -733,4 +757,5 @@ DspMakefileGenerator::init()
     project->variables()["MSVCDSP_DEFINES"].append(varGlue("PRL_EXPORT_DEFINES","/D ","" " /D ",""));
 
+    processPrlFiles();
     QStringList &libs = project->variables()["QMAKE_LIBS"];
     for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) {
@@ -755,4 +780,16 @@ DspMakefileGenerator::init()
 
     QString dest;
+    QString postLinkStep;
+    QString copyDllStep;
+    QString activeQtStepPreCopyDll;
+    QString activeQtStepPostCopyDll;
+    QString activeQtStepPreCopyDllDebug;
+    QString activeQtStepPostCopyDllDebug;
+    QString activeQtStepPreCopyDllRelease;
+    QString activeQtStepPostCopyDllRelease;
+
+    if ( !project->variables()["QMAKE_POST_LINK"].isEmpty() )
+        postLinkStep += var("QMAKE_POST_LINK");
+
     if ( !project->variables()["DESTDIR"].isEmpty() ) {
         project->variables()["TARGET"].first().prepend(project->first("DESTDIR"));
@@ -771,18 +808,11 @@ DspMakefileGenerator::init()
     if ( project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty() ) {
         QStringList dlldirs = project->variables()["DLLDESTDIR"];
-        QString copydll = "# Begin Special Build Tool\n"
-             "TargetPath=" + dest + "\n"
-                 "SOURCE=$(InputPath)\n"
-         "PostBuild_Desc=Copy DLL to " + project->first("DLLDESTDIR") + "\n"
-         "PostBuild_Cmds=";
-
+        if ( dlldirs.count() )
+            copyDllStep += "\t";
         for ( QStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) {
-            copydll += "copy \"" + dest + "\" \"" + *dlldir + "\"\t";
+            copyDllStep += "copy \"$(TargetPath)\" \"" + *dlldir + "\"\t";
         }
-
-        copydll += "\n# End Special Build Tool";
-        project->variables()["MSVCDSP_COPY_DLL_REL"].append( copydll );
-        project->variables()["MSVCDSP_COPY_DLL_DBG"].append( copydll );
     }
+
     if ( project->isActiveConfig("activeqt") ) {
         QString idl = project->variables()["QMAKE_IDL"].first();
@@ -796,40 +826,52 @@ DspMakefileGenerator::init()
         project->variables()["MSVCDSP_IDLSOURCES"].append( "tmp\\" + targetfilename + ".midl" );
         if ( project->isActiveConfig( "dll" ) ) {
-            QString regcmd = "# Begin Special Build Tool\n"
-                "TargetPath=" + targetfilename + "\n"
-                    "SOURCE=$(InputPath)\n"
-            "PostBuild_Desc=Finalizing ActiveQt server...\n"
-            "PostBuild_Cmds=" +
-                             idc + " %1 -idl tmp\\" + targetfilename + ".idl -version " + version +
+            activeQtStepPreCopyDll += 
+                             "\t" + idc + " %1 -idl tmp\\" + targetfilename + ".idl -version " + version +
                              "\t" + idl + " tmp\\" + targetfilename + ".idl /nologo /o tmp\\" + targetfilename + ".midl /tlb tmp\\" + targetfilename + ".tlb /iid tmp\\dump.midl /dlldata tmp\\dump.midl /cstub tmp\\dump.midl /header tmp\\dump.midl /proxy tmp\\dump.midl /sstub tmp\\dump.midl"
-                             "\t" + idc + " %1 /tlb tmp\\" + targetfilename + ".tlb"
-                             "\t" + idc + " %1 /regserver\n"
-                             "# End Special Build Tool";
+                             "\t" + idc + " %1 /tlb tmp\\" + targetfilename + ".tlb";
+            activeQtStepPostCopyDll +=
+                             "\t" + idc + " %1 /regserver\n";
 
-            QString executable = project->variables()["MSVCDSP_TARGETDIRREL"].first() + "\\" + project->variables()["TARGET"].first();
-            project->variables()["MSVCDSP_COPY_DLL_REL"].append( regcmd.arg(executable).arg(executable).arg(executable) );
+            QString executable = project->variables()["MSVCDSP_TARGETDIRREL"].first() + "\\" + targetfilename + ".dll";
+            activeQtStepPreCopyDllRelease = activeQtStepPreCopyDll.arg(executable).arg(executable);
+            activeQtStepPostCopyDllRelease = activeQtStepPostCopyDll.arg(executable);
 
-            executable = project->variables()["MSVCDSP_TARGETDIRDEB"].first() + "\\" + project->variables()["TARGET"].first();
-            project->variables()["MSVCDSP_COPY_DLL_DBG"].append( regcmd.arg(executable).arg(executable).arg(executable) );
+            executable = project->variables()["MSVCDSP_TARGETDIRDEB"].first() + "\\" + targetfilename + ".dll";
+            activeQtStepPreCopyDllDebug = activeQtStepPreCopyDll.arg(executable).arg(executable);
+            activeQtStepPostCopyDllDebug = activeQtStepPostCopyDll.arg(executable);
         } else {
-            QString regcmd = "# Begin Special Build Tool\n"
-                "TargetPath=" + targetfilename + "\n"
-                    "SOURCE=$(InputPath)\n"
-            "PostBuild_Desc=Finalizing ActiveQt server...\n"
-            "PostBuild_Cmds="
-                             "%1 -dumpidl tmp\\" + targetfilename + ".idl -version " + version +
+            activeQtStepPreCopyDll += 
+                             "\t%1 -dumpidl tmp\\" + targetfilename + ".idl -version " + version +
                              "\t" + idl + " tmp\\" + targetfilename + ".idl /nologo /o tmp\\" + targetfilename + ".midl /tlb tmp\\" + targetfilename + ".tlb /iid tmp\\dump.midl /dlldata tmp\\dump.midl /cstub tmp\\dump.midl /header tmp\\dump.midl /proxy tmp\\dump.midl /sstub tmp\\dump.midl"
-                             "\t" + idc + " %1 /tlb tmp\\" + targetfilename + ".tlb"
-                             "\t%1 -regserver\n"
-                             "# End Special Build Tool";
-
-            QString executable = project->variables()["MSVCDSP_TARGETDIRREL"].first() + "\\" + project->variables()["TARGET"].first();
-            project->variables()["MSVCDSP_REGSVR_REL"].append( regcmd.arg(executable).arg(executable).arg(executable) );
-
-            executable = project->variables()["MSVCDSP_TARGETDIRDEB"].first() + "\\" + project->variables()["TARGET"].first();
-            project->variables()["MSVCDSP_REGSVR_DBG"].append( regcmd.arg(executable).arg(executable).arg(executable) );
+                             "\t" + idc + " %1 /tlb tmp\\" + targetfilename + ".tlb";
+            activeQtStepPostCopyDll +=
+                             "\t%1 -regserver\n";
+            QString executable = project->variables()["MSVCDSP_TARGETDIRREL"].first() + "\\" + targetfilename + ".exe";
+            activeQtStepPreCopyDllRelease = activeQtStepPreCopyDll.arg(executable).arg(executable);
+            activeQtStepPostCopyDllRelease = activeQtStepPostCopyDll.arg(executable);
+
+            executable = project->variables()["MSVCDSP_TARGETDIRDEB"].first() + "\\" + targetfilename + ".exe";
+            activeQtStepPreCopyDllDebug = activeQtStepPreCopyDll.arg(executable).arg(executable);
+            activeQtStepPostCopyDllDebug = activeQtStepPostCopyDll.arg(executable);
         }
 
     }
+
+    
+    if ( !postLinkStep.isEmpty() || !copyDllStep.isEmpty() || !activeQtStepPreCopyDllDebug.isEmpty() || !activeQtStepPreCopyDllRelease.isEmpty() ) {
+        project->variables()["MSVCDSP_POST_LINK_DBG"].append(
+            "# Begin Special Build Tool\n"
+            "SOURCE=$(InputPath)\n"
+            "PostBuild_Desc=Post Build Step\n"
+            "PostBuild_Cmds=" + postLinkStep + activeQtStepPreCopyDllDebug + copyDllStep + activeQtStepPostCopyDllDebug + "\n"
+            "# End Special Build Tool\n" );
+        project->variables()["MSVCDSP_POST_LINK_REL"].append(
+            "# Begin Special Build Tool\n"
+            "SOURCE=$(InputPath)\n"
+            "PostBuild_Desc=Post Build Step\n"
+            "PostBuild_Cmds=" + postLinkStep + activeQtStepPreCopyDllRelease + copyDllStep + activeQtStepPostCopyDllRelease + "\n"
+            "# End Special Build Tool\n" );
+    }
+
     if ( !project->variables()["SOURCES"].isEmpty() || !project->variables()["RC_FILE"].isEmpty() ) {
         project->variables()["SOURCES"] += project->variables()["RC_FILE"];
@@ -845,5 +887,5 @@ DspMakefileGenerator::init()
 
 QString
-DspMakefileGenerator::findTemplate(QString file)
+DspMakefileGenerator::findTemplate(const QString &file)
 {
     QString ret;
@@ -872,10 +914,10 @@ DspMakefileGenerator::processPrlVariable(const QString &var, const QStringList &
 
 
-int
+void
 DspMakefileGenerator::beginGroupForFile(QString file, QTextStream &t,
-                                        QString filter)
+                                        const QString& filter)
 {
     if(project->isActiveConfig("flat"))
-        return 0;
+        return;
 
     fileFixify(file, QDir::currentDirPath(), QDir::currentDirPath(), TRUE);
@@ -884,37 +926,39 @@ DspMakefileGenerator::beginGroupForFile(QString file, QTextStream &t,
         file += Option::dir_sep;
     if(file == currentGroup)
-        return 0;
+        return;
 
     if(file.isEmpty() || !QDir::isRelativePath(file)) {
         endGroups(t);
-        return 0;
+        return;
     }
     if(file.startsWith(currentGroup))
         file = file.mid(currentGroup.length());
-    else
-        endGroups(t);
-    int lvl = file.contains(Option::dir_sep), old_lvl = currentGroup.contains(Option::dir_sep);
-    if(lvl > old_lvl) {
-        QStringList dirs = QStringList::split(Option::dir_sep, file);
-        for(QStringList::Iterator dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) {
-            t << "# Begin Group \"" << (*dir_it) << "\"\n"
-              << "# Prop Default_Filter \"" << filter << "\"\n";
-        }
-    } else {
-        for(int x = old_lvl - lvl; x; x--)
+    int dirSep = currentGroup.findRev( Option::dir_sep );
+    while( !file.startsWith( currentGroup ) && dirSep != -1 ) {
+        currentGroup.truncate( dirSep );
+        dirSep = currentGroup.findRev( Option::dir_sep );
+        if ( !file.startsWith( currentGroup ) && dirSep != -1 )
             t << "\n# End Group\n";
     }
+    if ( !file.startsWith( currentGroup ) ) {
+        t << "\n# End Group\n";
+        currentGroup = "";
+    }
+    QStringList dirs = QStringList::split(Option::dir_sep, file.right( file.length() - currentGroup.length() ) );
+    for(QStringList::Iterator dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) {
+        t << "# Begin Group \"" << (*dir_it) << "\"\n"
+            << "# Prop Default_Filter \"" << filter << "\"\n";
+    }
     currentGroup = file;
-    return lvl - old_lvl;
 }
 
 
-int
+void
 DspMakefileGenerator::endGroups(QTextStream &t)
 {
     if(project->isActiveConfig("flat"))
-        return 0;
+        return;
     else if(currentGroup.isEmpty())
-        return 0;
+        return;
 
     QStringList dirs = QStringList::split(Option::dir_sep, currentGroup);
@@ -923,5 +967,4 @@ 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
@@ -6,5 +6,5 @@
 ** Created : 970521
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the network module of the Qt GUI Toolkit.
@@ -35,6 +35,6 @@
 **
 **********************************************************************/
-#ifndef __DSPMAKE_H__
-#define __DSPMAKE_H__
+#ifndef __MSVC_DSP_H__
+#define __MSVC_DSP_H__
 
 #include "winmakefile.h"
@@ -44,6 +44,6 @@ class DspMakefileGenerator : public Win32MakefileGenerator
 {
     QString currentGroup;
-    int beginGroupForFile(QString file, QTextStream &, const QString filter="");
-    int endGroups(QTextStream &);
+    void beginGroupForFile(QString file, QTextStream &, const QString& filter="");
+    void endGroups(QTextStream &);
 
     bool init_flag;
@@ -51,5 +51,5 @@ class DspMakefileGenerator : public Win32MakefileGenerator
 
     bool writeMakefile(QTextStream &);
-    QString findTemplate(QString file);
+    QString findTemplate(const QString &file);
     void init();
 
@@ -71,3 +71,3 @@ inline bool DspMakefileGenerator::findLibraries()
 { return Win32MakefileGenerator::findLibraries("MSVCDSP_LIBS"); }
 
-#endif /* __DSPMAKE_H__ */
+#endif /* __MSVC_DSP_H__ */
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 9cc9a69..ecef34d 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -6,5 +6,5 @@
 ** Created : 970521
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the network module of the Qt GUI Toolkit.
@@ -39,4 +39,5 @@
 #include "option.h"
 #include <qregexp.h>
+#include <qdict.h>
 #include <qdir.h>
 #include <stdlib.h>
@@ -136,4 +137,6 @@ NmakeMakefileGenerator::writeNmakeParts(QTextStream &t)
             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;
 
@@ -157,13 +160,54 @@ 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;
+    }
 
     t << "####### Build rules" << endl << endl;
     t << "all: " << varGlue("ALL_DEPS",""," "," ") << "$(TARGET)" << endl << endl;
-    t << "$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) " << var("TARGETDEPS");
+    t << "$(TARGET): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC) " 
+      << var("POST_TARGETDEPS");
     if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) {
         t << "\n\t" << "$(LINK) $(LFLAGS) /OUT:$(TARGET) @<< " << "\n\t  "
@@ -174,4 +218,6 @@ 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()) {
         QStringList dlldirs = project->variables()["DLLDESTDIR"];
@@ -221,4 +267,5 @@ NmakeMakefileGenerator::writeNmakeParts(QTextStream &t)
       << 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 + ".*");
@@ -247,4 +294,8 @@ NmakeMakefileGenerator::writeNmakeParts(QTextStream &t)
 
     t << endl << endl;
+
+    t << "distclean: clean"
+      << "\n\t-del $(TARGET)"
+      << endl << endl;
 }
 
@@ -432,4 +483,26 @@ NmakeMakefileGenerator::init()
         project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"];
     }
+    if ( project->isActiveConfig("stl") ) {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_ON"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_ON"];
+    } else {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_OFF"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_OFF"];
+    }
+    if ( project->isActiveConfig("exceptions") ) {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_ON"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_ON"];
+    } else {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_OFF"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_OFF"];
+    }
+    if ( project->isActiveConfig("rtti") ) {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_ON"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_ON"];
+    } else {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_OFF"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_OFF"];
+    }
+
 
     if ( project->isActiveConfig("moc") )
@@ -466,5 +539,5 @@ NmakeMakefileGenerator::init()
         project->variables()["RES_FILE"] = project->variables()["RC_FILE"];
         project->variables()["RES_FILE"].first().replace(".rc",".res");
-        project->variables()["TARGETDEPS"] += project->variables()["RES_FILE"];
+        project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"];
     }
     if ( !project->variables()["RES_FILE"].isEmpty())
@@ -477,11 +550,12 @@ NmakeMakefileGenerator::init()
         project->variables()["VER_MIN"].append(l[1]);
     }
+
+    QString version = QStringList::split('.', project->first("VERSION")).join("");
     if(project->isActiveConfig("dll")) {
-        project->variables()["QMAKE_CLEAN"].append(project->first("DESTDIR") + project->first("TARGET") + ".lib");
-        project->variables()["QMAKE_CLEAN"].append(project->first("DESTDIR") + project->first("TARGET") + ".exp");
+        project->variables()["QMAKE_CLEAN"].append(project->first("DESTDIR") + project->first("TARGET") + version + ".exp");
     }
     if(project->isActiveConfig("debug")) {
-        project->variables()["QMAKE_CLEAN"].append(project->first("DESTDIR") + project->first("TARGET") + ".pdb");
-        project->variables()["QMAKE_CLEAN"].append(project->first("DESTDIR") + project->first("TARGET") + ".ilk");
+        project->variables()["QMAKE_CLEAN"].append(project->first("DESTDIR") + project->first("TARGET") + version + ".pdb");
+        project->variables()["QMAKE_CLEAN"].append(project->first("DESTDIR") + project->first("TARGET") + version + ".ilk");
         project->variables()["QMAKE_CLEAN"].append("vc*.pdb");
     }
diff --git a/qmake/generators/win32/msvc_nmake.h b/qmake/generators/win32/msvc_nmake.h
index d3e170f..579fc35 100644
--- a/qmake/generators/win32/msvc_nmake.h
+++ b/qmake/generators/win32/msvc_nmake.h
@@ -6,5 +6,5 @@
 ** Created : 970521
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the network module of the Qt GUI Toolkit.
@@ -35,6 +35,6 @@
 **
 **********************************************************************/
-#ifndef __NMAKEMAKE_H__
-#define __NMAKEMAKE_H__
+#ifndef __MSVC_NMAKE_H__
+#define __MSVC_NMAKE_H__
 
 #include "winmakefile.h"
@@ -57,3 +57,3 @@ 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
@@ -255,25 +255,25 @@ const char* _WholeProgramOptimization		= "\n\t\t\t\tWholeProgramOptimization=\""
 struct TPair {
     TPair( const char* n, const triState v ) : name(n), value(v) {};
-    const char* name; 
-    const triState value; 
+    const char* name;
+    const triState value;
 };
-struct EPair { 
+struct EPair {
     EPair( const char* n, const int v ) : name(n), value(v) {};
-    const char* name; 
+    const char* name;
     const int value;
 };
-struct LPair { 
+struct LPair {
     LPair( const char* n, const long v ) : name(n), value(v) {};
-    const char* name; 
-    const long value; 
+    const char* name;
+    const long value;
 };
-struct SPair { 
+struct SPair {
     SPair( const char* n, const QString& v ) : name(n), value(v) {};
-    const char* name; 
-    const QString& value; 
+    const char* name;
+    const QString& value;
 };
-struct XPair { 
+struct XPair {
     XPair( const char* n, const QStringList& v, const char* s = "," ) : name(n), value(v), sep(s) {};
-    const char* name; 
+    const char* name;
     const QStringList& value;
     const char* sep;
@@ -384,5 +384,5 @@ QTextStream &operator<<( QTextStream &strm, const VCCLCompilerTool &tool )
     strm << _VCCLCompilerToolName;
     strm << XPair( _AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories );
-    strm << XPair( _AdditionalOptions, tool.AdditionalOptions );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
     strm << XPair( _AdditionalUsingDirectories, tool.AdditionalUsingDirectories );
     strm << SPair( _AssemblerListingLocation, tool.AssemblerListingLocation );
@@ -443,5 +443,5 @@ QTextStream &operator<<( QTextStream &strm, const VCCLCompilerTool &tool )
     strm << TPair( _WarnAsError, tool.WarnAsError );
     strm << EPair( _WarningLevel, tool.WarningLevel );
-    strm << TPair( _WholeProgramOptimization, tool.WholeProgramOptimization ); 
+    strm << TPair( _WholeProgramOptimization, tool.WholeProgramOptimization );
     strm << "/>";
 return strm;
@@ -451,8 +451,9 @@ bool VCCLCompilerTool::parseOption( const char* option )
 {
     // skip index 0 ('/' or '-')
-    char first  = option[1]; 
+    char first  = option[1];
     char second = option[2];
     char third  = option[3];
     char fourth = option[4];
+    bool found = TRUE;
 
     switch ( first ) {
@@ -460,15 +461,18 @@ bool VCCLCompilerTool::parseOption( const char* option )
     case 'h':
         qWarning( "Generator: Option '/?', '/help': MSVC.NET projects do not support outputting help info" );
-        return FALSE;
+        found = FALSE;
+        break;
     case '@':
         qWarning( "Generator: Option '/@': MSVC.NET projects do not support the use of a response file" );
-        return FALSE;
+        found = FALSE;
+        break;
     case 'l':
         qWarning( "Generator: Option '/link': qmake generator does not support passing link options through the compiler tool" );
-        return FALSE;
-
+        found = FALSE;
+        break;
     case 'A':
-        if ( second != 'I' )
-            return FALSE;
+        if ( second != 'I' ) {
+            found = FALSE; break;
+        }
         AdditionalUsingDirectories += option+2;
         break;
@@ -488,5 +492,5 @@ bool VCCLCompilerTool::parseOption( const char* option )
                 break;
             }
-            return FALSE;
+            found = FALSE; break;
         }
         GeneratePreprocessedFile = preprocessYes;
@@ -545,5 +549,5 @@ bool VCCLCompilerTool::parseOption( const char* option )
                 break;
             default:
-                return FALSE;
+                found = FALSE; break;
             }
         }
@@ -554,5 +558,5 @@ bool VCCLCompilerTool::parseOption( const char* option )
         case '4':
             qWarning( "Option '/G3' and '/G4' were phased out in Visual C++ 5.0" );
-            return FALSE;
+            found = FALSE; break;
         case '5':
             OptimizeForProcessor = procOptimizePentium;
@@ -620,5 +624,5 @@ bool VCCLCompilerTool::parseOption( const char* option )
             break;
         default:
-            return FALSE;
+            found = FALSE; break;
         }
         break;
@@ -634,5 +638,5 @@ bool VCCLCompilerTool::parseOption( const char* option )
             break;
         }
-        return FALSE;
+        found = FALSE; break;
     case 'M':
         if ( second == 'D' ) {
@@ -652,5 +656,5 @@ bool VCCLCompilerTool::parseOption( const char* option )
             break;
         }
-        return FALSE;
+        found = FALSE; break;
     case 'O':
         switch ( second ) {
@@ -672,5 +676,5 @@ bool VCCLCompilerTool::parseOption( const char* option )
                 InlineFunctionExpansion = expandAnySuitable;
             else
-                return FALSE;
+                found = FALSE;
             break;
         case 'd':
@@ -706,5 +710,5 @@ bool VCCLCompilerTool::parseOption( const char* option )
             break;
         default:
-            return FALSE;
+            found = FALSE; break;
         }
         break;
@@ -717,5 +721,5 @@ bool VCCLCompilerTool::parseOption( const char* option )
             break;
         }
-        return FALSE;
+        found = FALSE; break;
     case 'R':
         if ( second == 'T' && third == 'C' ) {
@@ -729,5 +733,5 @@ bool VCCLCompilerTool::parseOption( const char* option )
                 BasicRuntimeChecks = runtimeCheckUninitVariables;
             else
-                return FALSE;
+                found = FALSE; break;
         }
         break;
@@ -739,5 +743,5 @@ bool VCCLCompilerTool::parseOption( const char* option )
         } else {
             qWarning( "Generator: Options '/Tp<filename>' and '/Tc<filename>' are not supported by qmake" );
-            return FALSE;
+            found = FALSE; break;
         }
         break;
@@ -779,5 +783,5 @@ bool VCCLCompilerTool::parseOption( const char* option )
             // Fallthrough
         default:
-            return FALSE;
+            found = FALSE; break;
         }
         break;
@@ -808,5 +812,5 @@ bool VCCLCompilerTool::parseOption( const char* option )
             break;
         default:
-            return FALSE;
+            found = FALSE; break;
         }
         break;
@@ -841,7 +845,7 @@ bool VCCLCompilerTool::parseOption( const char* option )
                     TreatWChar_tAsBuiltInType = _True;
                 else
-                    return FALSE;
+                    found = FALSE;
             } else {
-                return FALSE;
+                found = FALSE; break;
             }
             break;
@@ -870,9 +874,9 @@ bool VCCLCompilerTool::parseOption( const char* option )
                 break;
             default:
-                return FALSE;
+                found = FALSE; break;
             }
             break;
         default:
-            return FALSE;
+            found = FALSE; break;
         }
         break;
@@ -888,10 +892,11 @@ bool VCCLCompilerTool::parseOption( const char* option )
             }
         } else {
-            return FALSE;
+            found = FALSE; break;
         }
         break;
     case 'd':
-        if ( second != 'r' )
-            return FALSE;
+        if ( second != 'r' ) {
+            found = FALSE; break;
+        }
         CompileAsManaged = managedAssembly;
         break;
@@ -905,5 +910,5 @@ bool VCCLCompilerTool::parseOption( const char* option )
             break;
         }
-        return FALSE;
+        found = FALSE; break;
     case 's':
         if ( second == 'h' && third == 'o' && fourth == 'w' ) {
@@ -911,5 +916,5 @@ bool VCCLCompilerTool::parseOption( const char* option )
             break;
         }
-        return FALSE;
+        found = FALSE; break;
     case 'u':
         UndefineAllPreprocessorDefinitions = _True;
@@ -920,5 +925,5 @@ bool VCCLCompilerTool::parseOption( const char* option )
             break;
         }
-        return FALSE;
+        found = FALSE; break;
     case 'w':
         switch ( second ) {
@@ -934,6 +939,8 @@ bool VCCLCompilerTool::parseOption( const char* option )
         break;
     default:
-        return FALSE;
+        found = FALSE; break;
     }
+    if( !found )
+        warn_msg( WarnLogic, "Could not parse Compiler option: %s", option );
     return TRUE;
 }
@@ -981,5 +988,5 @@ QTextStream &operator<<( QTextStream &strm, const VCLinkerTool &tool )
     strm << XPair( _AdditionalDependencies4, tool.AdditionalDependencies, " " );
     strm << XPair( _AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories );
-    strm << XPair( _AdditionalOptions, tool.AdditionalOptions );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
     strm << XPair( _AddModuleNamesToAssembly, tool.AddModuleNamesToAssembly );
     strm << SPair( _BaseAddress, tool.BaseAddress );
@@ -1047,6 +1054,6 @@ static uint elfHash( const char* name )
     if ( name ) {
         k = (const uchar *) name;
-        while ( (*k) && 
-                (*k)!= ':' && 
+        while ( (*k) &&
+                (*k)!= ':' &&
                 (*k)!=',' &&
                 (*k)!=' ' ) {
@@ -1061,43 +1068,47 @@ static uint elfHash( const char* name )
     return h;
 }
+
+//#define USE_DISPLAY_HASH
+#ifdef USE_DISPLAY_HASH
 static void displayHash( const char* str )
 {
     printf( "case 0x%07x: // %s\n    break;\n", elfHash(str), str );
 }
+#endif
 
 bool VCLinkerTool::parseOption( const char* option )
 {
-#if 0
+#ifdef USE_DISPLAY_HASH
     // Main options
-    displayHash( "/ALIGN" ); displayHash( "/ALLOWBIND" ); displayHash( "/ASSEMBLYMODULE" ); 
-    displayHash( "/ASSEMBLYRESOURCE" ); displayHash( "/BASE" ); displayHash( "/DEBUG" ); 
-    displayHash( "/DEF" ); displayHash( "/DEFAULTLIB" ); displayHash( "/DELAY" ); 
-    displayHash( "/DELAYLOAD" ); displayHash( "/DLL" ); displayHash( "/DRIVER" ); 
-    displayHash( "/ENTRY" ); displayHash( "/EXETYPE" ); displayHash( "/EXPORT" ); 
-    displayHash( "/FIXED" ); displayHash( "/FORCE" ); displayHash( "/HEAP" ); 
-    displayHash( "/IDLOUT" ); displayHash( "/IGNOREIDL" ); displayHash( "/IMPLIB" ); 
-    displayHash( "/INCLUDE" ); displayHash( "/INCREMENTAL" ); displayHash( "/LARGEADDRESSAWARE" ); 
-    displayHash( "/LIBPATH" ); displayHash( "/LTCG" ); displayHash( "/MACHINE" ); 
-    displayHash( "/MAP" ); displayHash( "/MAPINFO" ); displayHash( "/MERGE" ); 
-    displayHash( "/MIDL" ); displayHash( "/NOASSEMBLY" ); displayHash( "/NODEFAULTLIB" ); 
-    displayHash( "/NOENTRY" ); displayHash( "/NOLOGO" ); displayHash( "/OPT" ); 
-    displayHash( "/ORDER" ); displayHash( "/OUT" ); displayHash( "/PDB" ); 
-    displayHash( "/PDBSTRIPPED" ); displayHash( "/RELEASE" ); displayHash( "/SECTION" ); 
-    displayHash( "/STACK" ); displayHash( "/STUB" ); displayHash( "/SUBSYSTEM" ); 
-    displayHash( "/SWAPRUN" ); displayHash( "/TLBID" ); displayHash( "/TLBOUT" ); 
-    displayHash( "/TSAWARE" ); displayHash( "/VERBOSE" ); displayHash( "/VERSION" ); 
+    displayHash( "/ALIGN" ); displayHash( "/ALLOWBIND" ); displayHash( "/ASSEMBLYMODULE" );
+    displayHash( "/ASSEMBLYRESOURCE" ); displayHash( "/BASE" ); displayHash( "/DEBUG" );
+    displayHash( "/DEF" ); displayHash( "/DEFAULTLIB" ); displayHash( "/DELAY" );
+    displayHash( "/DELAYLOAD" ); displayHash( "/DLL" ); displayHash( "/DRIVER" );
+    displayHash( "/ENTRY" ); displayHash( "/EXETYPE" ); displayHash( "/EXPORT" );
+    displayHash( "/FIXED" ); displayHash( "/FORCE" ); displayHash( "/HEAP" );
+    displayHash( "/IDLOUT" ); displayHash( "/IGNOREIDL" ); displayHash( "/IMPLIB" );
+    displayHash( "/INCLUDE" ); displayHash( "/INCREMENTAL" ); displayHash( "/LARGEADDRESSAWARE" );
+    displayHash( "/LIBPATH" ); displayHash( "/LTCG" ); displayHash( "/MACHINE" );
+    displayHash( "/MAP" ); displayHash( "/MAPINFO" ); displayHash( "/MERGE" );
+    displayHash( "/MIDL" ); displayHash( "/NOASSEMBLY" ); displayHash( "/NODEFAULTLIB" );
+    displayHash( "/NOENTRY" ); displayHash( "/NOLOGO" ); displayHash( "/OPT" );
+    displayHash( "/ORDER" ); displayHash( "/OUT" ); displayHash( "/PDB" );
+    displayHash( "/PDBSTRIPPED" ); displayHash( "/RELEASE" ); displayHash( "/SECTION" );
+    displayHash( "/STACK" ); displayHash( "/STUB" ); displayHash( "/SUBSYSTEM" );
+    displayHash( "/SWAPRUN" ); displayHash( "/TLBID" ); displayHash( "/TLBOUT" );
+    displayHash( "/TSAWARE" ); displayHash( "/VERBOSE" ); displayHash( "/VERSION" );
     displayHash( "/VXD" ); displayHash( "/WS " );
 #endif
-#if 0
+#ifdef USE_DISPLAY_HASH
     // Sub options
     displayHash( "UNLOAD" ); displayHash( "NOBIND" ); displayHash( "no" ); displayHash( "NOSTATUS" ); displayHash( "STATUS" );
-    displayHash( "AM33" ); displayHash( "ARM" ); displayHash( "CEE" ); displayHash( "IA64" ); displayHash( "X86" ); displayHash( "M32R" ); 
-    displayHash( "MIPS" ); displayHash( "MIPS16" ); displayHash( "MIPSFPU" ); displayHash( "MIPSFPU16" ); displayHash( "MIPSR41XX" ); displayHash( "PPC" ); 
-    displayHash( "SH3" ); displayHash( "SH4" ); displayHash( "SH5" ); displayHash( "THUMB" ); displayHash( "TRICORE" ); displayHash( "EXPORTS" ); 
-    displayHash( "LINES" ); displayHash( "REF" ); displayHash( "NOREF" ); displayHash( "ICF" ); displayHash( "WIN98" ); displayHash( "NOWIN98" ); 
-    displayHash( "CONSOLE" ); displayHash( "EFI_APPLICATION" ); displayHash( "EFI_BOOT_SERVICE_DRIVER" ); displayHash( "EFI_ROM" ); displayHash( "EFI_RUNTIME_DRIVER" ); displayHash( "NATIVE" ); 
-    displayHash( "POSIX" ); displayHash( "WINDOWS" ); displayHash( "WINDOWSCE" ); displayHash( "NET" ); displayHash( "CD" ); displayHash( "NO" ); 
+    displayHash( "AM33" ); displayHash( "ARM" ); displayHash( "CEE" ); displayHash( "IA64" ); displayHash( "X86" ); displayHash( "M32R" );
+    displayHash( "MIPS" ); displayHash( "MIPS16" ); displayHash( "MIPSFPU" ); displayHash( "MIPSFPU16" ); displayHash( "MIPSR41XX" ); displayHash( "PPC" );
+    displayHash( "SH3" ); displayHash( "SH4" ); displayHash( "SH5" ); displayHash( "THUMB" ); displayHash( "TRICORE" ); displayHash( "EXPORTS" );
+    displayHash( "LINES" ); displayHash( "REF" ); displayHash( "NOREF" ); displayHash( "ICF" ); displayHash( "WIN98" ); displayHash( "NOWIN98" );
+    displayHash( "CONSOLE" ); displayHash( "EFI_APPLICATION" ); displayHash( "EFI_BOOT_SERVICE_DRIVER" ); displayHash( "EFI_ROM" ); displayHash( "EFI_RUNTIME_DRIVER" ); displayHash( "NATIVE" );
+    displayHash( "POSIX" ); displayHash( "WINDOWS" ); displayHash( "WINDOWSCE" ); displayHash( "NET" ); displayHash( "CD" ); displayHash( "NO" );
 #endif
-
+    bool found = TRUE;
     switch ( elfHash(option) ) {
     case 0x3360dbe: // /ALIGN[:number]
@@ -1142,5 +1153,5 @@ bool VCLinkerTool::parseOption( const char* option )
         break;
     // case 0x003390c: // /DLL
-    // This option is not used for vcproj files 
+    // This option is not used for vcproj files
             //break;
     case 0x33a3979: // /ENTRY:function
@@ -1193,5 +1204,5 @@ bool VCLinkerTool::parseOption( const char* option )
     case 0x157cf65: // /MACHINE:{AM33|ARM|CEE|IA64|X86|M32R|MIPS|MIPS16|MIPSFPU|MIPSFPU16|MIPSR41XX|PPC|SH3|SH4|SH5|THUMB|TRICORE}
         switch ( elfHash(option+9) ) {
-            // Very limited documentation on all options but X86, 
+            // Very limited documentation on all options but X86,
             // so we put the others in AdditionalOptions...
         case 0x0046063: // AM33
@@ -1217,5 +1228,5 @@ bool VCLinkerTool::parseOption( const char* option )
             break;
         default:
-            return FALSE;
+            found = FALSE;
         }
         break;
@@ -1276,5 +1287,5 @@ bool VCLinkerTool::parseOption( const char* option )
                 break;
             default:
-                return FALSE;
+                found = FALSE;
             }
         }
@@ -1325,5 +1336,5 @@ bool VCLinkerTool::parseOption( const char* option )
                 break;
             default:
-                return FALSE;
+                found = FALSE;
             }
         }
@@ -1335,5 +1346,5 @@ bool VCLinkerTool::parseOption( const char* option )
             SwapRunFromCD = _True;
         else
-            return FALSE;
+            found = FALSE;
         break;
     case 0x34906d4: // /TLBID:id
@@ -1361,7 +1372,9 @@ bool VCLinkerTool::parseOption( const char* option )
         break;
     default:
-        return FALSE;
+        found = FALSE;
     }
-    return TRUE;
+    if( !found )
+        warn_msg( WarnLogic, "Could not parse Linker options: %s", option );
+    return found;
 }
 
@@ -1393,5 +1406,5 @@ QTextStream &operator<<( QTextStream &strm, const VCMIDLTool &tool )
     strm << _VCMIDLToolName;
     strm << XPair( _AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories );
-    strm << XPair( _AdditionalOptions, tool.AdditionalOptions );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
     strm << XPair( _CPreprocessOptions, tool.CPreprocessOptions );
     strm << EPair( _DefaultCharType, tool.DefaultCharType );
@@ -1428,5 +1441,5 @@ QTextStream &operator<<( QTextStream &strm, const VCMIDLTool &tool )
 bool VCMIDLTool::parseOption( const char* option )
 {
-#if 0
+#ifdef USE_DISPLAY_HASH
     displayHash( "/D name[=def]" ); displayHash( "/I directory-list" ); displayHash( "/Oi" );
     displayHash( "/Oic" ); displayHash( "/Oicf" ); displayHash( "/Oif" ); displayHash( "/Os" );
@@ -1436,5 +1449,5 @@ bool VCMIDLTool::parseOption( const char* option )
     displayHash( "/char ascii7" ); displayHash( "/char signed" ); displayHash( "/char unsigned" );
     displayHash( "/client none" ); displayHash( "/client stub" ); displayHash( "/confirm" );
-    displayHash( "/cpp_cmd cmd_line" ); displayHash( "/cpp_opt options" ); 
+    displayHash( "/cpp_cmd cmd_line" ); displayHash( "/cpp_opt options" );
     displayHash( "/cstub filename" ); displayHash( "/dlldata filename" ); displayHash( "/env win32" );
     displayHash( "/env win64" ); displayHash( "/error all" ); displayHash( "/error allocation" );
@@ -1446,5 +1459,5 @@ bool VCMIDLTool::parseOption( const char* option )
     displayHash( "/no_def_idir" ); displayHash( "/no_default_epv" ); displayHash( "/no_format_opt" );
     displayHash( "/no_warn" ); displayHash( "/nocpp" ); displayHash( "/nologo" ); displayHash( "/notlb" );
-    displayHash( "/o filename" ); displayHash( "/oldnames" ); displayHash( "/oldtlb" ); 
+    displayHash( "/o filename" ); displayHash( "/oldnames" ); displayHash( "/oldtlb" );
     displayHash( "/osf" ); displayHash( "/out directory" ); displayHash( "/pack {N}" );
     displayHash( "/prefix all" ); displayHash( "/prefix client" ); displayHash( "/prefix server" );
@@ -1456,4 +1469,5 @@ bool VCMIDLTool::parseOption( const char* option )
     displayHash( "/win32" ); displayHash( "/win64" );
 #endif
+    bool found = TRUE;
     int offset = 0;
     switch( elfHash(option) ) {
@@ -1491,5 +1505,5 @@ bool VCMIDLTool::parseOption( const char* option )
             break;
         default:
-            return FALSE;
+            found = FALSE;
         }
         break;
@@ -1506,5 +1520,5 @@ bool VCMIDLTool::parseOption( const char* option )
             break;
         default:
-            return FALSE;
+            found = FALSE;
         }
         break;
@@ -1537,11 +1551,11 @@ bool VCMIDLTool::parseOption( const char* option )
             break;
         case 'r':
-            break;
             ErrorCheckRefPointers = _True;
-        case 's':
             break;
+        case 's':
             ErrorCheckStubData = _True;
+            break;
         default:
-            return FALSE;
+            found = FALSE;
         }
         break;
@@ -1648,9 +1662,11 @@ bool VCMIDLTool::parseOption( const char* option )
                 break;
             default:
-                return FALSE;
+                found = FALSE;
             }
         }
         break;
     }
+    if( !found )
+        warn_msg( WarnLogic, "Could not parse MIDL option: %s", option );
     return TRUE;
 }
@@ -1669,5 +1685,5 @@ QTextStream &operator<<( QTextStream &strm, const VCLibrarianTool &tool )
     strm << XPair( _AdditionalDependencies4, tool.AdditionalDependencies );
     strm << XPair( _AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories );
-    strm << XPair( _AdditionalOptions, tool.AdditionalOptions );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
     strm << XPair( _ExportNamedFunctions, tool.ExportNamedFunctions );
     strm << XPair( _ForceSymbolReferences, tool.ForceSymbolReferences );
@@ -1715,5 +1731,5 @@ QTextStream &operator<<( QTextStream &strm, const VCResourceCompilerTool &tool )
     strm << SPair( _ToolPath, tool.ToolPath );
     strm << XPair( _AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories );
-    strm << XPair( _AdditionalOptions, tool.AdditionalOptions );
+    strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " );
             if ( tool.Culture != rcUseDefault )                     strm << EPair( _Culture, tool.Culture );
     strm << XPair( _FullIncludePath, tool.FullIncludePath );
@@ -1852,11 +1868,32 @@ void VCFilter::generateUIC( QTextStream &strm, const QString& str ) const
     QString fname = str.section( '\\', -1 );
     QString mocDir = Project->var( "MOC_DIR" );
+    QString uiDir = Project->var( "UI_DIR" );
+    QString uiHeaders;
+    QString uiSources;
+
+    // Determining the paths for the output files.
+    int slash = str.findRev( '\\' );
+    QString pname = ( slash != -1 ) ? str.left( slash+1 ) : QString( ".\\" );
+    if( !uiDir.isEmpty() ) {
+        uiHeaders = uiDir;
+        uiSources = uiDir;
+    } else {
+        uiHeaders = Project->var( "UI_HEADERS_DIR" );
+        uiSources = Project->var( "UI_SOURCES_DIR" );
+        if( uiHeaders.isEmpty() )
+            uiHeaders = pname;
+        if( uiSources.isEmpty() )
+            uiSources = pname;
+    }
+    if( !uiHeaders.endsWith( "\\" ) )
+        uiHeaders += "\\";
+    if( !uiSources.endsWith( "\\" ) )
+        uiSources += "\\";
+
+    // Determine the file name.
     int dot = fname.findRev( '.' );
-    if( dot != -1 ) 
+    if( dot != -1 )
         fname.truncate( dot );
 
-    int slash = str.findRev( '\\' );  
-    QString pname = ( slash != -1 ) ? str.left( slash+1 ) : QString(".\\");
-
     strm << _begFileConfiguration;
     strm << _Name5;
@@ -1868,11 +1905,11 @@ void VCFilter::generateUIC( QTextStream &strm, const QString& str ) const
     strm << "Uic'ing " << str << "...\"";
     strm << _CommandLine6;
-            strm << uicApp << " " << str << " -o " << pname << fname << ".h &amp;&amp; ";                       // Create .h from .ui file
-            strm << uicApp << " " << str << " -i " << fname << ".h -o " << pname << fname << ".cpp &amp;&amp; ";// Create .cpp from .ui file
-    strm << mocApp << " " << pname << fname << ".h -o " << mocDir << "moc_" << fname << ".cpp\"";
+            strm << uicApp << " " << str << " -o " << uiHeaders << fname << ".h &amp;&amp; ";                   // Create .h from .ui file
+            strm << uicApp << " " << str << " -i " << fname << ".h -o " << uiSources << fname << ".cpp &amp;&amp; ";// Create .cpp from .ui file
+    strm << mocApp << " " << uiHeaders << fname << ".h -o " << mocDir << "moc_" << fname << ".cpp\"";
     strm << _AdditionalDependencies6;
     strm << mocApp << ";" << uicApp << "\"";
     strm << _Outputs6;
-    strm << pname << fname << ".h;" << pname << fname << ".cpp;" << mocDir << "moc_" << fname << ".cpp\"";
+    strm << uiHeaders << fname << ".h;" << uiSources << fname << ".cpp;" << mocDir << "moc_" << fname << ".cpp\"";
     strm << "/>";
     strm << _endFileConfiguration;
@@ -1907,7 +1944,7 @@ QTextStream &operator<<( QTextStream &strm, const VCFilter &tool )
 VCProject::VCProject()
 {
-    QUuid uniqueId;
 #if defined(Q_WS_WIN32)
     GUID guid;
+    QUuid uniqueId;
     HRESULT h = CoCreateGuid( &guid );
     if ( h == S_OK )
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
@@ -41,5 +41,5 @@
 
 /*
-    This Object model is of course VERY simplyfied, 
+    This Object model is of course VERY simplyfied,
     and does not actually follow the original MSVC
     object model. However, it fulfilles the basic
@@ -48,7 +48,7 @@
 
 /*
-    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...
 */
@@ -84,5 +84,5 @@ enum basicRuntimeCheckOption {
 enum browseInfoOption {
     brInfoNone,
-    brAllInfo, 
+    brAllInfo,
     brNoLocalSymbols
 };
@@ -119,5 +119,5 @@ enum debugOption {
     debugLineInfoOnly,
     debugEnabled,
-    debugEditAndContinue 
+    debugEditAndContinue
 };
 enum eAppProtectionOption {
@@ -125,5 +125,5 @@ enum eAppProtectionOption {
     eAppProtectLow,
     eAppProtectMedium,
-    eAppProtectHigh 
+    eAppProtectHigh
 };
 enum enumResourceLangID {
@@ -232,5 +232,5 @@ enum favorSizeOrSpeedOption {
     favorNone,
     favorSpeed,
-    favorSize 
+    favorSize
 };
 enum genProxyLanguage {
@@ -246,10 +246,10 @@ enum linkIncrementalType {
     linkIncrementalDefault,
     linkIncrementalNo,
-    linkIncrementalYes 
+    linkIncrementalYes
 };
 enum linkProgressOption {
     linkProgressNotSet,
     linkProgressAll,
-    linkProgressLibs 
+    linkProgressLibs
 };
 enum machineTypeOption {
@@ -265,5 +265,5 @@ enum midlErrorCheckOption {
     midlEnableCustom,
     midlDisableAll,
-    midlEnableAll 
+    midlEnableAll
 };
 enum midlStructMemberAlignOption {
@@ -285,5 +285,5 @@ enum midlWarningLevelOption {
     midlWarningLevel_2,
     midlWarningLevel_3,
-    midlWarningLevel_4 
+    midlWarningLevel_4
 };
 enum optFoldingType {
@@ -297,5 +297,5 @@ enum optimizeOption {
     optimizeMaxSpeed,
     optimizeFull,
-    optimizeCustom 
+    optimizeCustom
 };
 enum optRefType {
@@ -313,20 +313,20 @@ enum pchOption {
     pchCreateUsingSpecific,
     pchGenerateAuto,
-    pchUseUsingSpecific 
+    pchUseUsingSpecific
 };
 enum preprocessOption {
     preprocessNo,
     preprocessYes,
-    preprocessNoLineNumbers 
+    preprocessNoLineNumbers
 };
 enum ProcessorOptimizeOption {
     procOptimizeBlended,
     procOptimizePentium,
-    procOptimizePentiumProAndAbove 
+    procOptimizePentiumProAndAbove
 };
 enum RemoteDebuggerType {
     DbgLocal,
     DbgRemote,
-    DbgRemoteTCPIP 
+    DbgRemoteTCPIP
 };
 enum runtimeLibraryOption {
@@ -336,5 +336,5 @@ enum runtimeLibraryOption {
     rtMultiThreadedDebugDLL,
     rtSingleThreaded,
-    rtSingleThreadedDebug 
+    rtSingleThreadedDebug
 };
 enum structMemberAlignOption {
@@ -344,5 +344,5 @@ enum structMemberAlignOption {
     alignFourBytes,
     alignEightBytes,
-    alignSixteenBytes 
+    alignSixteenBytes
 };
 enum subSystemOption {
@@ -367,15 +367,15 @@ enum TypeOfDebugger {
     DbgManagedOnly,
     DbgMixed,
-    DbgAuto 
+    DbgAuto
 };
 enum useOfATL {
     useATLNotSet,
     useATLStatic,
-    useATLDynamic 
+    useATLDynamic
 };
 enum useOfMfc {
     useMfcStdWin,
     useMfcStatic,
-    useMfcDynamic 
+    useMfcDynamic
 };
 enum warningLevelOption {
@@ -391,12 +391,10 @@ protected:
     // Functions
     VCToolBase(){};
-    ~VCToolBase(){};
+    virtual ~VCToolBase(){}
     virtual bool parseOption( const char* option ) = 0;
 public:
-    bool parseOptions( QStringList& options ) {
-        bool result = TRUE;
-        for ( QStringList::ConstIterator it=options.begin(); (it!=options.end()) && result; it++ )
-            result = parseOption( (*it).latin1() );
-        return result;
+    void parseOptions( QStringList& options ) {
+        for ( QStringList::ConstIterator it=options.begin(); (it!=options.end()); it++ )
+            parseOption( (*it).latin1() );
     }
 };
@@ -410,7 +408,7 @@ public:
     // Functions
     VCCLCompilerTool();
-    ~VCCLCompilerTool(){};
-    virtual bool parseOption( const char* option );
-    
+    virtual ~VCCLCompilerTool(){}
+    bool parseOption( const char* option );
+
     // Variables
             QStringList             AdditionalIncludeDirectories;
@@ -481,6 +479,6 @@ public:
     // Functions
     VCLinkerTool();
-    ~VCLinkerTool(){};
-    virtual bool parseOption( const char* option );
+    virtual ~VCLinkerTool(){}
+    bool parseOption( const char* option );
 
     // Variables
@@ -546,6 +544,6 @@ public:
     // Functions
     VCMIDLTool();
-    ~VCMIDLTool(){};
-    virtual bool parseOption( const char* option );
+    virtual ~VCMIDLTool(){}
+    bool parseOption( const char* option );
 
     // Variables
@@ -588,6 +586,6 @@ public:
     // Functions
     VCLibrarianTool();
-    ~VCLibrarianTool(){};
-    virtual bool parseOption( const char* option ){ return FALSE; };
+    virtual ~VCLibrarianTool(){}
+    bool parseOption( const char* ){ return FALSE; };
 
     // Variables
@@ -609,6 +607,6 @@ public:
     // Functions
     VCCustomBuildTool();
-    ~VCCustomBuildTool(){};
-    virtual bool parseOption( const char* option ){ return FALSE; };
+    virtual ~VCCustomBuildTool(){}
+    bool parseOption( const char* ){ return FALSE; };
 
     // Variables
@@ -626,6 +624,6 @@ public:
     // Functions
     VCResourceCompilerTool();
-    ~VCResourceCompilerTool(){};
-    virtual bool parseOption( const char* option ){ return FALSE; };
+    virtual ~VCResourceCompilerTool(){}
+    bool parseOption( const char* ){ return FALSE; };
 
     // Variables
@@ -646,6 +644,6 @@ protected:
     // Functions
     VCEventTool() : ExcludedFromBuild( unset ){};
-    ~VCEventTool(){};
-    virtual bool parseOption( const char* option ){ return FALSE; };
+    virtual ~VCEventTool(){}
+    bool parseOption( const char* ){ return FALSE; };
 
 public:
@@ -658,23 +656,23 @@ public:
 };
 
-class VCPostBuildEventTool : public VCEventTool 
+class VCPostBuildEventTool : public VCEventTool
 {
 public:
     VCPostBuildEventTool();
-    ~VCPostBuildEventTool(){};
+    ~VCPostBuildEventTool(){}
 };
 
-class VCPreBuildEventTool : public VCEventTool 
+class VCPreBuildEventTool : public VCEventTool
 {
 public:
     VCPreBuildEventTool();
-    ~VCPreBuildEventTool(){};
+    ~VCPreBuildEventTool(){}
 };
 
-class VCPreLinkEventTool : public VCEventTool 
+class VCPreLinkEventTool : public VCEventTool
 {
 public:
     VCPreLinkEventTool();
-    ~VCPreLinkEventTool(){};
+    ~VCPreLinkEventTool(){}
 };
 
@@ -684,5 +682,5 @@ public:
     // Functions
     VCConfiguration();
-    ~VCConfiguration(){};
+    ~VCConfiguration(){}
 
     // Variables
@@ -721,5 +719,5 @@ public:
     // Functions
     VCFilter();
-    ~VCFilter(){};
+    ~VCFilter(){}
     void generateMOC( QTextStream &strm, QString str ) const;
     void generateUIC( QTextStream &strm, const QString& str ) const;
@@ -740,5 +738,5 @@ public:
     // Functions
     VCProject();
-    ~VCProject(){};
+    ~VCProject(){}
 
     // Variables
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
@@ -6,5 +6,5 @@
 ** Created : 970521
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the network module of the Qt GUI Toolkit.
@@ -39,11 +39,53 @@
 #include "option.h"
 #include <qdir.h>
-#include <stdlib.h>
 #include <qregexp.h>
+#include <qdict.h>
+#include <quuid.h>
+#include <stdlib.h>
 
 #if defined(Q_OS_WIN32)
 #include <objbase.h>
+#ifndef GUID_DEFINED
+#define GUID_DEFINED
+typedef struct _GUID
+{
+    ulong   Data1;
+    ushort  Data2;
+    ushort  Data3;
+    uchar   Data4[8];
+} GUID;
+#endif
 #endif
 
+// Flatfile Tags ----------------------------------------------------
+        const char* _snlHeader  = "Microsoft Visual Studio Solution File, Format Version 7.00";
+                                  // The following UUID _may_ change for later servicepacks...
+                                  // If so we need to search through the registry at
+                                  // HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\7.0\Projects
+                                  // to find the subkey that contains a "PossibleProjectExtension"
+                                  // containing "vcproj"...
+                                  // Use the hardcoded value for now so projects generated on other
+                                  // platforms are actually usable.
+const char* _snlMSVCvcprojGUID  = "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}";
+        const char* _snlProjectBeg= "\nProject(\"";
+        const char* _snlProjectMid= "\") = ";
+        const char* _snlProjectEnd= "\nEndProject";
+        const char* _snlGlobalBeg= "\nGlobal";
+        const char* _snlGlobalEnd= "\nEndGlobal";
+        const char* _snlSolutionConf= "\n\tGlobalSection(SolutionConfiguration) = preSolution"
+                                  "\n\t\tConfigName.0 = Release"
+                                  "\n\tEndGlobalSection";
+        const char* _snlProjDepBeg= "\n\tGlobalSection(ProjectDependencies) = postSolution";
+        const char* _snlProjDepEnd= "\n\tEndGlobalSection";
+        const char* _snlProjConfBeg= "\n\tGlobalSection(ProjectConfiguration) = postSolution";
+        const char* _snlProjConfTag1= ".Release.ActiveCfg = Release|Win32";
+        const char* _snlProjConfTag2= ".Release.Build.0 = Release|Win32";
+        const char* _snlProjConfEnd= "\n\tEndGlobalSection";
+        const char* _snlExtSections= "\n\tGlobalSection(ExtensibilityGlobals) = postSolution"
+                                  "\n\tEndGlobalSection"
+                                  "\n\tGlobalSection(ExtensibilityAddIns) = postSolution"
+                                  "\n\tEndGlobalSection";
+// ------------------------------------------------------------------
+
 VcprojGenerator::VcprojGenerator(QMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE)
 {
@@ -53,6 +95,5 @@ VcprojGenerator::VcprojGenerator(QMakeProject *p) : Win32MakefileGenerator(p), i
     Generates a project file for the given profile.
     Options are either a Visual Studio projectfiles, or
-    recursive projectfiles.. Maybe we can make .sln files
-    someday?
+    solutionfiles by parsing recursive projectdirectories.
 */
 bool VcprojGenerator::writeMakefile(QTextStream &t)
@@ -65,5 +106,5 @@ bool VcprojGenerator::writeMakefile(QTextStream &t)
     }
 
-    // Generate full project file
+    // Generate project file
     if(project->first("TEMPLATE") == "vcapp" ||
        project->first("TEMPLATE") == "vclib") {
@@ -71,5 +112,7 @@ bool VcprojGenerator::writeMakefile(QTextStream &t)
         t << vcProject;
         return TRUE;
-    } else if(project->first("TEMPLATE") == "vcsubdirs") {    // Generate recursive project
+    }
+    // Generate solution file
+    else if(project->first("TEMPLATE") == "vcsubdirs") {
         debug_msg(1, "Generator: MSVC.NET: Writing solution file" );
         writeSubDirs(t);
@@ -81,8 +124,36 @@ bool VcprojGenerator::writeMakefile(QTextStream &t)
 
 struct VcsolutionDepend {
+    QString uuid;
     QString vcprojFile, orig_target, target;
+    ::target targetType;
     QStringList dependencies;
 };
 
+QUuid VcprojGenerator::increaseUUID( const QUuid &id )
+{
+    QUuid result( id );
+    Q_LONG dataFirst = (result.data4[0] << 24) +
+                       (result.data4[1] << 16) +
+                       (result.data4[2] << 8) +
+                        result.data4[3];
+    Q_LONG dataLast =  (result.data4[4] << 24) +
+                       (result.data4[5] << 16) +
+                       (result.data4[6] <<  8) +
+                        result.data4[7];
+
+    if ( !(dataLast++) )
+        dataFirst++;
+
+    result.data4[0] = uchar((dataFirst >> 24) & 0xff);
+    result.data4[1] = uchar((dataFirst >> 16) & 0xff);
+    result.data4[2] = uchar((dataFirst >>  8) & 0xff);
+    result.data4[3] = uchar( dataFirst        & 0xff);
+    result.data4[4] = uchar((dataLast  >> 24) & 0xff);
+    result.data4[5] = uchar((dataLast  >> 16) & 0xff);
+    result.data4[6] = uchar((dataLast  >>  8) & 0xff);
+    result.data4[7] = uchar( dataLast         & 0xff);
+    return result;
+}
+
 void VcprojGenerator::writeSubDirs(QTextStream &t)
 {
@@ -93,6 +164,20 @@ 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"];
     QString oldpwd = QDir::currentDirPath();
@@ -117,70 +202,101 @@ void VcprojGenerator::writeSubDirs(QTextStream &t)
                         QStringList tmp_subdirs = fileFixify(tmp_proj.variables()["SUBDIRS"]);
                         subdirs += tmp_subdirs;
-                    } else if(tmp_proj.first("TEMPLATE") == "vcapp" ||
-                              tmp_proj.first("TEMPLATE") == "vclib") {
-                        QString vcproj = fi.baseName() + project->first("VCPROJ_EXTENSION");
-                        if(QFile::exists(vcproj) || 1) {
-                            VcprojGenerator tmp_dsp(&tmp_proj);
-                            tmp_dsp.setNoIO(TRUE);
-                            tmp_dsp.init();
-                            if(Option::debug_level) {
-                                QMap<QString, QStringList> &vars = tmp_proj.variables();
-                                for(QMap<QString, QStringList>::Iterator it = vars.begin(); 
-                                    it != vars.end(); ++it) {
-                                    if(it.key().left(1) != "." && !it.data().isEmpty())
-                                        debug_msg(1, "%s: %s === %s", fn.latin1(), it.key().latin1(), 
-                                                  it.data().join(" :: ").latin1());
-                                }
+                    } else if(tmp_proj.first("TEMPLATE") == "vcapp" || tmp_proj.first("TEMPLATE") == "vclib") {
+                        // Initialize a 'fake' project to get the correct variables
+                        // and to be able to extract all the dependencies
+                        VcprojGenerator tmp_vcproj(&tmp_proj);
+                        tmp_vcproj.setNoIO(TRUE);
+                        tmp_vcproj.init();
+                        if(Option::debug_level) {
+                            QMap<QString, QStringList> &vars = tmp_proj.variables();
+                            for(QMap<QString, QStringList>::Iterator it = vars.begin();
+                                it != vars.end(); ++it) {
+                                if(it.key().left(1) != "." && !it.data().isEmpty())
+                                    debug_msg(1, "%s: %s === %s", fn.latin1(), it.key().latin1(),
+                                                it.data().join(" :: ").latin1());
                             }
-                            VcsolutionDepend *newDep = new VcsolutionDepend;
-                            newDep->vcprojFile = fileFixify(vcproj);
-                            newDep->orig_target = tmp_proj.first("QMAKE_ORIG_TARGET");
-                            newDep->target = tmp_proj.first("TARGET").section(Option::dir_sep, -1);
-                            if(newDep->target.endsWith(".dll"))
-                                newDep->target = newDep->target.left(newDep->target.length()-3) + "lib";
-                            if(!tmp_proj.isEmpty("FORMS")) 
-                                newDep->dependencies << "uic.exe";
-                            {
-                                QStringList where("QMAKE_LIBS");
-                                if(!tmp_proj.isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
-                                    where = tmp_proj.variables()["QMAKE_INTERNAL_PRL_LIBS"];
-                                for(QStringList::iterator wit = where.begin(); 
-                                    wit != where.end(); ++wit) {
-                                    QStringList &l = tmp_proj.variables()[(*wit)];
-                                    for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
-                                        QString opt = (*it);
-                                        if(!opt.startsWith("/")) //Not a switch
-                                            newDep->dependencies << opt.section(Option::dir_sep, -1);
-                                    }
+                        }
+
+                        // We assume project filename is [QMAKE_ORIG_TARGET].vcproj
+                        QString vcproj = fixFilename(tmp_vcproj.project->first("QMAKE_ORIG_TARGET")) + project->first("VCPROJ_EXTENSION");
+
+                        // If file doesn't exsist, then maybe the users configuration
+                        // doesn't allow it to be created. Skip to next...
+                        if(!QFile::exists(QDir::currentDirPath() + Option::dir_sep + vcproj)) {
+                            qDebug( "Ignored (not found) '%s'",  QString(QDir::currentDirPath() + Option::dir_sep + vcproj).latin1() );
+                            goto nextfile; // # Dirty!
+                        }
+
+                        VcsolutionDepend *newDep = new VcsolutionDepend;
+                        newDep->vcprojFile = fileFixify(vcproj);
+                        newDep->orig_target = tmp_proj.first("QMAKE_ORIG_TARGET");
+                        newDep->target = tmp_proj.first("TARGET").section(Option::dir_sep, -1);
+                        newDep->targetType = tmp_vcproj.projectTarget;
+                        {
+                            static QUuid uuid = solutionGUID;
+                            uuid = increaseUUID( uuid );
+                            newDep->uuid = uuid.toString().upper();
+                        }
+                        if(newDep->target.endsWith(".dll"))
+                            newDep->target = newDep->target.left(newDep->target.length()-3) + "lib";
+                        if(!tmp_proj.isEmpty("FORMS"))
+                            newDep->dependencies << "uic.exe";
+                        {
+                            QStringList where("QMAKE_LIBS");
+                            if(!tmp_proj.isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
+                                where = tmp_proj.variables()["QMAKE_INTERNAL_PRL_LIBS"];
+                            for(QStringList::iterator wit = where.begin();
+                                wit != where.end(); ++wit) {
+                                QStringList &l = tmp_proj.variables()[(*wit)];
+                                for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+                                    QString opt = (*it);
+                                    if(!opt.startsWith("/")) //Not a switch
+                                        newDep->dependencies << opt.section(Option::dir_sep, -1);
                                 }
                             }
-                            solution_depends.append(newDep);
                         }
+                        solution_cleanup.append(newDep);
+                        solution_depends.insert(newDep->target, newDep);
+                        {
+                            QRegExp libVersion("[0-9]{3,3}\\.lib$");
+                            if(libVersion.search(newDep->target) != -1)
+                                solution_depends.insert(newDep->target.left(newDep->target.length() -
+                                                        libVersion.matchedLength()) + ".lib", newDep);
+                        }
+                        t << _snlProjectBeg << _snlMSVCvcprojGUID << _snlProjectMid
+                            << "\"" << newDep->orig_target << "\", \"" << newDep->vcprojFile
+                            << "\", \"" << newDep->uuid << "\"";
+                        t << _snlProjectEnd;
                     }
                 }
+nextfile:
                 QDir::setCurrent(oldpwd);
             }
         }
     }
-
-    VcsolutionDepend *vc;
-    QMap<QString, int> uuids;
-    QRegExp libVersion("[0-9]{3,3}\\.lib$");
-    for(vc = solution_depends.first(); vc; vc = solution_depends.next()) {
-        static int uuid = 666;
-        uuids.insert(vc->target, uuid);
-        if(libVersion.match(vc->target) != -1) 
-            uuids.insert(vc->target.left(vc->target.length() - libVersion.matchedLength()) + ".lib", 
-                         uuid);
-        t << "\"" << vc->orig_target << "\" \"" << vc->vcprojFile << "\" { " << uuid << " }" << endl;
-        uuid++;
-    }
-    for(vc = solution_depends.first(); vc; vc = solution_depends.next()) {
-        int uuid = uuids[vc->target], cnt = 0;
-        for(QStringList::iterator dit = vc->dependencies.begin(); dit != vc->dependencies.end(); ++dit) {
-            if(uuids.contains((*dit)))
-                t << uuid << "." << cnt++ << " = " << uuids[(*dit)] << endl;
+    t << _snlGlobalBeg;
+    t << _snlSolutionConf;
+    t << _snlProjDepBeg;
+    for(solution_cleanup.first(); solution_cleanup.current(); solution_cleanup.next()) {
+        int cnt = 0;
+        for(QStringList::iterator dit = solution_cleanup.current()->dependencies.begin();
+            dit != solution_cleanup.current()->dependencies.end();
+            ++dit) {
+            VcsolutionDepend *vc;
+            if((vc=solution_depends[*dit])) {
+                    if(solution_cleanup.current()->targetType != StaticLib || vc->targetType == Application)
+                    t << "\n\t\t" << solution_cleanup.current()->uuid << "." << cnt++ << " = " << vc->uuid;
+            }
         }
     }
+    t << _snlProjDepEnd;
+    t << _snlProjConfBeg;
+    for(solution_cleanup.first(); solution_cleanup.current(); solution_cleanup.next()) {
+        t << "\n\t\t" << solution_cleanup.current()->uuid << _snlProjConfTag1;
+        t << "\n\t\t" << solution_cleanup.current()->uuid << _snlProjConfTag2;
+    }
+    t << _snlProjConfEnd;
+    t << _snlExtSections;
+    t << _snlGlobalEnd;
 }
 
@@ -307,10 +423,10 @@ void VcprojGenerator::initConfiguration()
         break;
     }
-    vcProject.Configuration.Name =  ( project->isActiveConfig( "release" ) ? "Release|" : "Debug|" );
+    vcProject.Configuration.Name =  ( project->isActiveConfig( "debug" ) ? "Debug|" : "Release|" );
     vcProject.Configuration.Name += ( vcProject.Configuration.idl.TargetEnvironment == midlTargetWin64 ? "Win64" : "Win32" );
     vcProject.Configuration.ATLMinimizesCRunTimeLibraryUsage = ( project->first("ATLMinimizesCRunTimeLibraryUsage").isEmpty() ? _False : _True );
-    vcProject.Configuration.BuildBrowserInformation = triState( temp.isEmpty() ? unset : temp.toShort() );
+    vcProject.Configuration.BuildBrowserInformation = triState( temp.isEmpty() ? (short)unset : temp.toShort() );
     temp = project->first("CharacterSet");
-    vcProject.Configuration.CharacterSet = charSet( temp.isEmpty() ? charSetNotSet : temp.toShort() );
+    vcProject.Configuration.CharacterSet = charSet( temp.isEmpty() ? (short)charSetNotSet : temp.toShort() );
     vcProject.Configuration.DeleteExtensionsOnClean = project->first("DeleteExtensionsOnClean");
     vcProject.Configuration.ImportLibrary = vcProject.Configuration.linker.ImportLibrary;
@@ -339,5 +455,5 @@ void VcprojGenerator::initCompilerTool()
     QString placement = project->first("OBJECTS_DIR");
     if ( placement.isEmpty() )
-        placement = project->isActiveConfig( "release" )? ".\\Release\\":".\\Debug\\";
+        placement = ".\\";
 
     vcProject.Configuration.compiler.AssemblerListingLocation = placement ;
@@ -363,4 +479,5 @@ void VcprojGenerator::initCompilerTool()
         vcProject.Configuration.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_RELEASE"] );
         vcProject.Configuration.compiler.PreprocessorDefinitions += "QT_NO_DEBUG";
+        vcProject.Configuration.compiler.PreprocessorDefinitions += "NDEBUG";
         if ( project->isActiveConfig("thread") ) {
             if ( (projectTarget == Application) || (projectTarget == StaticLib) )
@@ -376,5 +493,5 @@ void VcprojGenerator::initCompilerTool()
     if ( project->isActiveConfig("warn_off") )
         vcProject.Configuration.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_WARN_OFF"] );
-    else
+    else if ( project->isActiveConfig("warn_on") )
         vcProject.Configuration.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_WARN_ON"] );
     if ( project->isActiveConfig("windows") )
@@ -409,11 +526,13 @@ 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;
     }
 
@@ -460,5 +579,15 @@ void VcprojGenerator::initPreBuildEventTools()
         vcProject.Configuration.preBuild.Description = "Generate imagecollection";
         //vcProject.Configuration.preBuild.AdditionalDependencies += list;
-        vcProject.Configuration.preBuild.CommandLine = project->first("QMAKE_UIC") + " -embed " + project->first("QMAKE_ORIG_TARGET") + " " + list.join(" ") + " -o " + collectionName;
+
+        QFile imgs( ".imgcol" );
+        imgs.open( IO_WriteOnly );
+        QTextStream s( &imgs );
+        QStringList::ConstIterator it = list.begin();
+        while( it!=list.end() ) {
+            s << *it << " ";
+            it++;
+        }
+
+        vcProject.Configuration.preBuild.CommandLine = project->first("QMAKE_UIC") + " -embed " + project->first("QMAKE_ORIG_TARGET") + " -f .imgcol -o " + collectionName;
         //vcProject.Configuration.preBuild.Outputs = collectionName;
 
@@ -468,4 +597,8 @@ void VcprojGenerator::initPreBuildEventTools()
 void VcprojGenerator::initPostBuildEventTools()
 {
+    if ( !project->variables()["QMAKE_POST_LINK"].isEmpty() ) {
+        vcProject.Configuration.postBuild.Description = var("QMAKE_POST_LINK");
+        vcProject.Configuration.postBuild.CommandLine = var("QMAKE_POST_LINK");
+    }
     if( project->isActiveConfig( "activeqt" ) ) {
         QString name = project->first( "QMAKE_ORIG_TARGET" );
@@ -475,7 +608,9 @@ 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
                 idc + " " + vcProject.Configuration.OutputDirectory + "\\" + nameext + " -idl " + objdir + name + ".idl -version 1.0 &amp;&amp; " +
@@ -603,19 +738,4 @@ 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
     Sets up all needed variables from the environment and all the different caches and .conf files
@@ -630,4 +750,26 @@ void VcprojGenerator::initOld()
     QStringList::Iterator it;
 
+    if ( project->isActiveConfig("stl") ) {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_ON"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_ON"];
+    } else {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_OFF"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_OFF"];
+    }
+    if ( project->isActiveConfig("exceptions") ) {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_ON"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_ON"];
+    } else {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_OFF"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_OFF"];
+    }
+    if ( project->isActiveConfig("rtti") ) {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_ON"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_ON"];
+    } else {
+        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_OFF"];
+        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_OFF"];
+    }
+
     // this should probably not be here, but I'm using it to wrap the .t files
     if(project->first("TEMPLATE") == "vcapp" )
@@ -789,5 +931,5 @@ void VcprojGenerator::initOld()
     // INCREMENTAL:NO ------------------------------------------------
     if(!project->isActiveConfig("incremental")) {
-        project->variables()["QMAKE_LFLAGS"].append(QString("/incremental:no"));
+        project->variables()["QMAKE_LFLAGS"].append(QString("/INCREMENTAL:no"));
         if ( is_qt )
             project->variables()["MSVCPROJ_DEBUG_OPT"] = "/GZ /Zi";
@@ -800,4 +942,17 @@ void VcprojGenerator::initOld()
 
     project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
+    // Update -lname to name.lib, and -Ldir to
+    QStringList &libList = project->variables()["QMAKE_LIBS"];
+    for( it = libList.begin(); it != libList.end(); ) {
+        QString s = *it;
+        if( s.startsWith( "-l" ) ) {
+            it = libList.remove( it );
+            it = libList.insert( it, s.mid( 2 ) + ".lib" );
+        } else if( s.startsWith( "-L" ) ) {
+            it = libList.remove( it );
+        } else {
+            it++;
+        }
+    }
 
     // Run through all variables containing filepaths, and -----------
@@ -822,6 +977,6 @@ void VcprojGenerator::initOld()
     project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
 
-    // TARGET (add extention to $$TARGET) ----------------------------
-    project->variables()["TARGET"].first() += project->first("TARGET_EXT");
+    // TARGET (add extention to $$TARGET)
+    //project->variables()["MSVCPROJ_DEFINES"].append(varGlue(".first() += project->first("TARGET_EXT");
 
     // Init base class too -------------------------------------------
@@ -868,6 +1023,13 @@ void VcprojGenerator::initOld()
     project->variables()["MSVCPROJ_LIBS"] += project->variables()["QMAKE_LIBS_WINDOWS"];
     project->variables()["MSVCPROJ_LFLAGS" ] += project->variables()["QMAKE_LFLAGS"];
-    if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() )
-        project->variables()["MSVCPROJ_LFLAGS" ].append(varGlue("QMAKE_LIBDIR","/LIBPATH:"," /LIBPATH:",""));
+    if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() ) {
+        QStringList strl = project->variables()["QMAKE_LIBDIR"];
+        QStringList::iterator stri;
+        for ( stri = strl.begin(); stri != strl.end(); ++stri ) {
+            if ( !(*stri).startsWith("/LIBPATH:") )
+                (*stri).prepend( "/LIBPATH:" );
+        }
+        project->variables()["MSVCPROJ_LFLAGS"] += strl;
+    }
     project->variables()["MSVCPROJ_CXXFLAGS" ] += project->variables()["QMAKE_CXXFLAGS"];
     // We don't use this... Direct manipulation of compiler object
@@ -884,17 +1046,16 @@ void VcprojGenerator::initOld()
     QString dest;
     project->variables()["MSVCPROJ_TARGET"] = project->first("TARGET");
-    if ( !project->variables()["DESTDIR"].isEmpty() ) {
-        project->variables()["TARGET"].first().prepend(project->first("DESTDIR"));
-        Option::fixPathToTargetOS(project->first("TARGET"));
-        dest = project->first("TARGET");
-        if ( project->first("TARGET").startsWith("$(QTDIR)") )
-            dest.replace( QRegExp("\\$\\(QTDIR\\)"), getenv("QTDIR") );
-        project->variables()["MSVCPROJ_TARGET"].append(
-            QString("/OUT:") + dest );
-        if ( project->isActiveConfig("dll") ) {
-            QString imp = dest;
-            imp.replace(QRegExp("\\.dll"), ".lib");
-            project->variables()["MSVCPROJ_LIBOPTIONS"] += (QString("/IMPLIB:") + imp );
-        }
+    Option::fixPathToTargetOS(project->first("TARGET"));
+    dest = project->first("TARGET") + project->first( "TARGET_EXT" );
+    if ( project->first("TARGET").startsWith("$(QTDIR)") )
+        dest.replace( QRegExp("\\$\\(QTDIR\\)"), getenv("QTDIR") );
+    project->variables()["MSVCPROJ_TARGET"] = dest;
+    if ( project->isActiveConfig("dll") ) {
+        QString imp = project->first( "DESTDIR" );
+        if( !imp.isNull() && !imp.endsWith( "\\" ) )
+            imp += "\\";
+        imp += dest;
+        imp.replace(QRegExp("\\.dll"), ".lib");
+        project->variables()["MSVCPROJ_LIBOPTIONS"] += QString("/IMPLIB:") + imp;
     }
 
@@ -997,21 +1158,24 @@ 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())) );
     }
     return Win32MakefileGenerator::openOutput(file);
 }
 
+QString VcprojGenerator::fixFilename(QString ofile) const
+{
+    int slashfind = ofile.findRev('\\');
+    if (slashfind == -1) {
+        ofile = ofile.replace('-', '_');
+    } else {
+        int hypenfind = ofile.find('-', slashfind);
+        while (hypenfind != -1 && slashfind < hypenfind) {
+            ofile = ofile.replace(hypenfind, 1, '_');
+            hypenfind = ofile.find('-', hypenfind + 1);
+        }
+    }
+    return ofile;
+}
+
 QString VcprojGenerator::findTemplate(QString file)
 {
@@ -1043,7 +1207,7 @@ void VcprojGenerator::outputVariables()
 {
 #if 0
-    debug_msg(3, "Generator: MSVC.NET: List of current variables:" );
+    qDebug( "Generator: MSVC.NET: List of current variables:" );
     for ( QMap<QString, QStringList>::ConstIterator it = project->variables().begin(); it != project->variables().end(); ++it) {
-        debug_msg(3, "Generator: MSVC.NET: %s => %s", it.key().latin1(), it.data().join(" | ").latin1() );
+        qDebug( "Generator: MSVC.NET: %s => %s", it.key().latin1(), it.data().join(" | ").latin1() );
     }
 #endif
diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h
index 583b164..69e0c02 100644
--- a/qmake/generators/win32/msvc_vcproj.h
+++ b/qmake/generators/win32/msvc_vcproj.h
@@ -6,5 +6,5 @@
 ** Created : 970521
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the network module of the Qt GUI Toolkit.
@@ -35,6 +35,6 @@
 **
 **********************************************************************/
-#ifndef __VCPROJMAKE_H__
-#define __VCPROJMAKE_H__
+#ifndef __MSVC_VCPROJ_H__
+#define __MSVC_VCPROJ_H__
 
 #include "winmakefile.h"
@@ -47,4 +47,5 @@ enum target {
 };
 
+struct QUuid;
 class VcprojGenerator : public Win32MakefileGenerator
 {
@@ -69,4 +70,5 @@ protected:
     virtual bool findLibraries();
     virtual void outputVariables();
+    QString fixFilename(QString ofile) const;
     
     void initOld();
@@ -90,25 +92,9 @@ protected:
     void initResourceFiles();
 
-    /*
-    void writeGuid( QTextStream &t );
-    void writeAdditionalOptions( QTextStream &t );
-    void writeHeaders( QTextStream &t );
-    void writeSources( QTextStream &t );
-    void writeMocs( QTextStream &t );
-    void writeLexs( QTextStream &t );
-    void writeYaccs( QTextStream &t );
-    void writePictures( QTextStream &t );
-    void writeImages( QTextStream &t );
-    void writeIDLs( QTextStream &t );
-
-    void writeForms( QTextStream &t );
-    void writeFormsSourceHeaders( QString &variable, QTextStream &t );
-    void writeTranslations( QTextStream &t );
-    void writeStrippedTranslations( QTextStream &t );
-    */
-
     VCProject vcProject;
     target projectTarget;
 
+private:
+    QUuid increaseUUID(const QUuid &id);
     friend class VCFilter;
 };
@@ -127,3 +113,3 @@ 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
@@ -102,5 +102,5 @@ Win32MakefileGenerator::writeSubDirs(QTextStream &t)
             t << "QMAKE =" << (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : var("QMAKE_QMAKE")) << endl;
             t << "SUBTARGETS= ";
-    for( it.toFirst(); it.current(); ++it) 
+    for( it.toFirst(); it.current(); ++it)
         t << " \\\n\t\t" << it.current()->target;
     t << endl << endl;
@@ -117,9 +117,8 @@ Win32MakefileGenerator::writeSubDirs(QTextStream &t)
         if(project->variables()["QMAKE_NOFORCE"].isEmpty())
             t << " FORCE";
-        if(have_dir) 
+        if(have_dir)
             t << "\n\t" << "cd " << (*it)->directory;
         t << "\n\t" << "$(QMAKE) " << (*it)->profile << " " << buildArgs();
-        if((*it)->makefile != "$(MAKEFILE)")
-            t << " -o " << (*it)->makefile;
+        t << " -o " << (*it)->makefile;
         if(have_dir) {
             int subLevels = it.current()->directory.contains(Option::dir_sep) + 1;
@@ -134,9 +133,8 @@ Win32MakefileGenerator::writeSubDirs(QTextStream &t)
         if(project->variables()["QMAKE_NOFORCE"].isEmpty())
             t << " FORCE";
-        if(have_dir) 
+        if(have_dir)
             t << "\n\t" << "cd " << (*it)->directory;
         t << "\n\t" << "$(MAKE)";
-        if((*it)->makefile != "$(MAKEFILE)")
-            t << " -f " << (*it)->makefile;
+        t << " -f " << (*it)->makefile;
         if(have_dir) {
             int subLevels = it.current()->directory.contains(Option::dir_sep) + 1;
@@ -156,4 +154,5 @@ Win32MakefileGenerator::writeSubDirs(QTextStream &t)
         for( it.toFirst(); it.current(); ++it) {
             QString subdir = (*it)->directory;
+            QString profile = (*it)->profile;
             int subLevels = subdir.contains(Option::dir_sep) + 1;
             t << "\n\t"
@@ -162,6 +161,7 @@ Win32MakefileGenerator::writeSubDirs(QTextStream &t)
             if(lastSlash != -1)
                 subdir = subdir.mid( lastSlash + 1 );
-            t << "$(QMAKE) " << subdir << ".pro"
-              << (!project->isEmpty("MAKEFILE") ? QString(" -o ") + var("MAKEFILE") : QString(""))
+            t << "$(QMAKE) "
+              << ( !profile.isEmpty() ? profile : subdir + ".pro" )
+              << " -o " << (*it)->makefile
               << " " << buildArgs() << "\n\t"
               << "@cd ..";
@@ -187,11 +187,9 @@ Win32MakefileGenerator::writeSubDirs(QTextStream &t)
                 if(have_dir)
                     t << "\n\t" << "cd " << (*it)->directory;
-                QString in_file;
-                if((*it)->makefile != "$(MAKEFILE)")
-                    in_file = " -f " + (*it)->makefile;
+                QString in_file = " -f " + (*it)->makefile;
                 t << "\n\t" << "$(MAKE) " << in_file << " " << targs[x];
                 if(have_dir) {
                     t << "\n\t" << "@cd ..";
-                    for(int i = 1; i < subLevels; i++ ) 
+                    for(int i = 1; i < subLevels; i++ )
                         t << Option::dir_sep << "..";
                 }
@@ -211,24 +209,28 @@ Win32MakefileGenerator::writeSubDirs(QTextStream &t)
 
 int
-Win32MakefileGenerator::findHighestVersion(const QString &d, const
-                                           QString &stem)
+Win32MakefileGenerator::findHighestVersion(const QString &d, const QString &stem)
 {
-    if(!QFile::exists(Option::fixPathToLocalOS(d)))
+    QString bd = Option::fixPathToLocalOS(d, TRUE);
+    if(!QFile::exists(bd))
         return -1;
-    if(!project->variables()["QMAKE_" + stem.upper() +
-        "_VERSION_OVERRIDE"].isEmpty())
-        return project->variables()["QMAKE_" + stem.upper() +
-        "_VERSION_OVERRIDE"].first().toInt();
-    QString bd = d;
-    fixEnvVariables(bd);
+    if(!project->variables()["QMAKE_" + stem.upper() + "_VERSION_OVERRIDE"].isEmpty())
+        return project->variables()["QMAKE_" + stem.upper() + "_VERSION_OVERRIDE"].first().toInt();
+
     QDir dir(bd);
     int biggest=-1;
     QStringList entries = dir.entryList();
-    QRegExp regx( "(" + stem + "([0-9]*)).lib", FALSE );
-    for(QStringList::Iterator it = entries.begin(); it != entries.end();
-    ++it) {
+    QString dllStem = stem + QTDLL_POSTFIX;
+    QRegExp regx( "(" + dllStem + "([0-9]*)).lib", FALSE );
+    for(QStringList::Iterator it = entries.begin(); it != entries.end(); ++it) {
         if(regx.exactMatch((*it)))
-            biggest = QMAX(biggest, (regx.cap(1) == stem ||
-            regx.cap(2).isEmpty()) ? -1 : regx.cap(2).toInt());
+            biggest = QMAX(biggest, (regx.cap(1) == dllStem ||
+                                     regx.cap(2).isEmpty()) ? -1 : regx.cap(2).toInt());
+    }
+    if(dir.exists(dllStem + Option::prl_ext)) {
+        QMakeProject proj;
+        if(proj.read(bd + dllStem + Option::prl_ext, QDir::currentDirPath(), TRUE)) {
+            if(!proj.isEmpty("QMAKE_PRL_VERSION"))
+                biggest = QMAX(biggest, proj.first("QMAKE_PRL_VERSION").replace(".", "").toInt());
+        }
     }
     return biggest;
@@ -242,49 +244,84 @@ Win32MakefileGenerator::findLibraries(const QString &where)
     QStringList &l = project->variables()[where];
     QPtrList<MakefileDependDir> dirs;
+    {
+        QStringList &libpaths = project->variables()["QMAKE_LIBDIR"];
+        for(QStringList::Iterator libpathit = libpaths.begin(); libpathit != libpaths.end(); ++libpathit) {
+            QString r = (*libpathit), l = r;
+            fixEnvVariables(l);
+            dirs.append(new MakefileDependDir(r.replace("\"",""), l.replace("\"","")));
+        }
+    }
     dirs.setAutoDelete(TRUE);
     for(QStringList::Iterator it = l.begin(); it != l.end(); ) {
-        QString opt = (*it);
-        bool remove = FALSE;
-        if(opt.startsWith("-L") || opt.startsWith("/L")) {
-            QString r = opt.right(opt.length() - 2), l = Option::fixPathToLocalOS(r);
+        QChar quote;
+        bool modified_opt = FALSE, remove = FALSE;
+        QString opt = (*it).stripWhiteSpace();
+        if((opt[0] == '\'' || opt[0] == '"') && opt[(int)opt.length()-1] == opt[0]) {
+            quote = opt[0];
+            opt = opt.mid(1, opt.length()-2);
+        }
+        if(opt.startsWith("/LIBPATH:")) {
+            QString r = opt.mid(9), l = Option::fixPathToLocalOS(r);
+            dirs.append(new MakefileDependDir(r.replace("\"",""),
+                                              l.replace("\"","")));
+        } else if(opt.startsWith("-L") || opt.startsWith("/L")) {
+            QString r = opt.mid(2), l = Option::fixPathToLocalOS(r);
             dirs.append(new MakefileDependDir(r.replace("\"",""),
                                               l.replace("\"","")));
-            remove = TRUE;
+            remove = TRUE; //we eat this switch
         } else if(opt.startsWith("-l") || opt.startsWith("/l")) {
             QString lib = opt.right(opt.length() - 2), out;
             if(!lib.isEmpty()) {
                 for(MakefileDependDir *mdd = dirs.first(); mdd; mdd = dirs.next() ) {
+                    QString extension;
                     int ver = findHighestVersion(mdd->local_dir, lib);
                     if(ver > 0)
-                        lib += QString::number(ver);
-                    lib += ".lib";
-                    if(QFile::exists(mdd->local_dir + Option::dir_sep + lib)) {
-                        out = mdd->real_dir + Option::dir_sep + lib;
+                        extension += QString::number(ver);
+                    extension += ".lib";
+                    if(QFile::exists(mdd->local_dir + Option::dir_sep + lib + Option::prl_ext) ||
+                       QFile::exists(mdd->local_dir + Option::dir_sep + lib + extension)) {
+                        out = mdd->real_dir + Option::dir_sep + lib + extension;
                         break;
                     }
                 }
             }
-            if(out.isEmpty())
-                remove = TRUE;
-            else
+            if(out.isEmpty()) {
+                remove = TRUE; //just eat it since we cannot find one..
+            } else {
+                modified_opt = TRUE;
                 (*it) = out;
+            }
         } else if(!QFile::exists(Option::fixPathToLocalOS(opt))) {
-            QString dir, file = opt;
+            QPtrList<MakefileDependDir> lib_dirs;
+            QString file = opt;
             int slsh = file.findRev(Option::dir_sep);
             if(slsh != -1) {
-                dir = file.left(slsh+1);
+                QString r = file.left(slsh+1), l = r;
+                fixEnvVariables(l);
+                lib_dirs.append(new MakefileDependDir(r.replace("\"",""), l.replace("\"","")));
                 file = file.right(file.length() - slsh - 1);
-            }
-            if ( !(project->variables()["QMAKE_QT_DLL"].isEmpty() && (file == "qt.lib" || file == "qt-mt.lib")) ) {
-                if(file.endsWith(".lib")) {
-                    file = file.left(file.length() - 4);
-                    if(!file.at(file.length()-1).isNumber()) {
-                        int ver = findHighestVersion(dir, file);
+            } else {
+                lib_dirs = dirs;
+            }
+            if(file.endsWith(".lib")) {
+                file = file.left(file.length() - 4);
+                if(!file.at(file.length()-1).isNumber()) {
+                    for(MakefileDependDir *mdd = lib_dirs.first(); mdd; mdd = lib_dirs.next() ) {
+                        QString lib_tmpl(file + "%1" + ".lib");
+                        int ver = findHighestVersion(mdd->local_dir, file);
                         if(ver != -1) {
-                            file = QString(dir + file + "%1" + ".lib");
                             if(ver)
-                                (*it) = file.arg(ver);
+                                lib_tmpl = lib_tmpl.arg(ver);
                             else
-                                (*it) = file.arg("");
+                                lib_tmpl = lib_tmpl.arg("");
+                            if(slsh != -1) {
+                                QString dir = mdd->real_dir;
+                                if(!dir.endsWith(Option::dir_sep))
+                                    dir += Option::dir_sep;
+                                lib_tmpl.prepend(dir);
+                            }
+                            modified_opt = TRUE;
+                            (*it) = lib_tmpl;
+                            break;
                         }
                     }
@@ -292,8 +329,11 @@ 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;
+        }
     }
     return TRUE;
@@ -324,6 +364,6 @@ Win32MakefileGenerator::processPrlFiles()
         for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
             QString opt = (*it);
-            if(opt.left(1) == "/") {
-                if(opt.left(9) == "/LIBPATH:") {
+            if(opt.startsWith("/")) {
+                if(opt.startsWith("/LIBPATH:")) {
                     QString r = opt.mid(9), l = r;
                     fixEnvVariables(l);
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
@@ -74,4 +74,6 @@ extern QClipboard *qt_clipboard;
 #if defined (Q_OS_WIN32) || defined (Q_OS_CYGWIN)
 extern Qt::WindowsVersion qt_winver;
+#elif defined (Q_OS_MAC)
+extern Qt::MacintoshVersion qt_macver;
 #endif
 
@@ -82,6 +84,5 @@ extern int qt_ncols_option;
 
 extern void qt_dispatchEnterLeave( QWidget*, QWidget* );
-
-
+extern bool qt_tryModalHelper( QWidget *, QWidget ** = 0 );
 
 #endif
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
@@ -34,6 +34,6 @@
 **********************************************************************/
 
-#ifndef QCOM_H
-#define QCOM_H
+#ifndef QCOM_P_H
+#define QCOM_P_H
 
 //
@@ -335,3 +335,3 @@ public:		   \
 #endif //QT_NO_COMPONENT
 
-#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
@@ -34,6 +34,6 @@
 **********************************************************************/
 
-#ifndef QUCOMLIBRARY_H
-#define QUCOMLIBRARY_H
+#ifndef QCOMLIBRARY_P_H
+#define QCOMLIBRARY_P_H
 
 //
@@ -77,3 +77,3 @@ private:
 #endif //QT_NO_COMPONENT
 
-#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
@@ -4,7 +4,5 @@
 ** Internal header file.
 **
-** Created : 
-**
-** Copyright (C) 2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 2001-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the kernel module of the Qt GUI Toolkit.
@@ -36,6 +34,6 @@
 **********************************************************************/
 
-#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
@@ -36,6 +36,6 @@
 **********************************************************************/
 
-#ifndef QCOMPONENTFACTORY_H
-#define QCOMPONENTFACTORY_H
+#ifndef QCOMPONENTFACTORY_P_H
+#define QCOMPONENTFACTORY_P_H
 
 #ifndef QT_H
@@ -71,3 +71,3 @@ public:
 #endif // QT_NO_COMPONENT
 
-#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
@@ -34,6 +34,6 @@
 **********************************************************************/
 
-#ifndef QCRITICALSECTION_H
-#define QCRITICALSECTION_H
+#ifndef QCRITICALSECTION_P_H
+#define QCRITICALSECTION_P_H
 
 #ifndef QT_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
@@ -4,5 +4,5 @@
 ** Definition of some private QDir functions.
 **
-** Created : 2000.11.06
+** Created : 001106
 **
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
@@ -39,5 +39,4 @@
 #define QDIR_P_H
 
-
 //
 //  W A R N I N G
@@ -54,8 +53,10 @@
 
 #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 & );
 
 extern int qt_cmp_si_sortSpec;
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
@@ -4,5 +4,5 @@
 ** Definition of QEffects functions
 **
-** Created : 2000.06.21
+** Created : 000621
 **
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
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,13 +1,63 @@
+/****************************************************************************
+** $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
 #define QEVENTLOOP_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.
+//
+//
+
 #include "qplatformdefs.h"
+
+// SCO OpenServer redefines raise -> kill
+#if defined(raise)
+# undef raise
+#endif
+
 #include "qwindowdefs.h"
 
 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
 {
@@ -31,4 +81,10 @@ public:
 #endif // Q_OS_UNIX
 
+#if defined(Q_WS_WIN)
+struct QSockNot {
+    QSocketNotifier *obj;
+    int fd;
+};
+#endif // Q_WS_WIN
 
 class QEventLoopPrivate
@@ -45,10 +101,12 @@ public:
         quitnow = FALSE;
         exitloop = FALSE;
+        shortcut = FALSE;
     }
 
     int looplevel;
     int quitcode;
-    bool quitnow;
-    bool exitloop;
+    unsigned int quitnow  : 1;
+    unsigned int exitloop : 1;
+    unsigned int shortcut : 1;
 
 #if defined(Q_WS_MAC)
@@ -70,4 +128,10 @@ public:
     QSockNotType sn_vec[3];
 #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
@@ -52,6 +52,6 @@
 
 #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
@@ -163,4 +163,5 @@ public:
             uintstockFont:1;
             uintpaintDevice:1;
+    uint        useTextOutA:1;
     union {
                 TEXTMETRICWw;
@@ -414,5 +415,5 @@ public:
 #if defined( Q_WS_MAC )
     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();
     void load();
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
@@ -31,6 +31,18 @@
 **********************************************************************/
 
-#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.
+//
+//
 
 #ifndef QT_H
@@ -54,3 +66,3 @@ struct Q_EXPORT QGfxDriverInterface : public QFeatureListInterface
 #endif // QT_NO_COMPONENT
 
-#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
@@ -4,5 +4,5 @@
 ** Definition of QGPluginManager class
 **
-** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the tools module of the Qt GUI Toolkit.
@@ -34,6 +34,6 @@
 **********************************************************************/
 
-#ifndef QGPLUGINMANAGER_H
-#define QGPLUGINMANAGER_H
+#ifndef QGPLUGINMANAGER_P_H
+#define QGPLUGINMANAGER_P_H
 
 #ifndef QT_H
@@ -105,3 +105,3 @@ inline bool QGPluginManager::autoUnload() const
 #endif
 
-#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
@@ -2,5 +2,5 @@
 ** $Id$
 **
-** Definition of ???
+** ...
 **
 ** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
@@ -34,6 +34,6 @@
 **********************************************************************/
 
-#ifndef QIMAGEFORMATINTERFACE_H
-#define QIMAGEFORMATINTERFACE_H
+#ifndef QIMAGEFORMATINTERFACE_P_H
+#define QIMAGEFORMATINTERFACE_P_H
 
 #ifndef QT_H
@@ -73,3 +73,3 @@ struct Q_EXPORT QImageFormatInterface : public QFeatureListInterface
 #endif // QT_NO_COMPONENT
 
-#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
@@ -88,5 +88,5 @@ public:
 
     void *ic;
-    QString text, lastcompose;
+    QString text;
     QWidget *focusWidget;
     bool composing;
@@ -116,4 +116,7 @@ private:
     static bool endComposition( QWidget *fw = 0 );
     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
@@ -31,6 +31,18 @@
 **********************************************************************/
 
-#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.
+//
+//
 
 #ifndef QT_H
@@ -54,3 +66,3 @@ struct Q_EXPORT QKbdDriverInterface : public QFeatureListInterface
 #endif // QT_NO_COMPONENT
 
-#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
@@ -4,5 +4,5 @@
 ** Definition of an internal QLibrary class
 **
-** Created : 2000-01-01
+** Created : 000101
 **
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
@@ -56,7 +56,4 @@
 
 #ifndef QT_H
-#if defined(Q_CC_GNU)
-#warning "avoid including header file \"qwindowdefs.h\" in directory 'tools'"
-#endif
 #include "qwindowdefs.h"
 #endif // QT_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
@@ -31,6 +31,18 @@
 **********************************************************************/
 
-#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.
+//
+//
 
 #ifndef QT_H
@@ -54,3 +66,3 @@ struct Q_EXPORT QMouseDriverInterface : public QFeatureListInterface
 #endif // QT_NO_COMPONENT
 
-#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,4 +1,39 @@
-#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
 
 //
@@ -29,5 +64,6 @@ public:
 private:
     QMutex mutex;
-    QMemArray<QMutex*> mutexes;
+    QMutex **mutexes;
+    int count;
     bool recurs;
 };
@@ -37,3 +73,3 @@ extern QMutexPool *qt_global_mutexpool;
 #endif // QT_THREAD_SUPPORT
 
-#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
@@ -4,5 +4,5 @@
 ** Definition of QPluginManager class
 **
-** Created : 2000-01-01
+** Created : 000101
 **
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
@@ -36,10 +36,6 @@
 **********************************************************************/
 
-#ifndef QPLUGINMANAGER_H
-#define QPLUGINMANAGER_H
-
-#ifndef QT_H
-#include "qgpluginmanager_p.h"
-#endif // QT_H
+#ifndef QPLUGINMANAGER_P_H
+#define QPLUGINMANAGER_P_H
 
 //
@@ -55,4 +51,8 @@
 //
 
+#ifndef QT_H
+#include "qgpluginmanager_p.h"
+#endif // QT_H
+
 #ifndef QT_NO_COMPONENT
 
@@ -71,3 +71,3 @@ public:
 #endif //QT_NO_COMPONENT
 
-#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
@@ -7,5 +7,5 @@
 ** Created : 940927
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the kernel module of the Qt GUI Toolkit.
@@ -62,5 +62,5 @@
 #ifndef QT_NO_PRINTER
 
-struct QPSPrinterPrivate;
+class QPSPrinterPrivate;
 
 class Q_EXPORT QPSPrinter : public QPaintDevice
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
@@ -157,4 +157,6 @@ private:
         return *this;
     }
+    QTextStringChar( const QTextStringChar & ) {
+    }
     friend class QComplexText;
     friend class QTextParagraph;
@@ -175,6 +177,6 @@ public:
     virtual ~QTextString();
 
-    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;
 
     QTextStringChar &at( int i ) const;
@@ -287,6 +289,6 @@ public:
     void gotoPageUp( int visibleHeight );
     void gotoPageDown( int visibleHeight );
-    void gotoNextWord();
-    void gotoPreviousWord();
+    void gotoNextWord( bool onlySpace = FALSE );
+    void gotoPreviousWord( bool onlySpace = FALSE );
     void gotoWordLeft();
     void gotoWordRight();
@@ -327,5 +329,5 @@ private:
     void push();
     void pop();
-    void processNesting( Operation op );
+    bool processNesting( Operation op );
     void invalidateNested();
     void gotoIntoNested( const QPoint &globalPos );
@@ -704,4 +706,5 @@ struct Q_EXPORT QTextDocumentSelection
     QTextCursor startCursor, endCursor;
     bool swapped;
+    Q_DUMMY_COMPARISON_OPERATOR(QTextDocumentSelection)
 };
 
@@ -840,4 +843,7 @@ public:
     void doLayout( QPainter *p, int w );
     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,
                     QPixmap *&doubleBuffer, const QColorGroup &cg,
@@ -1068,4 +1074,5 @@ struct Q_EXPORT QTextParagraphSelection
 {
     int start, end;
+    Q_DUMMY_COMPARISON_OPERATOR(QTextParagraphSelection)
 };
 
@@ -1137,21 +1144,13 @@ 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
 {
     friend class QTextDocument;
     friend class QTextCursor;
+    friend class QSyntaxHighlighter;
 
 public:
@@ -1177,5 +1176,11 @@ public:
 //     QTextFormat *paragFormat() const;
 
+#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;
 
@@ -1597,5 +1602,4 @@ public:
 
     void updateDefaultFormat( const QFont &font, const QColor &c, QStyleSheet *sheet );
-    QDict<QTextFormat> dict() const { return cKey; }
 
     QPaintDevice *paintDevice() const { return paintdevice; }
@@ -1617,4 +1621,17 @@ private:
 };
 
+class Q_EXPORT QTextParagraphPseudoDocument
+{
+public:
+    QTextParagraphPseudoDocument();
+    ~QTextParagraphPseudoDocument();
+    QRect docRect;
+    QTextFormatter *pFormatter;
+    QTextCommandHistory *commandHistory;
+    int minw;
+    int wused;
+    QTextFormatCollection collection;
+};
+
 // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
@@ -1829,4 +1846,10 @@ 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
@@ -95,5 +95,5 @@ public:
     bool globalScope :1;
 
-#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 
     // system specific setting database (ie. registry on Windows)
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
@@ -6,5 +6,5 @@
 ** Created : 020124
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the kernel module of the Qt GUI Toolkit.
@@ -31,4 +31,7 @@
 **********************************************************************/
 
+#ifndef QSHAREDMEMORY_P_H
+#define QSHAREDMEMORY_P_H
+
 //
 //  W A R N I N G
@@ -39,8 +42,7 @@
 // change from version to version without notice, or even be removed.
 //
+// We mean it.
+//
 //
-
-#if !defined(QT_QSHM_H)
-#define QT_QSHM_H
 
 #include <qstring.h>
@@ -82,3 +84,4 @@ 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,3 +1,4 @@
 /****************************************************************************
+** $Id$
 **
 ** Definition of QSqlDriverInterface class
@@ -5,5 +6,5 @@
 ** Created : 2000-11-03
 **
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the sql module of the Qt GUI Toolkit.
@@ -38,4 +39,16 @@
 #define QSQLDRIVERINTERFACE_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 <private/qcom_p.h>
@@ -67,3 +80,3 @@ struct QM_EXPORT_SQL QSqlDriverFactoryInterface : public QFeatureListInterface
 #endif // QT_NO_SQL
 
-#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
@@ -52,6 +52,8 @@
 #ifndef QT_H
 #include "qmap.h"
+#include "qvaluevector.h"
 #include "qstring.h"
 #include "qvariant.h"
+#include "qsql.h"
 #endif // QT_H
 
@@ -60,11 +62,29 @@
 #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #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
 
@@ -75,7 +95,9 @@ public:
     virtual bool prepare( const QString& query );
     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();
     void clearIndex();
@@ -87,5 +109,11 @@ 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;
 };
 
@@ -97,5 +125,4 @@ public:
     virtual bool isOpen() const = 0;
 };
-
 #endif
 #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
@@ -34,6 +34,18 @@
 **********************************************************************/
 
-#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.
+//
+//
 
 #ifndef QT_H
@@ -59,3 +71,3 @@ struct Q_EXPORT QStyleFactoryInterface : public QFeatureListInterface
 #endif //QT_NO_STYLE
 
-#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
@@ -4,5 +4,5 @@
 ** Definition of the QSvgDevice class
 **
-** Created : 20001024
+** Created : 001024
 **
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
@@ -36,6 +36,6 @@
 *****************************************************************************/
 
-#ifndef QSVGDEVICE_H
-#define QSVGDEVICE_H
+#ifndef QSVGDEVICE_P_H
+#define QSVGDEVICE_P_H
 
 //
@@ -132,3 +132,3 @@ inline QRect QSvgDevice::boundingRect() const
 #endif // QT_NO_SVG
 
-#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
@@ -37,5 +37,4 @@
 #define QTEXTCODECINTERFACE_P_H
 
-
 //
 //  W A R N I N G
@@ -51,5 +50,4 @@
 //
 
-
 #ifndef QT_H
 #include <private/qcom_p.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
@@ -4,5 +4,5 @@
 ** Definition of some Qt private functions.
 **
-** Created : 2000-01-01
+** Created : 000101
 **
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
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
@@ -36,11 +36,6 @@
 **********************************************************************/
 
-#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
 
 //
@@ -56,4 +51,9 @@
 //
 
+#ifndef QT_H
+#include <qstring.h>
+#include "quuid.h"
+#endif // QT_H
+
 #ifdef check
 #undef check
@@ -130,32 +130,32 @@ public: // scary MSVC bug makes this necessary
     {
         bool b;
-        
+
         char c;
         short s;
         int i;
         long l;
-        
+
         unsigned char uc;
         unsigned short us;
         unsigned int ui;
         unsigned long ul;
-        
+
         float f;
         double d;
-        
+
         char byte[16];
-        
+
         struct {
            char* data;
            unsigned long size;
         } bytearray;
-        
+
         void* ptr;
-        
+
         struct {
             void *ptr;
             bool owner;
         } voidstar;
-        
+
         struct {
             char *ptr;
@@ -167,13 +167,13 @@ public: // scary MSVC bug makes this necessary
             bool owner;
         } utf8;
-        
+
         struct {
             char *ptr;
             bool owner;
         } local8bit;
-        
+
         QUnknownInterface* iface;
         QDispatchInterface* idisp;
-        
+
     } payload;
 
@@ -264,5 +264,5 @@ struct Q_EXPORT QUEnumItem 				// - a name/value pair
 
 struct Q_EXPORT QUEnum
-        {               
+{
             const char *name;           // - enumerator name
             unsigned int count;                 // - number of values
@@ -397,22 +397,4 @@ struct Q_EXPORT QUType_int : public QUType
 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;
 
 // {2D0974E5-0BA6-4ec2-8837-C198972CB48C}
@@ -435,22 +417,4 @@ struct Q_EXPORT QUType_double : public QUType
 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;
 
 // {EFCDD1D4-77A3-4b8e-8D46-DC14B8D393E9}
@@ -497,3 +461,3 @@ 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
@@ -36,6 +36,18 @@
 **********************************************************************/
 
-#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.
+//
+//
 
 #ifndef QT_H
@@ -90,4 +102,4 @@ 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,6 +1,14 @@
- /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
@@ -9,7 +17,14 @@
 ** 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.
 **
@@ -19,14 +34,6 @@
 **********************************************************************/
 
-#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
 
 //
@@ -42,4 +49,11 @@
 //
 
+#ifndef QT_H
+#include <private/qcom_p.h>
+#include <qiconset.h>
+#endif // QT_H
+
+#ifndef QT_NO_WIDGETPLUGIN
+
 class QWidget;
 
@@ -93,5 +107,5 @@ public:
 };
 
-#if CONTAINER_CUSTOM_WIDGETS
+#ifdef QT_CONTAINER_CUSTOM_WIDGETS
 // {15976628-e3c3-47f4-b525-d124a3caf30e}
 #ifndef IID_QWidgetContainer
@@ -102,10 +116,25 @@ 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;
 };
 #endif
 
 #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
@@ -6,5 +6,5 @@
 ** Created : 001010
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the workspace module of the Qt GUI Toolkit.
@@ -36,6 +36,18 @@
 **********************************************************************/
 
-#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.
+//
+//
 
 #ifndef QT_H
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
@@ -116,3 +116,7 @@ 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
@@ -102,7 +102,9 @@ Q_EXPORT Q_UINT16 qChecksum( const char *s, uint len );
  *****************************************************************************/
 
+#ifndef QT_QWINEXPORT
 #if defined(Q_TEMPLATEDLL)
 Q_TEMPLATE_EXTERN template class Q_EXPORT QMemArray<char>;
 #endif
+#endif /* QT_QWINEXPORT */
 
 #if defined(Q_QDOC)
@@ -233,4 +235,6 @@ public:
     QCString    &operator+=( const char *str );
     QCString    &operator+=( char c );
+private:
+            intfind( const char *str, int index, bool cs, uint l ) const;
 };
 
@@ -389,3 +393,6 @@ 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
@@ -116,3 +116,7 @@ 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
@@ -179,4 +179,5 @@ public:
     static QString cleanDirPath( const QString &dirPath );
     static bool isRelativePath( const QString &path );
+    void refresh() const;
 
 private:
@@ -189,5 +190,5 @@ private:
                                  int FilterSpec, int SortSpec  );
 
-    static void slashify ( QString &);
+    static void slashify( QString & );
 
             QStringdPath;
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
@@ -75,5 +75,5 @@
 //#define QT_NO_QWS_DEPTH_32
 
-// 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
@@ -50,9 +50,17 @@ public:
     //### DO NOT USE THIS.  IT IS PUBLIC BUT DO NOT USE IT IN NEW CODE.
             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:
             QGArray( int, int );                // dummy; does not alloc
@@ -71,4 +79,5 @@ protected:
             boolisEqual( const QGArray &a ) const;
 
+            boolresize( uint newsize, Optimization optim );
             boolresize( uint newsize );
 
@@ -89,5 +98,5 @@ protected:
             int         find( const char *d, uint index, uint sz ) const;
             int         contains( const char *d, uint sz ) const;
-    
+
             voidsort( uint sz );
             int         bsearch( const char *d, uint sz ) const;
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
@@ -39,9 +39,9 @@
 #define QGLOBAL_H
 
-#define QT_VERSION_STR   "3.1.0-b2"
+#define QT_VERSION_STR   "3.1.2"
 /*
    QT_VERSION is (major << 16) + (minor << 8) + patch.
  */
-#define QT_VERSION 0x030100
+#define QT_VERSION 0x030102
 
 /*
@@ -142,10 +142,10 @@
 #elif defined(_SEQUENT_)
 #  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
 #  define Q_OS_UNIXWARE7
@@ -226,5 +226,7 @@
 #  if _MSC_VER >= 1300
 #    define Q_CC_MSVC_NET
-#    define Q_TYPENAME
+#    if _MSC_VER < 1310
+#      define Q_TYPENAME
+#    endif
 #  endif
 #  define Q_NO_USING_KEYWORD /* ### check "using" status */
@@ -272,4 +274,8 @@
 #    define Q_NO_USING_KEYWORD
 #  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)
 #    define Q_PACKED __attribute__ ((packed))
@@ -391,4 +397,8 @@
 #  elif defined(__USLC__) && defined(__SCO_VERSION__)
 #    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 */
 
@@ -398,7 +408,6 @@
 #    define Q_NO_USING_KEYWORD
 
-/* 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)
 #    define Q_CC_CDS
@@ -416,4 +425,6 @@
 #      define Q_BROKEN_TEMPLATE_SPECIALIZATION
 #      define Q_STRICT_INLINING_RULES
+#      define Q_NO_EXPLICIT_KEYWORD
+#      define Q_INLINE_TEMPLATES inline
 #    elif defined(_COMPILER_VERSION) && (_COMPILER_VERSION < 730) /* 7.2 */
 #      define Q_TYPENAME
@@ -424,9 +435,11 @@
 
 /* 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
 #  define Q_NO_EXPLICIT_KEYWORD
 #  define Q_NO_USING_KEYWORD
+#  define Q_INLINE_TEMPLATES inline
 
 /* Never tested! */
@@ -455,4 +468,14 @@
 #  endif
 
+/* 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)
 /* __HP_aCC was not defined in first aCC releases */
@@ -507,4 +530,5 @@
 #  if defined(QWS)
 #    define Q_WS_QWS
+#    define QT_NO_QWS_IM
 #  elif defined(Q_OS_MACX)
 #    define Q_WS_MACX
@@ -746,4 +770,8 @@ class QDataStream;
 #endif
 
+#if !defined(Q_WS_QWS) && !defined(QT_NO_COP)
+#  define QT_NO_COP
+#endif
+
 #ifndef QT_H
 #include <qfeatures.h>
@@ -753,4 +781,5 @@ class QDataStream;
 //
 // Create Qt DLL if QT_DLL is defined (Windows only)
+// or QT_SHARED is defined (Kylix only)
 //
 
@@ -771,11 +800,22 @@ class QDataStream;
 #    define Q_TEMPLATEDLL
 #    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
 #        define Q_TEMPLATE_EXTERN
 #      endif
 #    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
 #else
@@ -804,5 +844,7 @@ extern Q_EXPORT bool qt_winunicode;
 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();
 #if defined(UNICODE)
@@ -970,4 +1012,20 @@ Q_EXPORT const char *qInstallPathData();
 #endif // __cplusplus
 
+// 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
 
@@ -993,4 +1051,5 @@ Q_EXPORT const char *qInstallPathData();
 #    pragma warning(disable: 4355) // 'this' : used in base member initializer list
 #    pragma warning(disable: 4231) // nonstandard extension used : 'extern' before template explicit instantiation
+#    pragma warning(disable: 4710) // function not inlined
 #  elif defined(Q_CC_BOR)
 #    pragma option -w-inl
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
@@ -112,3 +112,7 @@ 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
@@ -881,3 +881,7 @@ Q_INLINE_TEMPLATES QDataStream& operator<<( QDataStream& s, const QMap<Key,T>& m
 #endif
 
+#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
@@ -44,5 +44,5 @@
 
 
-template<class type> 
+template<class type>
 class QMemArray : public QGArray
 {
@@ -69,4 +69,5 @@ public:
             bool  isNull()  const{ return QGArray::data() == 0; }
             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)); }
     bool  fill( const type &d, int size = -1 )
@@ -109,4 +110,5 @@ public:
 };
 
+#ifndef QT_QWINEXPORT
 #if defined(Q_TEMPLATEDLL)
 // MOC_SKIP_BEGIN
@@ -115,4 +117,5 @@ Q_TEMPLATE_EXTERN template class Q_EXPORT QMemArray<bool>;
 // MOC_SKIP_END
 #endif
+#endif /* QT_QWINEXPORT */
 
 #ifndef QT_NO_COMPAT
@@ -120,3 +123,7 @@ Q_TEMPLATE_EXTERN template class Q_EXPORT QMemArray<bool>;
 #endif
 
+#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
@@ -4,6 +4,4 @@
 ** Definition of QPtrList template/macro class
 **
-** Created :
-**
 ** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
 **
@@ -158,3 +156,7 @@ public:
 #endif
 
+#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
@@ -111,3 +111,7 @@ template<class type> inline void QPtrVector<type>::deleteItem( QPtrCollection::I
 #endif
 
+#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
@@ -81,5 +81,5 @@ public:
 #endif
 
-#if defined(qdoc)
+#if defined(Q_QDOC)
     int search( const QString& str, int offset = 0,
                 CaretMode caretMode = CaretAtZero ) const;
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
@@ -2,10 +2,9 @@
 ** $Id$
 **
-** Definition of the QString class, and related Unicode
-** functions.
+** Definition of the QString class, and related Unicode functions.
 **
 ** Created : 920609
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the tools module of the Qt GUI Toolkit.
@@ -44,4 +43,11 @@
 #endif // QT_H
 
+#ifndef QT_NO_STL
+#include <string>
+#if defined(Q_WRONG_SB_CTYPE_MACROS) && defined(_SB_CTYPE_MACROS)
+#undef _SB_CTYPE_MACROS
+#endif
+#endif
+
 
 /*****************************************************************************
@@ -337,7 +343,7 @@ inline bool operator>( QChar c1, QChar c2 ) { return !(c2>=c1); }
 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);
                      if ( ascii ) delete[] ascii; }
@@ -351,5 +357,5 @@ struct Q_EXPORT QStringData : public QShared {
             ascii = 0;
         }
-        dirty = 1;
+        issimpletext = FALSE;
     }
 #ifdef Q_OS_MAC9
@@ -358,5 +364,5 @@ struct Q_EXPORT QStringData : public QShared {
     uint len : 30;
 #endif
-    uint simpletext : 1;
+    uint issimpletext : 1;
 #ifdef Q_OS_MAC9
     uint maxl;
@@ -364,5 +370,5 @@ struct Q_EXPORT QStringData : public QShared {
     uint maxl : 30;
 #endif
-    uint dirty : 1;
+    uint islatin1 : 1;
 
 private:
@@ -385,9 +391,13 @@ public:
     QString( const char *str );                 // deep copy
 #endif
+#ifndef QT_NO_STL
+    QString( const std::string& );                   // deep copy
+#endif
     ~QString();
 
     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
     QString    &operator=( const QCString& );   // deep copy
@@ -495,4 +505,7 @@ public:
     QString    &append( const char * );
 #endif
+#ifndef QT_NO_STL
+    QString    &append( const std::string& );
+#endif
     QString    &prepend( char );
     QString    &prepend( QChar );
@@ -502,4 +515,7 @@ public:
     QString    &prepend( const char * );
 #endif
+#ifndef QT_NO_STL
+    QString    &prepend( const std::string& );
+#endif
     QString    &remove( uint index, uint len );
     QString    &remove( QChar c );
@@ -557,4 +573,7 @@ public:
     QString    &operator+=( const char *str );
 #endif
+#ifndef QT_NO_STL
+    QString    &operator+=( const std::string& );
+#endif
     QString    &operator+=( QChar c );
     QString    &operator+=( char c );
@@ -577,5 +596,6 @@ 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;
     static QString fromLatin1(const char*, int len=-1);
@@ -586,6 +606,10 @@ public:
     bool operator!() const;
 #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 );
     const unsigned short *ucs2() const;
@@ -593,4 +617,5 @@ public:
     QString &setUnicode( const QChar* unicode, uint len );
     QString &setUnicodeCodes( const ushort* unicode_as_ushorts, uint len );
+    QString &setAscii( const char*, int len=-1 );
     QString &setLatin1( const char*, int len=-1 );
 
@@ -610,5 +635,5 @@ public:
 
 #ifndef QT_NO_COMPAT
-    const char* data() const { return latin1(); }
+    const char* data() const { return ascii(); }
 #endif
 
@@ -618,5 +643,5 @@ public:
     void setLength( uint newLength );
 
-    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;
 
@@ -632,7 +657,7 @@ private:
     void checkSimpleText() const;
 
-    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 );
 
     QStringData *d;
@@ -795,5 +820,15 @@ inline QString &QString::prepend( char c )
 #ifndef QT_NO_CAST_ASCII
 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
 
@@ -803,5 +838,5 @@ inline QString &QString::append( const QString & s )
 #ifndef QT_NO_CAST_ASCII
 inline QString &QString::append( const QByteArray &s )
-{ return operator+=(s.data()); }
+{ return operator+=(s); }
 
 inline QString &QString::append( const char * s )
@@ -815,7 +850,9 @@ inline QString &QString::append( char c )
 { return operator+=(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
 
@@ -855,8 +892,8 @@ inline int QString::findRev( char c, int index, bool cs) const
 #ifndef QT_NO_CAST_ASCII
 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
 
@@ -898,5 +935,5 @@ 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;
 }
@@ -904,5 +941,5 @@ Q_EXPORT inline const QString operator+( const QString &s1, const char *s2 )
 Q_EXPORT inline const QString operator+( const char *s1, const QString &s2 )
 {
-    QString tmp = QString::fromLatin1( s1 );
+    QString tmp = QString::fromAscii( s1 );
     tmp += s2;
     return tmp;
@@ -948,3 +985,7 @@ extern Q_EXPORT QString qt_winMB2QString( const char* mb, int len=-1 );
 #endif
 
+#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
@@ -46,8 +46,10 @@
 
 
+#ifndef QT_QWINEXPORT
 #if defined(Q_TEMPLATEDLL)
 Q_TEMPLATE_EXTERN template class Q_EXPORT QPtrList<char>;
 Q_TEMPLATE_EXTERN template class Q_EXPORT QPtrListIterator<char>;
 #endif
+#endif /* QT_QWINEXPORT */
 
 #if defined(Q_QDOC)
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
@@ -76,4 +76,9 @@ public:
     static void setCodecForLocale(QTextCodec *c);
 
+    static QTextCodec* codecForTr();
+    static void setCodecForTr(QTextCodec *c);
+    static QTextCodec* codecForCStrings();
+    static void setCodecForCStrings(QTextCodec *c);
+
     static void deleteAllCodecs();
 
@@ -89,5 +94,5 @@ public:
     virtual QString toUnicode(const char* chars, int len) const;
     virtual QCString fromUnicode(const QString& uc, int& lenInOut) const;
-    
+
     QCString fromUnicode(const QString& uc) const;
     QString toUnicode(const QByteArray&, int len) const;
@@ -109,6 +114,15 @@ protected:
     static int simpleHeuristicNameMatch(const char* name, const char* hint);
 
+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
 #endif // QTEXTCODEC_H
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
@@ -90,4 +90,5 @@ template <class InputIterator1, class InputIterator2>
 inline bool qEqual( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2 )
 {
+    // ### compare using !(*first1 == *first2) in Qt 4.0
     for ( ; first1 != last1; ++first1, ++first2 )
         if ( *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
@@ -4,7 +4,7 @@
 ** Definition of QUuid class
 **
-** Created: 010523
+** Created : 010523
 **
-** Copyright (C) 1992-2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the tools module of the Qt GUI Toolkit.
@@ -54,5 +54,5 @@ typedef struct _GUID
     ushort  Data3;
     uchar   Data4[ 8 ];
-} GUID;
+} GUID, *REFGUID, *LPGUID;
 #endif
 #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
@@ -663,3 +663,7 @@ 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
@@ -6,5 +6,5 @@
 ** Created : 990925
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the tools module of the Qt GUI Toolkit.
@@ -55,5 +55,5 @@ public:
         T elem( this->last() );
         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
@@ -61,6 +61,11 @@ int main(int argc, char **argv)
     QString oldpwd = sunworkshop42workaround.currentDirPath();
     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;
     int exit_val = 0;
diff --git a/qmake/option.cpp b/qmake/option.cpp
index 34b3ee2..8b7e5e8 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -83,5 +83,5 @@ Option::TARG_MODE Option::target_mode = Option::TARG_UNIX_MODE;
 //QMAKE_GENERATE_PROJECT stuff
 bool Option::projfile::do_pwd = TRUE;
-bool Option::projfile::do_recursive = FALSE;
+bool Option::projfile::do_recursive = TRUE;
 QStringList Option::projfile::project_dirs;
 
@@ -98,4 +98,15 @@ QStringList Option::mkfile::project_files;
 QString Option::mkfile::qmakespec_commandline;
 
+static Option::QMAKE_MODE default_mode(QString progname)
+{
+    int s = progname.findRev(Option::dir_sep);
+    if(s != -1)
+        progname = progname.right(progname.length() - (s + 1));
+    if(progname == "qmakegen")
+        return Option::QMAKE_GENERATE_PROJECT;
+    return Option::QMAKE_GENERATE_MAKEFILE;
+}
+
+QString project_builtin_regx();
 bool usage(const char *a0)
 {
@@ -108,9 +119,9 @@ bool usage(const char *a0)
             "\n"
             "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"
             "\t               be processed, if skipped qmake will try to find a project\n"
@@ -137,5 +148,5 @@ bool usage(const char *a0)
             "\t-v             Version information\n"
             "\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"
             "\t-spec spec     Use spec as QMAKESPEC       [makefile mode only]\n"
@@ -144,24 +155,16 @@ bool usage(const char *a0)
             "\t-nomoc         Don't generate moc targets  [makefile mode only]\n"
             "\t-nopwd         Don't look for files in pwd [ project mode only]\n"
-            "\t-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 */
             QString opt = argv[x] + 1;
@@ -180,5 +183,4 @@ Option::parseCommandLine(int argc, char **argv)
                 } else {
                     specified = FALSE;
-                    Option::qmake_mode = default_mode(argv[0]);
                 }
                 if(specified)
@@ -205,9 +207,9 @@ Option::parseCommandLine(int argc, char **argv)
                 Option::debug_level++;
             } 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");
                 return FALSE;
             } else if(opt == "h" || opt == "help") {
-                return usage(argv[0]);
+                return FALSE;
             } else if(opt == "Wall") {
                 Option::warn_level |= WarnAll;
@@ -245,14 +247,13 @@ Option::parseCommandLine(int argc, char **argv)
                     } else if(opt == "r") {
                         Option::projfile::do_recursive = TRUE;
+                    } else if(opt == "norecursive") {
+                        Option::projfile::do_recursive = FALSE;
                     } else {
                         fprintf(stderr, "***Unknown option -%s\n", opt.latin1());
-                        return usage(argv[0]);
+                        return FALSE;
                     }
                 }
             }
         } else {
-            if(x == 1)
-                Option::qmake_mode = default_mode(argv[0]);
-
             QString arg = argv[x];
             if(arg.find('=') != -1) {
@@ -273,6 +274,67 @@ 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]);
 
     //last chance for defaults
@@ -284,25 +346,18 @@ Option::parseCommandLine(int argc, char **argv)
         //try REALLY hard to do it for them, lazy..
         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]);
+            }
         }
     }
 
     //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) {
         Option::dir_sep = "\\";
@@ -387,11 +442,11 @@ Option::fixPathToTargetOS(const QString& in, bool fix_env, bool canonical)
         tmp = fixPath(tmp);
     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
@@ -44,5 +44,5 @@
 
 #define QMAKE_VERSION_MAJOR 1
-#define QMAKE_VERSION_MINOR 4
+#define QMAKE_VERSION_MINOR 5
 #define QMAKE_VERSION_PATCH 0
 const char *qmake_version();
@@ -117,4 +117,7 @@ struct Option
         static QString qmakespec_commandline;
     };
+
+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
@@ -67,7 +67,12 @@ 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;
 }
@@ -107,5 +112,5 @@ static QStringList split_value_list(const QString &vals, bool do_semicolon=FALSE
         } else if(vals[x] == '\'' || vals[x] == '"') {
             quote.push(vals[x]);
-        } else if(quote.isEmpty() && 
+        } else if(quote.isEmpty() &&
                   ((do_semicolon && vals[x] == ';') ||  vals[x] == ' ')) {
             ret << vals.mid(last, x - last);
@@ -123,8 +128,10 @@ 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 */
         return TRUE;
@@ -155,15 +162,19 @@ QMakeProject::parse(QString t, QMap<QString, QStringList> &place)
     bool scope_failed = FALSE, else_line = FALSE, or_op=FALSE;
     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;
+                    }
                 }
             }
@@ -218,5 +229,5 @@ QMakeProject::parse(QString t, QMap<QString, QStringList> &place)
                         }
                     } else {
-                        test = isActiveConfig(comp_scope.stripWhiteSpace());
+                        test = isActiveConfig(comp_scope.stripWhiteSpace(), TRUE);
                     }
                     if(invert_test)
@@ -288,5 +299,5 @@ 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())
         warn_msg(WarnParser, "Detected possible line continuation: {%s} %s:%d",
@@ -356,5 +367,5 @@ 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)
 {
     parser_info pi = parser;
@@ -364,14 +375,14 @@ QMakeProject::read(QString file, QMap<QString, QStringList> &place)
     scope_block = 0;
 
-    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("");
         ret = qfile.open(IO_ReadOnly, stdin);
         using_stdin = TRUE;
     } else {
-        qfile.setName(file);
+        qfile.setName(filename);
         ret = qfile.open(IO_ReadOnly);
     }
@@ -379,5 +390,5 @@ QMakeProject::read(QString file, QMap<QString, QStringList> &place)
         QTextStream t( &qfile );
         QString s, line;
-        parser.file = file;
+        parser.file = filename;
         parser.line_no = 0;
         while ( !t.eof() ) {
@@ -385,5 +396,9 @@ QMakeProject::read(QString file, QMap<QString, QStringList> &place)
             line = t.readLine().stripWhiteSpace();
             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) == "\\") {
                 line.truncate(line.length() - 1);
@@ -409,10 +424,19 @@ 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()) {
         // hack to get the Option stuff in there
         base_vars["QMAKE_EXT_CPP"] = Option::cpp_ext;
         base_vars["QMAKE_EXT_H"] = Option::h_ext;
+        if(!Option::user_template_prefix.isEmpty())
+            base_vars["TEMPLATE_PREFIX"] = Option::user_template_prefix;
 
         /* parse the cache */
@@ -442,18 +466,7 @@ QMakeProject::read(QString project, QString)
         QStringList mkspec_roots;
         /* 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()) {
             for(QStringList::Iterator it = mkspec_roots.begin(); it != mkspec_roots.end(); ++it) {
@@ -465,9 +478,8 @@ 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;
+            }
         }
 
@@ -545,10 +557,12 @@ 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);
+    }
 
     if(vars["TARGET"].isEmpty()) {
@@ -580,12 +594,11 @@ QMakeProject::read(QString project, QString)
 
 bool
-QMakeProject::isActiveConfig(const QString &x)
+QMakeProject::isActiveConfig(const QString &x, bool regex)
 {
     if(x.isEmpty())
         return TRUE;
 
-    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;
     else if(Option::target_mode == Option::TARG_MACX_MODE && x == "macx")
@@ -602,7 +615,8 @@ 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;
 #ifdef Q_OS_UNIX
@@ -617,5 +631,5 @@ QMakeProject::isActiveConfig(const QString &x)
             if(r.findRev('/') != -1)
                 r = r.mid(r.findRev('/') + 1);
-            if(re.exactMatch(r))
+            if((regex && re.exactMatch(r)) || (!regex && r == x))
                 return TRUE;
         }
@@ -626,4 +640,5 @@ QMakeProject::isActiveConfig(const QString &x)
     QStringList &configs = vars["CONFIG"];
     for(QStringList::Iterator it = configs.begin(); it != configs.end(); ++it) {
+        if((regex && re.exactMatch((*it))) || (!regex && (*it) == x))
         if(re.exactMatch((*it)))
             return TRUE;
@@ -633,5 +648,5 @@ 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)
 {
     QStringList args = split_arg_list(params);
@@ -645,5 +660,5 @@ 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)
 {
     for(QStringList::Iterator arit = args.begin(); arit != args.end(); ++arit) {
@@ -655,4 +670,14 @@ QMakeProject::doProjectTest(QString func, QStringList args, QMap<QString, QStrin
     if(func == "requires") {
         return doProjectCheckReqs(args, place);
+    } else if(func == "equals") {
+        if(args.count() != 2) {
+            fprintf(stderr, "%s:%d: equals(variable, value) requires two arguments.\n", parser.file.latin1(),
+                    parser.line_no);
+            return FALSE;
+        }
+        QString value = args[1];
+        if((value.left(1) == "\"" || value.left(1) == "'") && value.right(1) == value.left(1))
+            value = value.mid(1, value.length()-2);
+        return vars[args[0]].join(" ") == value;
     } else if(func == "exists") {
         if(args.count() != 1) {
@@ -692,5 +717,5 @@ QMakeProject::doProjectTest(QString func, QStringList args, QMap<QString, QStrin
         QStringList &l = place[args[0]];
         for(QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
-            if(regx.exactMatch((*it))) 
+            if(regx.exactMatch((*it)))
                 return TRUE;
         }
@@ -806,6 +831,9 @@ QMakeProject::doProjectTest(QString func, QStringList args, QMap<QString, QStrin
         TestStatus sc = test_status;
         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;
         test_status = sc;
@@ -820,4 +848,9 @@ 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);
         fixEnvVariables(msg);
@@ -858,5 +891,5 @@ QMakeProject::doProjectCheckReqs(const QStringList &deps, QMap<QString, QStringL
             }
         } else {
-            test = isActiveConfig(chk);
+            test = isActiveConfig(chk, TRUE);
         }
         if(invert_test) {
@@ -878,116 +911,166 @@ QString
 QMakeProject::doVariableReplace(QString &str, const QMap<QString, QStringList> &place)
 {
-    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();
     }
     return str;
diff --git a/qmake/project.h b/qmake/project.h
index 201e63c..ec19f0c 100644
--- a/qmake/project.h
+++ b/qmake/project.h
@@ -6,5 +6,5 @@
 ** Created : 970521
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the network module of the Qt GUI Toolkit.
@@ -35,6 +35,6 @@
 **
 **********************************************************************/
-#ifndef __QMAKE_H__
-#define __QMAKE_H__
+#ifndef __PROJECT_H__
+#define __PROJECT_H__
 
 #include <qstringlist.h>
@@ -49,7 +49,7 @@ class QMakeProject
     QString pfile, cfile;
     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);
     QString doVariableReplace(QString &str, const QMap<QString, QStringList> &place);
@@ -58,5 +58,5 @@ public:
     QMakeProject();
 
-    bool read(QString project, QString pwd);
+    bool read(const QString &project, const QString &pwd, bool just_project=FALSE);
     QString projectFile();
     QString configFile();
@@ -66,9 +66,9 @@ public:
     QString first(const QString &v);
     QMap<QString, QStringList> &variables();
-    bool isActiveConfig(const QString &x);
+    bool isActiveConfig(const QString &x, bool regex=FALSE);
 
 protected:
     friend class MakefileGenerator;
-    bool read(QString file, QMap<QString, QStringList> &place);
+    bool read(const QString &file, QMap<QString, QStringList> &place);
 
 };
@@ -112,3 +112,3 @@ inline QMap<QString, QStringList> &QMakeProject::variables()
 { return vars; }
 
-#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
@@ -198,5 +198,6 @@ 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.
 
     If the array is expanded, the new bits are set to 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
@@ -197,6 +197,6 @@ bool QBuffer::open( int m  )
     setMode( m );
     if ( m & IO_Truncate ) {                    // truncate buffer
-        a.resize( 0 );
-        a_len = 0;
+        a.resize( 1 );
+        a_len = 1;
     }
     if ( m & IO_Append ) {                      // append to end of buffer
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
@@ -64,4 +64,8 @@ QComLibrary::~QComLibrary()
     if ( autoUnload() )
         unload();
+    if ( libiface )
+        libiface->release();
+    if ( entry )
+        entry->release();
 }
 
@@ -392,27 +396,25 @@ void QComLibrary::createInstanceInternal()
     bool warn_mismatch = TRUE;
 
-    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;
         }
     }
@@ -462,9 +464,4 @@ 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 );
         // delete the cache, which forces the settings to be written
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
@@ -1,11 +1,11 @@
 /* Install paths from configure */
 
-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";
 
 const char *qInstallPath()        { return QT_INSTALL_PREFIX;  }
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
@@ -4,6 +4,4 @@
 ** Implementation of QCriticalSection class
 **
-** 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
@@ -142,4 +142,15 @@ 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 );
 
@@ -300,5 +311,6 @@ 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
 
@@ -320,16 +332,22 @@ 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()
 */
 
 /*!
-  \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.
 */
 
@@ -380,18 +398,30 @@ QByteArray qCompress( const uchar* data, int nbytes )
 #endif
 
-/*! \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()
 */
 
 /*!
-  \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.
 */
 
@@ -937,4 +967,9 @@ int QCString::find( char c, int index, bool cs ) const
 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() )
         return -1;
@@ -943,5 +978,4 @@ int QCString::find( const char *str, int index, bool cs ) const
     if ( !*str )
         return index;
-    const uint l = length();
     const uint sl = qstrlen( str );
     if ( sl + index > l )
@@ -1153,6 +1187,7 @@ int QCString::contains( const char *str, bool cs ) const
     int count = 0;
     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++;
     return count;
@@ -1174,5 +1209,4 @@ int QCString::contains( const char *str, bool cs ) const
     \sa right(), mid()
 */
-
 QCString QCString::left( uint len ) const
 {
@@ -1498,12 +1532,14 @@ QCString &QCString::insert( uint index, const char *s )
             if ( index >= olen ) {              // insert after end of string
         detach();
-        if ( QByteArray::resize(nlen+index-olen+1) ) {
+        if ( QByteArray::resize(nlen+index-olen+1, QByteArray::SpeedOptim ) ) {
             memset( data()+olen, ' ', index-olen );
             memcpy( data()+index, s, len+1 );
         }
-            } 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 );
+        }
     }
     return *this;
@@ -1570,5 +1606,5 @@ QCString &QCString::remove( uint index, uint len )
         detach();
         memmove( data()+index, data()+index+len, olen-index-len+1 );
-        QByteArray::resize(olen-len+1);
+        QByteArray::resize(olen-len+1, QByteArray::SpeedOptim );
     }
     return *this;
@@ -1632,4 +1668,5 @@ QCString &QCString::replace( char c, const char *after )
     \endcode
 */
+
 QCString &QCString::replace( const char *before, const char *after )
 {
@@ -1647,5 +1684,5 @@ QCString &QCString::replace( const char *before, const char *after )
     if ( bl == al ) {
         if ( bl ) {
-            while( (index = find( before, index ) ) != -1 ) {
+            while( (index = find( before, index, TRUE, len ) ) != -1 ) {
                 memcpy( d+index, after, al );
                 index += bl;
@@ -1656,5 +1693,5 @@ QCString &QCString::replace( const char *before, const char *after )
         uint movestart = 0;
         uint num = 0;
-        while( (index = find( before, index ) ) != -1 ) {
+        while( (index = find( before, index, TRUE, len ) ) != -1 ) {
             if ( num ) {
                 int msize = index - movestart;
@@ -1687,5 +1724,5 @@ QCString &QCString::replace( const char *before, const char *after )
             uint pos = 0;
             while( pos < 4095 ) {
-                index = find(before, index);
+                index = find(before, index, TRUE, len);
                 if ( index == -1 )
                     break;
@@ -1764,5 +1801,5 @@ QCString &QCString::replace( char c1, char c2 )
 int QCString::find( const QRegExp& rx, int index ) const
 {
-    QString d = QString::fromLatin1( data() );
+    QString d = QString::fromAscii( data() );
     return d.find( rx, index );
 }
@@ -1784,5 +1821,5 @@ int QCString::find( const QRegExp& rx, int index ) const
 int QCString::findRev( const QRegExp& rx, int index ) const
 {
-    QString d = QString::fromLatin1( data() );
+    QString d = QString::fromAscii( data() );
     return d.findRev( rx, index );
 }
@@ -1809,5 +1846,5 @@ int QCString::findRev( const QRegExp& rx, int index ) const
 int QCString::contains( const QRegExp &rx ) const
 {
-    QString d = QString::fromLatin1( data() );
+    QString d = QString::fromAscii( data() );
     return d.contains( rx );
 }
@@ -1839,6 +1876,6 @@ int QCString::contains( const QRegExp &rx ) const
 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 );
     setStr( d.ascii() );
@@ -2200,5 +2237,5 @@ QCString& QCString::operator+=( const char *str )
     uint len1 = length();
     uint len2 = qstrlen(str);
-    if ( !QByteArray::resize( len1 + len2 + 1 ) )
+    if ( !QByteArray::resize( len1 + len2 + 1, QByteArray::SpeedOptim ) )
                 return *this;                   // no memory
     memcpy( data() + len1, str, len2 + 1 );
@@ -2216,5 +2253,5 @@ QCString &QCString::operator+=( char c )
     detach();
     uint len = length();
-    if ( !QByteArray::resize( len + 2 ) )
+    if ( !QByteArray::resize( len + 2, QByteArray::SpeedOptim  ) )
                 return *this;                   // no memory
     *(data() + len) = c;
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
@@ -751,6 +751,14 @@ QDataStream &QDataStream::readRawBytes( char *s, uint len )
             if ( printable ) {                  // printable data
         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
         dev->readBlock( s, len );
@@ -1013,7 +1021,13 @@ QDataStream &QDataStream::writeRawBytes( const char *s, uint len )
     CHECK_STREAM_PRECOND
             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
         dev->writeBlock( s, len );
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
@@ -6,5 +6,5 @@
 ** Created : 940124
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the tools module of the Qt GUI Toolkit.
@@ -36,5 +36,4 @@
 **********************************************************************/
 
-// Get the system specific includes and defines
 #include "qplatformdefs.h"
 
@@ -896,4 +895,10 @@ QDate QDate::addYears( int nyears ) const
     julianToGregorian( jd, y, m, d );
     y += nyears;
+
+    QDate tmp(y,m,1);
+    
+    if( d > tmp.daysInMonth() )
+        d = tmp.daysInMonth();
+
     QDate date(y, m, d);
     return date;
@@ -991,11 +996,23 @@ QDate QDate::currentDate( Qt::TimeSpec ts )
     d.jd = gregorianToJulian( t.wYear, t.wMonth, t.wDay );
 #else
+    // posix compliant system
     time_t ltime;
     time( &ltime );
     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 );
 #endif
@@ -1556,5 +1573,5 @@ int QTime::msecsTo( const QTime &t ) const
 
 
-/*!  
+/*!
     \overload
 
@@ -1654,13 +1671,24 @@ bool QTime::currentTime( QTime *ct, Qt::TimeSpec ts )
                      1000*t.wSecond + t.wMilliseconds );
 #elif defined(Q_OS_UNIX)
+    // posix compliant system
     struct timeval tv;
     gettimeofday( &tv, 0 );
     time_t ltime = tv.tv_sec;
     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 +
                      1000 * t->tm_sec + tv.tv_usec / 1000 );
@@ -1669,5 +1697,5 @@ bool QTime::currentTime( QTime *ct, Qt::TimeSpec ts )
     ::time( &ltime );
     tm *t;
-    if ( ts == Qt::LocalTime ) 
+    if ( ts == Qt::LocalTime )
         localtime( &ltime );
     else
@@ -1707,7 +1735,7 @@ bool QTime::isValid( int h, int m, int s, int ms )
     \code
     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
 
@@ -1961,4 +1989,20 @@ void QDateTime::setTime_t( uint secsSince1Jan1970UTC, Qt::TimeSpec ts )
     time_t tmp = (time_t) secsSince1Jan1970UTC;
     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 )
         brokenDown = localtime( &tmp );
@@ -1971,4 +2015,6 @@ void QDateTime::setTime_t( uint secsSince1Jan1970UTC, Qt::TimeSpec ts )
         }
     }
+#endif
+
     d.jd = QDate::gregorianToJulian( brokenDown->tm_year + 1900,
                                      brokenDown->tm_mon + 1,
@@ -2301,5 +2347,5 @@ 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
@@ -6,5 +6,5 @@
 ** Created : 950427
 **
-** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the tools module of the Qt GUI Toolkit.
@@ -44,11 +44,16 @@
 #include "qregexp.h"
 #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
 
 
 /*!
     \class QDir
+    \reentrant
     \brief The QDir class provides access to directory structures and their contents in a platform-independent way.
 
@@ -231,4 +236,12 @@ QDir::QDir( const QDir &d )
 }
 
+/*!
+    Refreshes the directory information.
+*/
+void QDir::refresh() const
+{
+    QDir* that = (QDir*) this;
+    that->dirty = TRUE;
+}
 
 void QDir::init()
@@ -383,8 +396,34 @@ 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;
 }
@@ -935,5 +974,6 @@ QDir &QDir::operator=( const QString &path )
     QDir d1( "/usr/local/bin" );
     QDir d2( "bin" );
-    if ( d1 != d2 ) qDebug( "They differ\n" ); // This is printed
+    if ( d1 != d2 )
+        qDebug( "They differ" );
     \endcode
 */
@@ -950,5 +990,6 @@ QDir &QDir::operator=( const QString &path )
     QDir d2( "bin" );
     d2.convertToAbs();
-    if ( d1 == d2 ) qDebug( "They're the same\n" ); // This is printed
+    if ( d1 == d2 )
+        qDebug( "They're the same" );
     \endcode
 */
@@ -1088,8 +1129,9 @@ 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;
 
     QChar sep( ';' );
@@ -1100,13 +1142,24 @@ QStringList qt_makeFilterList( const QString &filter )
     QStringList list = QStringList::split( sep, 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;
 }
 
+
 /*!
     \overload
@@ -1124,9 +1177,5 @@ bool QDir::match( const QStringList &filters, const QString &fileName )
     QStringList::ConstIterator sit = filters.begin();
     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) )
             return TRUE;
@@ -1148,6 +1197,5 @@ bool QDir::match( const QStringList &filters, const QString &fileName )
 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
@@ -6,5 +6,5 @@
 ** Created : 950628
 **
-** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the tools module of the Qt GUI Toolkit.
@@ -52,4 +52,5 @@
 #include <stdlib.h>
 #include <limits.h>
+#include <errno.h>
 
 
@@ -71,15 +72,14 @@ 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;
 }
@@ -91,10 +91,11 @@ bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const
     if (dirName[dirName.length() - 1] == "/")
         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;
 }
 
@@ -187,5 +188,5 @@ bool QDir::readDirEntries( const QString &nameFilter,
     }
 
-    QStringList filters = qt_makeFilterList( nameFilter );
+    QValueList<QRegExp> filters = qt_makeFilterList( nameFilter );
 
             bool doDirs             = (filterSpec & Dirs)!= 0;
@@ -198,9 +199,4 @@ bool QDir::readDirEntries( const QString &nameFilter,
     bool doSystem   = (filterSpec & System)     != 0;
 
-#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;
             DIR     *dir;
@@ -211,8 +207,17 @@ bool QDir::readDirEntries( const QString &nameFilter,
         return FALSE; // cannot read the directory
 
-    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;
         if  ( (doDirs && fi.isDir()) || (doFiles && fi.isFile()) ||
@@ -277,5 +282,6 @@ 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
@@ -89,5 +89,5 @@ extern bool qt_file_access( const QString& fn, int t );
         QString line;
         int i = 1;
-        while ( !stream.eof() ) {
+        while ( !stream.atEnd() ) {
             line = stream.readLine(); // line of text excluding '\n'
             printf( "%3d: %s\n", i++, line.latin1() );
@@ -291,4 +291,5 @@ 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.
 
     \sa size()
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
@@ -436,9 +436,12 @@ 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)
     return (uint)st.st_size > UINT_MAX ? UINT_MAX : (QIODevice::Offset)st.st_size;
@@ -539,5 +542,5 @@ Q_LONG QFile::readBlock( char *p, Q_ULONG len )
         uint l = ungetchBuffer.length();
         while( nread < l ) {
-            *p = ungetchBuffer[ l - nread - 1 ];
+            *p = ungetchBuffer.at( l - nread - 1 );
             p++;
             nread++;
@@ -630,5 +633,7 @@ 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.
 
   If the file is not open or there is an error, handle() returns -1.
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
@@ -636,4 +636,6 @@ QDateTime QFileInfo::lastRead() const
     is TRUE.
 
+    If the QFileInfo is empty it returns QDir::currentDirPath().
+
     This function can be time consuming under Unix (in the order of
     milliseconds).
@@ -645,5 +647,5 @@ QString QFileInfo::absFilePath() const
     QString tmp;
     if ( QDir::isRelativePath(fn)
-#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64)
+#if defined(Q_OS_WIN32)
          && fn[1] != ':'
 #endif
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
@@ -215,7 +215,7 @@ uint QFileInfo::groupId() const
         QFileInfo fi( "/tmp/archive.tar.gz" );
         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
@@ -36,7 +36,11 @@
 **********************************************************************/
 
-        #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
 
@@ -50,5 +54,11 @@
 #endif // QT_THREAD_SUPPORT
 
-        #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
 
 #undef NEW
@@ -136,5 +146,9 @@ QGArray::QGArray( int size )
     shd->data = NEW(char,size);
     Q_CHECK_PTR( shd->data );
-    shd->len = size;
+    shd->len =
+#ifdef QT_QGARRAY_SPEED_OPTIM
+        shd->maxl =
+#endif
+        size;
 }
 
@@ -213,10 +227,18 @@ 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;
             if ( newsize == 0 ) {               // remove array
@@ -224,15 +246,34 @@ bool QGArray::resize( uint newsize )
         return TRUE;
     }
+
+    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
 #if defined(DONT_USE_REALLOC)
                 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);
         shd->data = newdata;
 #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);
     }
             if ( !shd->data )                   // no memory
@@ -242,4 +283,12 @@ bool QGArray::resize( uint newsize )
 }
 
+/*!\overload
+*/
+bool QGArray::resize( uint newsize )
+{
+    return resize( newsize, MemOptim );
+}
+
+
 /*!
   Fills the array with the repeated occurrences of \a d, which is
@@ -320,5 +369,9 @@ 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;
 }
@@ -365,5 +418,9 @@ QGArray &QGArray::duplicate( const QGArray &a )
         shd->data = 0;
     }
-    shd->len = a.shd->len;
+    shd->len =
+#ifdef QT_QGARRAY_SPEED_OPTIM
+        shd->maxl =
+#endif
+        a.shd->len;
     if ( oldptr )
         DELETE(oldptr);
@@ -403,5 +460,9 @@ 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;
 }
@@ -660,5 +721,6 @@ 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
 
@@ -678,5 +740,6 @@ 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
@@ -205,5 +205,8 @@ QGDict::QGDict( uint len, KeyType kt, bool caseSensitive, bool copyKeys )
 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 );
     memset( (char*)vec, 0, vlen*sizeof(QBaseBucket*) );
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
@@ -330,10 +330,6 @@ QLNode *QGList::locate( uint index )
             bool forward;                       // direction to traverse
 
-    if ( index >= numNodes ) {
-#if defined(QT_CHECK_RANGE)
-        qWarning( "QGList::locate: Index %d out of range", index );
-#endif
+    if ( index >= numNodes )
         return 0;
-    }
 
     if ( distance < 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
@@ -150,5 +150,26 @@ 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;
 
@@ -322,5 +343,17 @@ 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)
 {
     const int maxlen = 255;
@@ -338,5 +371,5 @@ 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)
 {
     return p_str(s, s.length());
@@ -642,6 +675,6 @@ void qSystemWarning( const char* msg, int code )
     \relates QApplication
 
-    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.
 
     This is really a macro defined in \c qglobal.h.
@@ -653,5 +686,5 @@ void qSystemWarning( const char* msg, int code )
         Q_CHECK_PTR( a = new int[80] );  // WRONG!
 
-        a = new int[80];                 // Right
+        a = new (nothrow) int[80];       // Right
         Q_CHECK_PTR( a );
     \endcode
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
@@ -4,5 +4,5 @@
 ** Implementation of QGPluginManager class
 **
-** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2003 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the tools module of the Qt GUI Toolkit.
@@ -476,5 +476,5 @@ bool QGPluginManager::addLibrary( QLibrary* lib )
             fl << cpiFace->name();
 
-        for ( QStringList::Iterator f = fl.begin(); f != fl.end(); f++ ) {
+        for ( QStringList::Iterator f = fl.begin(); f != fl.end(); ++f ) {
             QLibrary *old = plugDict[*f];
             if ( !old ) {
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
@@ -36,4 +36,10 @@
 **********************************************************************/
 
+#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
 #include "qgvector.h"
@@ -394,5 +400,6 @@ 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
@@ -4,7 +4,7 @@
 ** Implementation of QLibrary class
 **
-** Created : 2000-01-01
+** Created : 000101
 **
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2003 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the tools module of the Qt GUI Toolkit.
@@ -72,5 +72,5 @@ QLibraryPrivate::QLibraryPrivate( QLibrary *lib )
 
     \mainclass
-    \group plugins
+    \ingroup plugins
 
     An instance of a QLibrary object can handle a single shared
@@ -327,12 +327,13 @@ QString QLibrary::library() const
         filename += ".dylib";
 #else
-    if ( filename.find( ".so" ) == -1 ) {
+    QString filter = ".so";
+    if ( filename.find(filter) == -1 ) {
         const int x = filename.findRev( "/" );
         if ( x != -1 ) {
             QString path = filename.left( x + 1 );
             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
@@ -4,5 +4,5 @@
 ** Implementation of QLibraryPrivate class
 **
-** Created : 2000-01-01
+** Created : 000101
 **
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
@@ -54,5 +54,22 @@
 */
 
-#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
 
 bool QLibraryPrivate::loadLibrary()
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
@@ -44,6 +44,7 @@ typedef pthread_mutex_t     Q_MUTEX_T;
 // POSIX threads mutex types
 #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))
 #  if defined(QT_CHECK_RANGE)
@@ -662,5 +663,6 @@ 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.
 
     \sa QMutex::lock()
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,2 +1,37 @@
+/****************************************************************************
+** $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"
 
@@ -4,23 +39,7 @@
 
 #include <qthread.h>
-#include <stdio.h>
 
 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;
 
 /*!
@@ -86,7 +105,10 @@ 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;
+    }
 }
 
@@ -98,9 +120,10 @@ 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;
 }
 
@@ -111,8 +134,7 @@ QMutexPool::~QMutexPool()
 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
 
@@ -120,10 +142,10 @@ QMutex *QMutexPool::get( void *address )
         // we need to check once again that the mutex hasn't been created, since
         // 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 );
         }
     }
 
-    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
@@ -264,13 +264,13 @@
          \i This matches any character (including newline).
     \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>
          \i This matches a non-digit.
     \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>
          \i This matches a non-whitespace.
     \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>
          \i This matches a non-word character.
@@ -548,5 +548,12 @@
 
     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
 
     Both zero-width positive and zero-width negative lookahead
@@ -678,9 +685,9 @@
 
     \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
 
@@ -716,4 +723,9 @@ const int InftyRep = 1025;
 const int EOS = -1;
 
+static bool isWord( QChar ch )
+{
+    return ch.isLetterOrNumber() || ch == QChar( '_' );
+}
+
 /*
   Merges two QMemArrays of ints and puts the result into the first one.
@@ -1681,7 +1693,7 @@ bool QRegExpEngine::testAnchor( int i, int a, const int *capBegin )
         bool after = FALSE;
         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) )
             return FALSE;
@@ -2633,5 +2645,12 @@ int QRegExpEngine::getEscape()
     case 'W':
         // 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;
 #endif
@@ -2653,4 +2672,5 @@ int QRegExpEngine::getEscape()
         // see QChar::isLetterOrNumber()
         yyCharClass->addCategories( 0x000f8070 );
+        yyCharClass->addSingleton( 0x005f ); // '_'
         return Tok_CharClass;
 #endif
@@ -3184,5 +3204,6 @@ static QRegExpEngine *newEngine( const QString& pattern, bool caseSensitive )
     if ( engineCache != 0 ) {
 #ifdef QT_THREAD_SUPPORT
-        QMutexLocker locker( qt_global_mutexpool->get( &engineCache ) );
+        QMutexLocker locker( qt_global_mutexpool ?
+                             qt_global_mutexpool->get( &engineCache ) : 0 );
 #endif
         QRegExpEngine *eng = engineCache->take( pattern );
@@ -3200,9 +3221,10 @@ static QRegExpEngine *newEngine( const QString& pattern, bool caseSensitive )
 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 ) {
             engineCache = new QCache<QRegExpEngine>;
@@ -3566,11 +3588,4 @@ int QRegExp::match( const QString& str, int index, int *len,
 #endif // QT_NO_COMPAT
 
-/*!
-    \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
 {
@@ -3626,11 +3641,4 @@ 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
 {
@@ -3695,5 +3703,5 @@ 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
@@ -184,16 +184,15 @@ int QSemaphore::operator+=(int n)
     d->mutex.lock();
 
+    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)
         d->cond.wait(&(d->mutex));
 
     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;
 
@@ -213,13 +212,12 @@ int QSemaphore::operator-=(int n)
     d->mutex.lock();
 
-    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
@@ -4,5 +4,5 @@
 ** Implementation of QSettings class
 **
-** Created: 2000.06.26
+** Created : 000626
 **
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
@@ -64,27 +64,27 @@ 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.
 
     Example settings:
@@ -102,12 +102,11 @@ static inline int qt_open( const char *pathname, int flags, mode_t mode )
     Each line above is a complete key, made up of subkeys.
 
-    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 );
     // ...
     \endcode
@@ -116,11 +115,27 @@ static inline int qt_open( const char *pathname, int flags, mode_t mode )
     \code
     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 );
     // ...
     \endcode
 
+    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
     a list of key-holding keys using subkeyList().
@@ -140,8 +155,4 @@ static inline int qt_open( const char *pathname, int flags, mode_t mode )
     \endcode
 
-    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
     limits as follows:
@@ -153,5 +164,23 @@ static inline int qt_open( const char *pathname, int flags, mode_t mode )
     \endlist
 
-    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
 
     \section1 Notes for Unix Applications
@@ -301,5 +330,5 @@ 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
         qWarning( "QSettings: openlock failed!" );
@@ -309,10 +338,10 @@ static HANDLE openlock( const QString &name, int /*type*/ )
 }
 
-void closelock( HANDLE fd )
+static void closelock( HANDLE fd )
 {
     if ( !fd )
         return;
 
-    if ( !UnlockFile( fd, 0, 0, -1, -1 ) ) {
+    if ( !UnlockFile( fd, 0, 0, (DWORD)-1, (DWORD)-1 ) ) { // ### (DWORD)-1 ???
 #ifdef QT_CHECK_STATE
         qWarning( "QSettings: closelock failed!");
@@ -456,7 +485,9 @@ QSettingsPrivate::QSettingsPrivate( QSettings::Format format )
     : groupDirty( TRUE ), modified(FALSE), globalScope(TRUE)
 {
-#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
 
@@ -507,4 +538,6 @@ QSettingsPrivate::QSettingsPrivate( QSettings::Format format )
 #if defined(QT_CHECK_STATE)
             qWarning("QSettings: error creating %s", dir.path().latin1());
+#else
+            ;
 #endif
     }
@@ -531,4 +564,6 @@ QSettingsGroup QSettingsPrivate::readGroup()
     if (grpit == hd.end()) {
         QStringList::Iterator it = searchPaths.begin();
+        if ( !globalScope )
+            ++it;
         while (it != searchPaths.end()) {
             QString filebase = heading.lower().replace(QRegExp("\\s+"), "_");
@@ -565,4 +600,6 @@ void QSettingsPrivate::removeGroup(const QString &key)
     if (grpit == hd.end()) {
         QStringList::Iterator it = searchPaths.begin();
+        if ( !globalScope )
+            ++it;
         while (it != searchPaths.end()) {
             QString filebase = heading.lower().replace(QRegExp("\\s+"), "_");
@@ -616,4 +653,6 @@ void QSettingsPrivate::writeGroup(const QString &key, const QString &value)
     if (grpit == hd.end()) {
         QStringList::Iterator it = searchPaths.begin();
+        if ( !globalScope )
+            ++it;
         while (it != searchPaths.end()) {
             QString filebase = heading.lower().replace(QRegExp("\\s+"), "_");
@@ -650,4 +689,6 @@ QDateTime QSettingsPrivate::modificationTime()
 
     QStringList::Iterator it = searchPaths.begin();
+    if ( !globalScope )
+        ++it;
     while (it != searchPaths.end()) {
         QFileInfo fi((*it++) + "/" + heading + "rc");
@@ -659,5 +700,5 @@ QDateTime QSettingsPrivate::modificationTime()
 }
 
-static bool verifyKey( const QString &key )
+bool qt_verify_key( const QString &key )
 {
     if ( key.isEmpty() || key[0] != '/' || key.contains( QRegExp("[=\\\\r\\\\n" ) ) )
@@ -668,6 +709,12 @@ static bool verifyKey( const QString &key )
 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;
 }
@@ -687,5 +734,5 @@ static inline QString groupKey( const QString &group, const QString &key )
   When reading settings the folders are searched forwards from the
   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.
   \list 1
@@ -711,5 +758,5 @@ static inline QString groupKey( const QString &group, const QString &key )
   \endlist
   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.
 
@@ -758,5 +805,5 @@ static inline QString groupKey( const QString &group, const QString &key )
 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 ) {
         d->sysInsertSearchPath( s, path );
@@ -765,5 +812,14 @@ void QSettings::insertSearchPath( System s, const QString &path)
 #endif
 
-    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)
         qWarning( "QSettings::insertSearchPath: Invalid key: '%s'", path.isNull() ? "(null)" : path.latin1() );
@@ -772,10 +828,10 @@ 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 ) {
 #else
     if ( s != Unix ) {
 #endif
-#ifdef Q_OS_MAC
+#if !defined(QWS) && defined(Q_OS_MAC)
         if(s != Mac) //mac is respected on the mac as well
 #endif
@@ -783,7 +839,13 @@ 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);
     }
 }
@@ -799,5 +861,5 @@ void QSettings::insertSearchPath( System s, const QString &path)
 void QSettings::removeSearchPath( System s, const QString &path)
 {
-    if ( !verifyKey( path ) ) {
+    if ( !qt_verify_key( path ) ) {
 #if defined(QT_CHECK_STATE)
         qWarning( "QSettings::insertSearchPath: Invalid key: '%s'", path.isNull() ? "(null)" : path.latin1() );
@@ -812,10 +874,10 @@ 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 ) {
 #else
     if ( s != Unix ) {
 #endif
-#ifdef Q_OS_MAC
+#if !defined(QWS) && defined(Q_OS_MAC)
         if(s != Mac) //mac is respected on the mac as well
 #endif
@@ -838,5 +900,5 @@ QSettings::QSettings()
     Q_CHECK_PTR(d);
 
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     d->sysd = 0;
     d->sysInit();
@@ -855,5 +917,5 @@ QSettings::QSettings( Format format )
     Q_CHECK_PTR(d);
 
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     d->sysd = 0;
     if ( format == Native )
@@ -873,5 +935,5 @@ QSettings::~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 )
         d->sysClear();
@@ -888,5 +950,5 @@ QSettings::~QSettings()
 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 )
         return d->sysSync();
@@ -906,4 +968,6 @@ bool QSettings::sync()
 
         QStringList::Iterator pit = d->searchPaths.begin();
+        if ( !d->globalScope )
+            ++pit;
         while (pit != d->searchPaths.end()) {
             QString filebase = it.key().lower().replace(QRegExp("\\s+"), "_");
@@ -918,7 +982,7 @@ bool QSettings::sync()
         }
 
-        it++;
+        ++it;
 
-        if (file.name().isNull() || file.name().isEmpty()) {
+        if ( file.name().isEmpty() ) {
 
 #ifdef QT_CHECK_STATE
@@ -964,5 +1028,5 @@ bool QSettings::sync()
 
                     stream << grpit.key() << "=" << v << endl;
-                    grpit++;
+                    ++grpit;
                 }
 
@@ -970,5 +1034,5 @@ bool QSettings::sync()
             }
 
-            hdit++;
+            ++hdit;
         }
 
@@ -1009,5 +1073,5 @@ bool QSettings::sync()
 bool QSettings::readBoolEntry(const QString &key, bool def, bool *ok )
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
         qWarning( "QSettings::readBoolEntry: Invalid key: '%s'", key.isNull() ? "(null)" : key.latin1() );
@@ -1019,11 +1083,10 @@ 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 );
 
     if (value.lower() == "true")
@@ -1061,5 +1124,5 @@ bool QSettings::readBoolEntry(const QString &key, bool def, bool *ok )
 double QSettings::readDoubleEntry(const QString &key, double def, bool *ok )
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
         qWarning( "QSettings::readDoubleEntry: Invalid key: '%s'", key.isNull() ? "(null)" : key.latin1() );
@@ -1071,11 +1134,10 @@ 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;
     double retval = value.toDouble( &conv_ok );
@@ -1107,5 +1169,5 @@ double QSettings::readDoubleEntry(const QString &key, double def, bool *ok )
 int QSettings::readNumEntry(const QString &key, int def, bool *ok )
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
         qWarning( "QSettings::readNumEntry: Invalid key: '%s'", key.isNull() ? "(null)" : key.latin1() );
@@ -1116,12 +1178,10 @@ 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;
     int retval = value.toInt( &conv_ok );
@@ -1153,5 +1213,5 @@ int QSettings::readNumEntry(const QString &key, int def, bool *ok )
 QString QSettings::readEntry(const QString &key, const QString &def, bool *ok )
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
         qWarning( "QSettings::readEntry: Invalid key: '%s'", key.isNull() ? "(null)" : key.latin1() );
@@ -1165,5 +1225,5 @@ QString QSettings::readEntry(const QString &key, const QString &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->sysReadEntry( theKey, def, ok );
@@ -1207,9 +1267,11 @@ 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;
 }
@@ -1229,5 +1291,5 @@ QString QSettings::readEntry(const QString &key, const QString &def, bool *ok )
 bool QSettings::writeEntry(const QString &key, bool value)
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
         qWarning( "QSettings::writeEntry: Invalid key: '%s'", key.isNull() ? "(null)" : key.latin1() );
@@ -1236,12 +1298,10 @@ 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);
 }
 #endif
@@ -1261,5 +1321,5 @@ bool QSettings::writeEntry(const QString &key, bool value)
 bool QSettings::writeEntry(const QString &key, double value)
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
         qWarning( "QSettings::writeEntry: Invalid key: '%s'", key.isNull() ? "(null)" : key.latin1() );
@@ -1268,12 +1328,10 @@ 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);
 }
 
@@ -1292,5 +1350,5 @@ bool QSettings::writeEntry(const QString &key, double value)
 bool QSettings::writeEntry(const QString &key, int value)
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
         qWarning( "QSettings::writeEntry: Invalid key: '%s'", key.isNull() ? "(null)" : key.latin1() );
@@ -1299,12 +1357,10 @@ 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);
 }
 
@@ -1328,5 +1384,5 @@ bool QSettings::writeEntry(const QString &key, int value)
 bool QSettings::writeEntry(const QString &key, const char *value)
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
         qWarning( "QSettings::writeEntry: Invalid key: '%s'", key.isNull() ? "(null)" : key.latin1() );
@@ -1335,7 +1391,5 @@ bool QSettings::writeEntry(const QString &key, const char *value)
     }
 
-    QString theKey = groupKey( group(), key );
-
-    return writeEntry(theKey, QString(value));
+    return writeEntry(key, QString(value));
 }
 
@@ -1355,5 +1409,5 @@ bool QSettings::writeEntry(const QString &key, const char *value)
 bool QSettings::writeEntry(const QString &key, const QString &value)
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
         qWarning( "QSettings::writeEntry: Invalid key: '%s'", key.isNull() ? "(null)" : key.latin1() );
@@ -1364,5 +1418,5 @@ bool QSettings::writeEntry(const QString &key, const QString &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 );
@@ -1416,5 +1470,5 @@ bool QSettings::writeEntry(const QString &key, const QString &value)
 bool QSettings::removeEntry(const QString &key)
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
         qWarning( "QSettings::removeEntry: Invalid key: '%s'", key.isNull() ? "(null)" : key.latin1() );
@@ -1425,5 +1479,5 @@ bool QSettings::removeEntry(const QString &key)
     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->sysRemoveEntry( theKey );
@@ -1495,5 +1549,5 @@ bool QSettings::removeEntry(const QString &key)
 QStringList QSettings::entryList(const QString &key) const
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
         qWarning( "QSettings::entryList: Invalid key: %s", key.isNull() ? "(null)" : key.latin1() );
@@ -1504,5 +1558,5 @@ QStringList QSettings::entryList(const QString &key) const
     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->sysEntryList( theKey );
@@ -1545,5 +1599,5 @@ QStringList QSettings::entryList(const QString &key) const
     while (it != grp.end()) {
         itkey = it.key();
-        it++;
+        ++it;
 
         if ( realkey.length() > 0 ) {
@@ -1592,5 +1646,5 @@ QStringList QSettings::entryList(const QString &key) const
 QStringList QSettings::subkeyList(const QString &key) const
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
         qWarning( "QSettings::subkeyList: Invalid key: %s", key.isNull() ? "(null)" : key.latin1() );
@@ -1601,5 +1655,5 @@ QStringList QSettings::subkeyList(const QString &key) const
     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->sysSubkeyList( theKey );
@@ -1607,4 +1661,5 @@ QStringList QSettings::subkeyList(const QString &key) const
 
     QString realkey;
+    int subkeycount = 2;
     if (theKey[0] == '/') {
         // parse our key
@@ -1619,4 +1674,6 @@ QStringList QSettings::subkeyList(const QString &key) const
         }
 
+        subkeycount = list.count();
+
         if (list.count() == 1) {
             d->heading = list[0];
@@ -1633,14 +1690,26 @@ QStringList QSettings::subkeyList(const QString &key) const
             realkey = list.join("/");
         }
+
     } else
         realkey = theKey;
 
+    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;
     while (it != grp.end()) {
         itkey = it.key();
-        it++;
+        ++it;
 
         if ( realkey.length() > 0 ) {
@@ -1671,5 +1740,5 @@ QStringList QSettings::subkeyList(const QString &key) const
 QDateTime QSettings::lastModficationTime(const QString &key)
 {
-    if ( !verifyKey( key ) ) {
+    if ( !qt_verify_key( key ) ) {
 #if defined(QT_CHECK_STATE)
         qWarning( "QSettings::lastModficationTime: Invalid key: '%s'", key.isNull() ? "(null)" : key.latin1() );
@@ -1680,5 +1749,5 @@ QDateTime QSettings::lastModficationTime(const QString &key)
     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 QDateTime();
@@ -1716,7 +1785,15 @@ QDateTime QSettings::lastModficationTime(const QString &key)
     is created if it doesn't exist. Any previous value is overwritten
     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.
 
     If an error occurs the settings are left unchanged and FALSE is
@@ -1769,4 +1846,11 @@ bool QSettings::writeEntry(const QString &key, const QStringList &value)
     key was read, otherwise \a *ok is set to FALSE.
 
+    \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
     over a copy, e.g.
@@ -1848,17 +1932,24 @@ 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).
 */
 
@@ -1874,5 +1965,5 @@ void QSettings::setPath( const QString &domain, const QString &product, Scope sc
 //    Note that on most installations, not all users can write to the System
 //    scope.
-//    
+//
 //    On MacOS X, if there is no "." in domain, append ".com", then reverse the
 //    order of the elements (Mac OS uses "com.apple.finder" as domain+product).
@@ -1881,4 +1972,6 @@ void QSettings::setPath( const QString &domain, const QString &product, Scope sc
 //    Note that on most installations, not all users can write to the System
 //    scope.
+    d->globalScope = scope == Global;
+
     QString actualSearchPath;
     int lastDot = domain.findRev( '.' );
@@ -1887,9 +1980,9 @@ void QSettings::setPath( const QString &domain, const QString &product, Scope sc
     actualSearchPath = "/" + domain.mid( 0, lastDot ) + "/" + product;
     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 );
 #else
@@ -1897,10 +1990,15 @@ void QSettings::setPath( const QString &domain, const QString &product, Scope sc
     insertSearchPath( Unix, actualSearchPath );
 #endif
-
-    d->globalScope = scope == Global;
 }
 
 /*!
     Appends \a group to the current key prefix.
+
+    \code
+    QSettings settings;
+    settings.beginGroup( "/MainWindow" );
+    // read values
+    settings.endGroup();
+    \endcode
 */
 void QSettings::beginGroup( const QString &group )
@@ -1913,4 +2011,11 @@ void QSettings::beginGroup( const QString &group )
     Undo previous calls to beginGroup(). Note that a single beginGroup("a/b/c") is undone
     by a single call to endGroup().
+
+    \code
+    QSettings settings;
+    settings.beginGroup( "/MainWindow/Geometry" );
+    // read values
+    settings.endGroup();
+    \endcode
 */
 void QSettings::endGroup()
@@ -1946,5 +2051,5 @@ QString QSettings::group() const
             ++it;
             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
@@ -6,5 +6,5 @@
 ** Created : 920722
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the tools module of the Qt GUI Toolkit.
@@ -48,9 +48,9 @@
 #include "qtextcodec.h"
 #endif
-#include <ctype.h>
 #include <limits.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #if defined(Q_WS_WIN)
 #include "qt_windows.h"
@@ -60,4 +60,8 @@
 #endif
 
+#ifdef QT_NO_UNICODETABLES
+# include <ctype.h>
+#endif
+
 
 /* -------------------------------------------------------------------------
@@ -11788,4 +11792,5 @@ static inline QChar::Direction direction( const QChar &c )
     return (QChar::Direction) ( *(rowp+c.cell()) & 0x1f );
 #else
+    Q_UNUSED(c);
     return QChar::DirL;
 #endif
@@ -11800,4 +11805,5 @@ static inline bool mirrored( const QChar &c )
     return *(rowp+c.cell())>128;
 #else
+    Q_UNUSED(c);
     return FALSE;
 #endif
@@ -11901,5 +11907,5 @@ static uint computeNewMax( uint len )
     while ( newMax < len )
         newMax *= 2;
-    // try to spare some memory
+    // try to save some memory
     if ( newMax >= 1024 * 1024 && len <= newMax - (newMax >> 2) )
         newMax -= newMax >> 2;
@@ -12892,5 +12898,5 @@ void QString::compose()
 */
 
-QChar* QString::asciiToUnicode( const QByteArray& ba, uint* len )
+QChar* QString::latin1ToUnicode( const QByteArray& ba, uint* len )
 {
     if ( ba.isNull() ) {
@@ -12911,5 +12917,5 @@ QChar* QString::asciiToUnicode( const QByteArray& ba, uint* len )
 }
 
-static QChar* internalAsciiToUnicode( const QByteArray& ba, uint* len )
+static QChar* internalLatin1ToUnicode( const QByteArray& ba, uint* len )
 {
     if ( ba.isNull() ) {
@@ -12941,5 +12947,5 @@ 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 )
 {
     QChar* result = 0;
@@ -12951,5 +12957,5 @@ QChar* QString::asciiToUnicode( const char *str, uint* len, uint maxlen )
         } else {
             // Faster?
-            l = qstrlen(str);
+            l = strlen( str );
         }
         QChar *uc = new QChar[ l ]; // Can't use macro since function is public
@@ -12964,5 +12970,5 @@ 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 )
 {
@@ -12975,5 +12981,5 @@ static QChar* internalAsciiToUnicode( const char *str, uint* len,
         } else {
             // Faster?
-            l = qstrlen(str);
+            l = strlen( str );
         }
         QChar *uc = QT_ALLOC_QCHAR_VEC( l );
@@ -12995,5 +13001,5 @@ static QChar* internalAsciiToUnicode( const char *str, uint* len,
     delete[].
 */
-char* QString::unicodeToAscii(const QChar *uc, uint l)
+char* QString::unicodeToLatin1(const QChar *uc, uint l)
 {
     if (!uc) {
@@ -13158,33 +13164,4 @@ 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
-
 /*!
     \fn QString::QString()
@@ -13212,5 +13189,4 @@ QString::QString( const QString &s ) :
     d(s.d)
 {
-    Q2HELPER(stat_fast_copy++)
     d->ref();
 }
@@ -13231,11 +13207,8 @@ 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 );
         d = new QStringData( uc, 0, l );
     } else {
-        Q2HELPER(stat_construct_null++)
         d = shared_null ? shared_null : (shared_null=new QStringData);
         d->ref();
@@ -13250,7 +13223,13 @@ QString::QString( int size, bool /*dummy*/ )
 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);
 }
@@ -13303,10 +13282,37 @@ QString::QString( const QChar* unicode, uint length )
 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
 
 /*!
@@ -13334,8 +13340,8 @@ void QString::real_detach()
 void QString::deref()
 {
-    if ( d->deref() ) {
+    if ( d && d->deref() ) {
         if ( d != shared_null )
             delete d;
-        d = 0; // helps debugging
+        d = 0;
     }
 }
@@ -13353,4 +13359,13 @@ 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 )
 
@@ -13369,5 +13384,4 @@ void QStringData::deleteSelf()
 QString &QString::operator=( const QString &s )
 {
-    Q2HELPER(stat_fast_copy++)
     s.d->ref();
     deref();
@@ -13384,5 +13398,5 @@ QString &QString::operator=( const QString &s )
 QString &QString::operator=( const QCString& cs )
 {
-    return setLatin1(cs);
+    return setAscii(cs);
 }
 
@@ -13400,5 +13414,5 @@ QString &QString::operator=( const QCString& cs )
 QString &QString::operator=( const char *str )
 {
-    return setLatin1(str);
+    return setAscii(str);
 }
 
@@ -13472,6 +13486,5 @@ void QString::truncate( uint newLen )
     space allocated contains arbitrary data.
 
-    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).
 
     If it is not possible to allocate enough memory, the string
@@ -13487,10 +13500,10 @@ void QString::truncate( uint newLen )
     \code
         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
 
@@ -13506,6 +13519,4 @@ void QString::setLength( uint newLen )
          ( newLen * 4 < d->maxl && d->maxl > 4 ) ) {
         // detach, grow or shrink
-        Q2HELPER(stat_copy_on_write++)
-        Q2HELPER(stat_copy_on_write_size+=d->len)
         uint newMax = computeNewMax( newLen );
         QChar* nd = QT_ALLOC_QCHAR_VEC( newMax );
@@ -13531,19 +13542,18 @@ void QString::setLength( uint newLen )
     text, whereas a negative value will produce left-aligned text.
 
+    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.
 
     If there is no place marker (\c %1 or \c %2, etc.), a warning
@@ -13775,5 +13785,5 @@ QString &QString::sprintf( const char* cformat, ... )
         return *this;
     }
-    QString format = fromLatin1( cformat );
+    QString format = fromAscii( cformat );
 
     QRegExp escape( "%#?0?-? ?\\+?'?[0-9*]*\\.?[0-9*]*h?l?L?q?Z?" );
@@ -13914,5 +13924,5 @@ QString &QString::sprintf( const char* cformat, ... )
                 }
             }
-            replacement = fromLatin1( out );
+            replacement = fromAscii( out );
         }
         result += replacement;
@@ -14125,6 +14135,8 @@ int QString::find( const QString& str, int index, bool cs ) const
         return index;
 
+#ifndef MACOSX_101
     if ( sl == 1 )
         return find( *str.unicode(), index, cs );
+#endif
 
     // we use the Boyer-Moore algorithm in cases where the overhead
@@ -14222,4 +14234,7 @@ int QString::find( const QString& str, int index, bool cs ) const
 int QString::findRev( QChar c, int index, bool cs ) const
 {
+#ifdef MACOSX_101
+    return findRev( QString( c ), index, cs );
+#else
     const uint l = length();
     if ( index < 0 )
@@ -14238,4 +14253,5 @@ int QString::findRev( QChar c, int index, bool cs ) const
     }
     return uc - end;
+#endif
 }
 
@@ -14274,6 +14290,8 @@ int QString::findRev( const QString& str, int index, bool cs ) const
         index = delta;
 
+#ifndef MACOSX_101
     if ( sl == 1 )
         return findRev( *str.unicode(), index, cs );
+#endif
 
     const QChar* needle = str.unicode();
@@ -14980,17 +14998,22 @@ QString QString::rightJustify( uint width, QChar fill, bool truncate ) const
 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;
 }
 
@@ -15008,17 +15031,22 @@ QString QString::lower() const
 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;
 }
 
@@ -15138,6 +15166,6 @@ QString &QString::insert( uint index, const QString &s )
     \overload
 
-    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.
 */
 
@@ -15252,4 +15280,14 @@ 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()
+ */
+
 /*!
   \overload
@@ -15849,7 +15887,7 @@ 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;
     int neg = 0;
@@ -15884,13 +15922,11 @@ 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;
         val = base * val + dv;
         p++;
     }
-    if ( neg )
-        val = -val;
     while ( l && p->isSpace() )                 // skip trailing space
-        l--,p++;
+        l--, p++;
     if ( !l )
         is_ok = TRUE;
@@ -15898,5 +15934,5 @@ bye:
     if ( ok )
         *ok = is_ok;
-    return is_ok ? val : 0;
+    return is_ok ? ( neg ? -( (long) val ) : (long) val ) : 0L;
 }
 
@@ -15916,5 +15952,5 @@ ulong QString::toULong( bool *ok, int base ) const
     ulong val = 0;
     int l = length();
-    const ulong max_mult = UINT_MAX / base;
+    const ulong max_mult = ULONG_MAX / base;
     bool is_ok = FALSE;
     if ( !p )
@@ -15941,5 +15977,5 @@ ulong QString::toULong( bool *ok, int base ) const
                 dv = *p - 'A' + 10;
         }
-        if ( val > max_mult || (val == max_mult && dv > UINT_MAX % base) )
+        if ( val > max_mult || (val == max_mult && dv > ULONG_MAX % base) )
             goto bye;
         val = base * val + dv;
@@ -15968,5 +16004,5 @@ 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;
         v = 0;
@@ -15987,5 +16023,5 @@ 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;
         v = 0;
@@ -16014,5 +16050,10 @@ ushort QString::toUShort( bool *ok, int base ) const
 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;
 }
 
@@ -16029,5 +16070,10 @@ int QString::toInt( bool *ok, int base ) const
 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;
 }
 
@@ -16053,5 +16099,5 @@ double QString::toDouble( bool *ok ) const
     double val = strtod( a ? a : "", &end );
     if ( ok )
-        *ok = ( a && *a && (end == 0 || (end - a) == (int)length()) );
+        *ok = ( a && *a && (end == 0 || *end == '\0') );
     return val;
 }
@@ -16099,9 +16145,9 @@ QString &QString::setNum( long n, int base )
     if ( n < 0 ) {
         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;
             return *this;
@@ -16462,4 +16508,13 @@ 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 )
   \overload
@@ -16491,7 +16546,13 @@ QString& QString::operator+=( const QString &str )
   Appends \a str to the string and returns a reference to the string.
 */
+#ifndef QT_NO_CAST_ASCII
 QString& QString::operator+=( const char *str )
 {
     if ( str ) {
+#ifndef QT_NO_TEXTCODEC
+        if ( QTextCodec::codecForCStrings() )
+            return operator+=( fromAscii( str ) );
+#endif
+
         uint len1 = length();
         uint len2 = strlen( str );
@@ -16509,4 +16570,5 @@ QString& QString::operator+=( const char *str )
     return *this;
 }
+#endif
 
 /*! \overload
@@ -16530,4 +16592,8 @@ QString &QString::operator+=( QChar c )
 QString &QString::operator+=( char c )
 {
+#ifndef QT_NO_TEXTCODEC
+    if ( QTextCodec::codecForCStrings() )
+        return operator+=( fromAscii( &c, 1 ) );
+#endif
     setLength(length()+1);
     d->unicode[length()-1] = c;
@@ -16542,4 +16608,11 @@ 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.
+*/
+
 
 
@@ -16547,11 +16620,11 @@ QString &QString::operator+=( char c )
     \fn char QChar::latin1() const
 
-    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.
 */
 
 
 /*!
-    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
     characters. If you want to convert strings into formats other than
@@ -16564,12 +16637,11 @@ QString &QString::operator+=( char c )
     source string exists.
 
-    \sa utf8(), local8Bit()
+    \sa fromLatin1(), ascii(), utf8(), local8Bit()
 */
 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;
     }
     return d->ascii;
@@ -16577,16 +16649,35 @@ 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.
 
     See QTextCodec for more diverse coding/decoding of Unicode strings.
 
-    \sa QString::fromUtf8(), local8Bit(), latin1()
+    \sa fromUtf8(), ascii(), latin1(), local8Bit()
 */
 QCString QString::utf8() const
@@ -16634,5 +16725,6 @@ QString QString::fromUtf8( const char* utf8, int len )
         return QString::null;
 
-    if ( len < 0 ) len = qstrlen( utf8 );
+    if ( len < 0 )
+        len = strlen( utf8 );
     QString result;
     result.setLength( len ); // worst case
@@ -16675,18 +16767,48 @@ 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().
 
     This is the same as the QString(const char*) constructor, but you
     can make that constructor invisible if you compile with the define
     \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()
 */
 QString QString::fromLatin1( const char* chars, int len )
@@ -16696,5 +16818,5 @@ QString QString::fromLatin1( const char* chars, int len )
     if ( len < 0 )
          len = -1;
-    uc = internalAsciiToUnicode( chars, &l, len );
+    uc = internalLatin1ToUnicode( chars, &l, len );
     return QString( new QStringData(uc, l, l), TRUE );
 }
@@ -16710,14 +16832,13 @@ QString QString::fromLatin1( const char* chars, int len )
     Returns the string encoded in a locale-specific format. On X11,
     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.
 
     See QTextCodec for more diverse coding/decoding of Unicode
     strings.
 
-    \sa QString::fromLocal8Bit(), latin1(), utf8()
+    \sa fromLocal8Bit(), ascii(), latin1(), utf8()
 */
 
-
 QCString QString::local8Bit() const
 {
@@ -16741,5 +16862,5 @@ QCString QString::local8Bit() const
 #endif
 #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
 #endif
@@ -16772,5 +16893,6 @@ QString QString::fromLocal8Bit( const char* local8Bit, int len )
 #ifdef Q_WS_X11
     QTextCodec* codec = QTextCodec::codecForLocale();
-    if ( len < 0 ) len = qstrlen(local8Bit);
+    if ( len < 0 )
+        len = strlen( local8Bit );
     return codec
             ? codec->toUnicode( local8Bit, len )
@@ -16805,4 +16927,10 @@ QString QString::fromLocal8Bit( const char* local8Bit, int len )
 */
 
+/*!
+    \fn QString::operator std::string() const
+
+    Returns ascii().
+*/
+
 
 /*!
@@ -16820,6 +16948,4 @@ const unsigned short *QString::ucs2() const
     if ( d->maxl < len + 1 ) {
         // detach, grow or shrink
-        Q2HELPER(stat_copy_on_write++)
-        Q2HELPER(stat_copy_on_write_size += len)
         uint newMax = computeNewMax( len + 1 );
         QChar* nd = QT_ALLOC_QCHAR_VEC( newMax );
@@ -16984,6 +17110,4 @@ QString& QString::setUnicode( const QChar *unicode, uint len )
                 ( len * 4 < d->maxl && d->maxl > 4 ) ) {
         // detach, grown or shrink
-        Q2HELPER(stat_copy_on_write++)
-        Q2HELPER(stat_copy_on_write_size+=d->len)
         uint newMax = computeNewMax( len );
         QChar* nd = QT_ALLOC_QCHAR_VEC( newMax );
@@ -17019,4 +17143,26 @@ 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
     string. If \a len is -1 (the default), then it is set to
@@ -17034,5 +17180,5 @@ QString &QString::setLatin1( const char *str, int len )
         return setUnicode(0,0);
     if ( len < 0 )
-        len = qstrlen(str);
+        len = strlen( str );
     if ( len == 0 ) {                           // won't make a null string
         *this = QString::fromLatin1( "" );
@@ -17052,14 +17198,14 @@ void QString::checkSimpleText() const
     QChar *p = d->unicode;
     QChar *end = p + d->len;
-    d->simpletext = 1;
     while( p < end ) {
         ushort uc = p->unicode();
         // sort out regions of complex text formatting
         if ( uc > 0x058f && ( uc < 0x1100 || uc > 0xfb0f ) ) {
-            d->simpletext = 0;
+            d->issimpletext = FALSE;
             return;
         }
         p++;
     }
+    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
@@ -1090,5 +1090,5 @@ QTextStream &QTextStream::writeBlock( const QChar* p, uint len )
 #endif
     if ( latin1 ) {
-        char *str = QString::unicodeToAscii( p, len );
+        char *str = QString::unicodeToLatin1( p, len );
         dev->writeBlock( str, len );
         delete [] str;
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
@@ -297,6 +297,5 @@ void QUType_int::set( QUObject *o, int v )
 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;
 
@@ -306,6 +305,5 @@ bool QUType_int::canConvertFrom( QUObject *o, QUType *t )
 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 );
 }
 
@@ -314,6 +312,4 @@ bool QUType_int::convertFrom( QUObject *o, QUType *t )
     if ( isEqual( t, &static_QUType_double ) )
         o->payload.i = (long)o->payload.d;
-    else if ( isEqual( t, &static_QUType_float ) )
-        o->payload.i = (long)o->payload.f;
     else
         return t->convertTo( o, this );
@@ -328,7 +324,4 @@ bool QUType_int::convertTo( QUObject *o, QUType *t )
         o->payload.d = (double)o->payload.i;
         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
         return FALSE;
@@ -346,46 +339,4 @@ 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}
 const QUuid TID_QUType_double( 0x2d0974e5, 0xba6, 0x4ec2, 0x88, 0x37, 0xc1, 0x98, 0x97, 0x2c, 0xb4, 0x8c );
@@ -402,6 +353,5 @@ void QUType_double::set( QUObject *o, double v )
 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;
 
@@ -411,6 +361,5 @@ bool QUType_double::canConvertFrom( QUObject *o, QUType *t )
 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 );
 }
 
@@ -419,7 +368,5 @@ bool QUType_double::convertFrom( QUObject *o, QUType *t )
     if ( isEqual( t, &static_QUType_int ) )
         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 );
 
@@ -451,68 +398,4 @@ 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}
 const QUuid TID_QUType_charstar( 0xefcdd1d4, 0x77a3, 0x4b8e, 0x8d, 0x46, 0xdc, 0x14, 0xb8, 0xd3, 0x93, 0xe9 );
@@ -594,5 +477,4 @@ bool QUType_QString::canConvertFrom( QUObject *o, QUType *t )
     if ( isEqual( t, &static_QUType_charstar ) ||
          isEqual( t, &static_QUType_double ) ||
-         isEqual( t, &static_QUType_float ) ||
          isEqual( t, &static_QUType_int ) )
         return TRUE;
@@ -605,6 +487,5 @@ bool QUType_QString::canConvertTo( QUObject * /*o*/, QUType *t )
     return isEqual( t, &static_QUType_charstar ) ||
         isEqual( t,  &static_QUType_int ) ||
-        isEqual( t,  &static_QUType_double ) ||
-        isEqual( t,  &static_QUType_float );
+        isEqual( t,  &static_QUType_double );
 }
 
@@ -616,6 +497,4 @@ bool QUType_QString::convertFrom( QUObject *o, QUType *t )
     else if ( isEqual( t, &static_QUType_double ) )
         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 ) )
         str = new QString( QString::number( o->payload.i ) );
@@ -642,7 +521,4 @@ bool QUType_QString::convertTo( QUObject *o, QUType *t )
         o->payload.d = str->toDouble();
         o->type = &static_QUType_double;
-    } else if ( isEqual( t,  &static_QUType_float ) ) {
-        o->payload.d = str->toFloat();
-        o->type = &static_QUType_float;
     } else {
         return FALSE;
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
@@ -125,5 +125,5 @@ struct QWaitConditionPrivate {
         mymutex.lock();
         // Sleep until there are no busy worker threads
-        while( count > 0 ) {
+        while( mycount > 0 ) {
             mymutex.unlock();
             sleep( 1 );
@@ -225,5 +225,7 @@ void QWaitCondition::wakeAll()
 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 );
 
     int ret;
@@ -233,5 +235,5 @@ 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 );
         ti.tv_nsec %= 1000000000;
@@ -246,4 +248,7 @@ bool QWaitCondition::wait(unsigned long time)
 #endif
 
+    pthread_mutex_unlock( &mutex );
+    pthread_mutex_destroy( &mutex );
+
     return (ret == 0);
 }
@@ -292,5 +297,5 @@ 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 );
         ti.tv_nsec %= 1000000000;