diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-03-02 16:18:26 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-03-03 10:27:49 (GMT) |
| commit | f006691acc45a57e011e5827163c0b3759864bf7 (patch) | |
| tree | b4457681be01d9b25c333a9595c4c0f4e838ef32 /qmake | |
| parent | 97b8727635a73197fac4f5edb8a1122733933db4 (diff) | |
| download | Qt-f006691acc45a57e011e5827163c0b3759864bf7.zip Qt-f006691acc45a57e011e5827163c0b3759864bf7.tar.gz Qt-f006691acc45a57e011e5827163c0b3759864bf7.tar.bz2 | |
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
Diffstat (limited to 'qmake')
| -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 cf1c365..9e6db10 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()) |