diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-01-13 18:53:39 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-01-17 12:40:24 (GMT) |
| commit | b7a1c07025aa6896f6b6482feb2df7fbc00f4d32 (patch) | |
| tree | d206a5578862bfa524465efdb20ff5b6a9b7eff1 | |
| parent | c8fb3f90cf3834a723ae76de95831995459ec94e (diff) | |
| download | Qt-b7a1c07025aa6896f6b6482feb2df7fbc00f4d32.zip Qt-b7a1c07025aa6896f6b6482feb2df7fbc00f4d32.tar.gz Qt-b7a1c07025aa6896f6b6482feb2df7fbc00f4d32.tar.bz2 | |
make sure Option::dir_sep is initialized in time
querying $$DIR_SEPARATOR (possibly indirectly via $$QMAKE_DIR_SEP) may
happen before querying any os scopes, so better make it initialize the
host mode explicitly.
loading features theoretically needs an initialized dir_sep as well (to
detect relative paths), so take care of that as well.
Task-number: QTBUG-10633
Reviewed-by: mariusSO
| -rw-r--r-- | qmake/project.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 2cf7393..8d8d9e0 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -1642,6 +1642,7 @@ QMakeProject::doProjectInclude(QString file, uchar flags, QMap<QString, QStringL if(flags & IncludeFlagFeature) { if(!file.endsWith(Option::prf_ext)) file += Option::prf_ext; + validateModes(); // init dir_sep if(file.indexOf(Option::dir_sep) == -1 || !QFile::exists(file)) { static QStringList *feature_roots = 0; if(!feature_roots) { @@ -2988,6 +2989,7 @@ QStringList &QMakeProject::values(const QString &_var, QMap<QString, QStringList var = ".BUILTIN." + var; place[var] = QStringList(qmake_getpwd()); } else if(var == QLatin1String("DIR_SEPARATOR")) { + validateModes(); var = ".BUILTIN." + var; place[var] = QStringList(Option::dir_sep); } else if(var == QLatin1String("DIRLIST_SEPARATOR")) { |