From 4c097589a30a6062e5e2a011a5cc11422352def9 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 15 Feb 2010 19:26:07 +0100
Subject: use QDir::separator() instead of Option::dir_sep where appropriate

in these cases, the separator depends on the *real* host platform, not
on the one that will host the build.

there are many more cases like that, but that's for (much) later ...

Reviewed-by: mariusSO
---
 qmake/main.cpp    | 2 +-
 qmake/option.cpp  | 2 +-
 qmake/project.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qmake/main.cpp b/qmake/main.cpp
index 50f9272..42679a2 100644
--- a/qmake/main.cpp
+++ b/qmake/main.cpp
@@ -149,7 +149,7 @@ int runQMake(int argc, char **argv)
             //setup pwd properly
             debug_msg(1, "Resetting dir to: %s", oldpwd.toLatin1().constData());
             qmake_setpwd(oldpwd); //reset the old pwd
-            int di = fn.lastIndexOf(Option::dir_sep);
+            int di = fn.lastIndexOf(QDir::separator());
             if(di != -1) {
                 debug_msg(1, "Changing dir to: %s", fn.left(di).toLatin1().constData());
                 if(!qmake_setpwd(fn.left(di)))
diff --git a/qmake/option.cpp b/qmake/option.cpp
index 592e3eb..4f6ce5d 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -126,7 +126,7 @@ QString Option::mkfile::qmakespec_commandline;
 
 static Option::QMAKE_MODE default_mode(QString progname)
 {
-    int s = progname.lastIndexOf(Option::dir_sep);
+    int s = progname.lastIndexOf(QDir::separator());
     if(s != -1)
         progname = progname.right(progname.length() - (s + 1));
     if(progname == "qmakegen")
diff --git a/qmake/project.cpp b/qmake/project.cpp
index ba0db66..c6caa4f 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -620,7 +620,7 @@ QStringList qmake_feature_paths(QMakeProperty *prop=0)
         feature_roots += splitPathList(prop->value("QMAKEFEATURES"));
     if(!Option::mkfile::cachefile.isEmpty()) {
         QString path;
-        int last_slash = Option::mkfile::cachefile.lastIndexOf(Option::dir_sep);
+        int last_slash = Option::mkfile::cachefile.lastIndexOf(QDir::separator());
         if(last_slash != -1)
             path = Option::fixPathToLocalOS(Option::mkfile::cachefile.left(last_slash));
         for(QStringList::Iterator concat_it = concat.begin();
-- 
cgit v0.12