diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-05-06 15:15:13 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-05-20 22:19:08 +0200 |
| commit | 3201b70f0364911382cf3657141be95e34f1d61c (patch) | |
| tree | 8b479a823e68a1f934f71d91002582a500fcca8d /qmake | |
| parent | bb0048d2e8536f1db5144ee99d122e2b3b102e04 (diff) | |
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
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/option.cpp | 1 | ||||
| -rw-r--r-- | qmake/project.cpp | 13 |
2 files changed, 6 insertions, 8 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index 13e855c9e4..d63158cc99 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 998d1734b9..c3595fef92 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()); |