Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt

Conflicts:
	tools/linguist/shared/profileevaluator.cpp

4 files changed, 10 insertions, 16 deletions

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index d0fbcbe..3e5452e 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -2735,16 +2735,9 @@ MakefileGenerator::fileFixify(const QString& file, const QString &out_d, const Q
             ret.prepend(pwd);
         ret = Option::fixPathToTargetOS(ret, false, canon);
     } else { //fix it..
-        QString qfile(Option::fixPathToLocalOS(ret, true, canon)), in_dir(in_d), out_dir(out_d);
+        QString out_dir = QDir(Option::output_dir).absoluteFilePath(out_d);
+        QString in_dir  = QDir(pwd).absoluteFilePath(in_d);
         {
-            if(out_dir.isNull() || QDir::isRelativePath(out_dir))
-                out_dir.prepend(Option::output_dir + "/");
-            else if(out_dir == ".")
-                out_dir = pwd;
-            if(in_dir.isEmpty() || QDir::isRelativePath(in_dir))
-                in_dir.prepend(pwd);
-            else if(in_dir == ".")
-                in_dir = pwd;
             QFileInfo in_fi(fileInfo(in_dir));
             if(in_fi.exists())
                 in_dir = in_fi.canonicalFilePath();
@@ -2753,6 +2746,7 @@ MakefileGenerator::fileFixify(const QString& file, const QString &out_d, const Q
                 out_dir = out_fi.canonicalFilePath();
         }
 
+        QString qfile(Option::fixPathToLocalOS(ret, true, canon));
         QFileInfo qfileinfo(fileInfo(qfile));
         if(out_dir != in_dir || !qfileinfo.isRelative()) {
             if(qfileinfo.isRelative()) {
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
index a26a247..cf09a6a 100644
--- a/qmake/generators/makefile.h
+++ b/qmake/generators/makefile.h
@@ -109,7 +109,7 @@ protected:
     struct SubTarget
     {
         QString name;
-	QString in_directory, out_directory;
+        QString in_directory, out_directory;
         QString profile, target, makefile;
         QStringList depends;
     };
@@ -183,8 +183,8 @@ protected:
 
     void filterIncludedFiles(const QString &);
     virtual void processSources() {
-	filterIncludedFiles("SOURCES");
-	filterIncludedFiles("GENERATED_SOURCES");
+        filterIncludedFiles("SOURCES");
+        filterIncludedFiles("GENERATED_SOURCES");
     }
 
     //for cross-platform dependent directories
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp
index f0683a7..3f60791 100644
--- a/qmake/generators/metamakefile.cpp
+++ b/qmake/generators/metamakefile.cpp
@@ -360,7 +360,7 @@ SubdirsMetaMakefileGenerator::init()
 
         }
         --recurseDepth;
-	Option::output.setFileName(old_output);
+        Option::output.setFileName(old_output);
         Option::output_dir = old_output_dir;
         qmake_setpwd(oldpwd);
     }
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 4b1b66d..b5904cc 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -244,14 +244,14 @@ void NmakeMakefileGenerator::writeImplicitRulesPart(QTextStream &t)
         project->variables().remove("QMAKE_RUN_CC");
 
         QHash<QString, void*> source_directories;
-        source_directories.insertMulti(".", (void*)1);
+        source_directories.insert(".", (void*)1);
         QString directories[] = { QString("UI_SOURCES_DIR"), QString("UI_DIR"), QString() };
         for(int y = 0; !directories[y].isNull(); y++) {
             QString dirTemp = project->first(directories[y]);
             if (dirTemp.endsWith("\\"))
                 dirTemp.truncate(dirTemp.length()-1);
             if(!dirTemp.isEmpty())
-                source_directories.insertMulti(dirTemp, (void*)1);
+                source_directories.insert(dirTemp, (void*)1);
         }
         QString srcs[] = { QString("SOURCES"), QString("GENERATED_SOURCES"), QString() };
         for(int x = 0; !srcs[x].isNull(); x++) {
@@ -262,7 +262,7 @@ void NmakeMakefileGenerator::writeImplicitRulesPart(QTextStream &t)
                     sep = "/";
                 QString dir = (*sit).section(sep, 0, -2);
                 if(!dir.isEmpty() && !source_directories[dir])
-                    source_directories.insertMulti(dir, (void*)1);
+                    source_directories.insert(dir, (void*)1);
             }
         }