diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-20 20:27:15 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 14:35:25 +0200 |
| commit | b40b91cb393615f586d86f28ec5a5d6dd54c5d0a (patch) | |
| tree | 48146d18c4be9daaeb427a1164c8dd7919c412e7 /qmake/project.cpp | |
| parent | 1b1aa3b4f8413bb467409aeadb5934c442b0835a (diff) | |
move initialization of numerous variables to spec_pre.prf
this is cleaner by design and allows removing some hacks.
Change-Id: I3270195b5d62caa476ffde7c1e1ef43cec99c565
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index c781cd2a28..3f801334c2 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -1316,10 +1316,6 @@ QMakeProject::read(uchar cmd) again: if ((cmd & ReadSetup) && base_vars.isEmpty()) { // hack to get the Option stuff in there - vars["QMAKE_EXT_CPP"] = Option::cpp_ext; - vars["QMAKE_EXT_C"] = Option::c_ext; - vars["QMAKE_EXT_H"] = Option::h_ext; - vars["QMAKE_SH"] = Option::shellPath; if(!Option::user_template_prefix.isEmpty()) vars["TEMPLATE_PREFIX"] = QStringList(Option::user_template_prefix); @@ -3771,14 +3767,6 @@ QStringList &QMakeProject::values(const QString &_var, QHash<QString, QStringLis #endif var = ".BUILTIN.HOST." + type; place[var] = QStringList(ret); - } else if (var == QLatin1String("QMAKE_DIR_SEP")) { - if (place[var].isEmpty()) - return values("DIR_SEPARATOR", place); - } else if (var == QLatin1String("QMAKE_EXT_OBJ")) { - if (place[var].isEmpty()) { - var = ".BUILTIN." + var; - place[var] = QStringList(Option::obj_ext); - } } else if (var == QLatin1String("QMAKE_QMAKE")) { if (place[var].isEmpty()) place[var] = QStringList( |