diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-03-02 16:15:32 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-03-02 16:46:03 (GMT) |
| commit | 31e1fb9103e6d6657c1153f5c30e149087568042 (patch) | |
| tree | 2aac77ad60d1dcbbeb6bb59e282af379517ff7cc /qmake/project.cpp | |
| parent | ffec21e1e0694972592150c600f2970b6f28dbad (diff) | |
| download | Qt-31e1fb9103e6d6657c1153f5c30e149087568042.zip Qt-31e1fb9103e6d6657c1153f5c30e149087568042.tar.gz Qt-31e1fb9103e6d6657c1153f5c30e149087568042.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.
Diffstat (limited to 'qmake/project.cpp')
| -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 |