From b7a1c07025aa6896f6b6482feb2df7fbc00f4d32 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 13 Jan 2011 19:53:39 +0100
Subject: 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
---
 qmake/project.cpp | 2 ++
 1 file changed, 2 insertions(+)

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")) {
-- 
cgit v0.12