diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-03-02 16:15:32 (GMT) |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-03-05 11:40:27 (GMT) |
| commit | a69954ef47efe60a0774178bf52e2b4a6c703fa7 (patch) | |
| tree | eb95d611363c8f47b728b2b62a20d5df228947f1 | |
| parent | 86cce28dac644f3e3da79476a0e21ca59f2f4604 (diff) | |
| download | Qt-a69954ef47efe60a0774178bf52e2b4a6c703fa7.zip Qt-a69954ef47efe60a0774178bf52e2b4a6c703fa7.tar.gz Qt-a69954ef47efe60a0774178bf52e2b4a6c703fa7.tar.bz2 | |
make the value of QMAKE_QMAKE somewhat less magic
the generators change the value of QMAKE_QMAKE, so it is unwise to
"redirect" it to a hidden builtin which is reset each time.
in particular, this fixes qmake generating makefiles without an absolute
path to qmake itself - the initial quoting of the filename will make the
variable "real", so contains() will start working for it.
(cherry picked from commit 31e1fb9103e6d6657c1153f5c30e149087568042)
| -rw-r--r-- | qmake/project.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 951ca33..cf1c365 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -3136,7 +3136,6 @@ QStringList &QMakeProject::values(const QString &_var, QMap<QString, QStringList } } else if (var == QLatin1String("QMAKE_QMAKE")) { if (place[var].isEmpty()) { - var = ".BUILTIN." + var; if (!Option::qmake_abslocation.isNull()) place[var] = QStringList(Option::qmake_abslocation); else |