diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-02-15 18:26:07 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-02-26 13:29:15 (GMT) |
| commit | 4c097589a30a6062e5e2a011a5cc11422352def9 (patch) | |
| tree | 53778528168184d50637325f09bb55804b4bdb79 /qmake | |
| parent | 6b3502bb096a35e6bd882fb505f98e3e64e9be30 (diff) | |
| download | Qt-4c097589a30a6062e5e2a011a5cc11422352def9.zip Qt-4c097589a30a6062e5e2a011a5cc11422352def9.tar.gz Qt-4c097589a30a6062e5e2a011a5cc11422352def9.tar.bz2 | |
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
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/main.cpp | 2 | ||||
| -rw-r--r-- | qmake/option.cpp | 2 | ||||
| -rw-r--r-- | 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(); |