diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-03-02 17:18:26 +0100 |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-03-05 12:40:32 +0100 |
| commit | 0ac28a63abe1a333b6da6f8cda2cb7c156e5dee0 (patch) | |
| tree | e9a189ef8ccfcc2c87abb92c0c8d676b9d2a8b42 | |
| parent | a69954ef47efe60a0774178bf52e2b4a6c703fa7 (diff) | |
make the fallback value of QMAKE_QMAKE absolute
inspired by the pbx generator.
currently this has no effect, as all generators build their own
fallbacks anyway.
Reviewed-by: mariusSO
(cherry picked from commit f006691acc45a57e011e5827163c0b3759864bf7)
| -rw-r--r-- | qmake/project.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index cf1c36563a..9e6db108ea 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -3139,7 +3139,8 @@ QStringList &QMakeProject::values(const QString &_var, QMap<QString, QStringList if (!Option::qmake_abslocation.isNull()) place[var] = QStringList(Option::qmake_abslocation); else - place[var] = QStringList("qmake"); + place[var] = QStringList(Option::fixPathToTargetOS( + QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmake", false)); } } else if (var == QLatin1String("EPOCROOT")) { if (place[var].isEmpty()) |