From 3201b70f0364911382cf3657141be95e34f1d61c Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 6 May 2010 15:15:13 +0200
Subject: unify QMAKE_QMAKE path separator fixing

the value of the variable in Option is only ever accessed via the
project variable, so there is no point in early fixing.

as it happens, this fixes mingw+sh generating makefiles with the wrong
separator, as the fixing is delayed to a point where QMAKE_DIR_SEP was
read back into Option.

Reviewed-by: joerg
---
 qmake/option.cpp  |  1 -
 qmake/project.cpp | 13 ++++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/qmake/option.cpp b/qmake/option.cpp
index 13e855c..d63158c 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -558,7 +558,6 @@ void Option::applyHostMode()
        Option::dir_sep = "/";
        Option::obj_ext = ".o";
    }
-   Option::qmake_abslocation = Option::fixPathToTargetOS(Option::qmake_abslocation);
 }
 
 bool Option::postProcessProject(QMakeProject *project)
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 998d173..c3595fe 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -3099,13 +3099,12 @@ QStringList &QMakeProject::values(const QString &_var, QMap<QString, QStringList
             place[var] = QStringList(Option::obj_ext);
         }
     } else if (var == QLatin1String("QMAKE_QMAKE")) {
-        if (place[var].isEmpty()) {
-            if (!Option::qmake_abslocation.isNull())
-                place[var] = QStringList(Option::qmake_abslocation);
-            else
-                place[var] = QStringList(Option::fixPathToTargetOS(
-                        QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmake", false));
-        }
+        if (place[var].isEmpty())
+            place[var] = QStringList(Option::fixPathToTargetOS(
+                !Option::qmake_abslocation.isEmpty()
+                    ? Option::qmake_abslocation
+                    : QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmake",
+                false));
     } else if (var == QLatin1String("EPOCROOT")) {
         if (place[var].isEmpty())
             place[var] = QStringList(epocRoot());
-- 
cgit v0.12