Utils::Environment env = bc->environment();
Utils::Environment::const_iterator eit = env.constBegin(), eend = env.constEnd();
for (; eit != eend; ++eit)
-#ifdef Q_OS_WIN
- m_proFileOption->environment.insert(env.key(eit).toUpper(), env.value(eit));
-#else
m_proFileOption->environment.insert(env.key(eit), env.value(eit));
-#endif
QStringList args;
if (QMakeStep *qs = bc->qmakeStep())
#include <QtCore/QString>
#include <QtCore/QStringList>
#include <QtCore/QTextStream>
-#ifndef QT_BOOTSTRAPPED
-# include <QtCore/QProcess>
-#endif
#ifdef PROEVALUATOR_THREAD_SAFE
# include <QtCore/QThreadPool>
#endif
QString ProFileOption::getEnv(const QString &var) const
{
+#ifndef QT_BOOTSTRAPPED
if (!environment.isEmpty())
-#ifdef Q_OS_WIN
- return environment.value(var.toUpper());
-#else
return environment.value(var);
#endif
return QString::fromLocal8Bit(qgetenv(var.toLocal8Bit().constData()));
QProcess::ProcessChannel chan) const
{
proc->setWorkingDirectory(currentDirectory());
+ if (!m_option->environment.isEmpty())
+ proc->setProcessEnvironment(m_option->environment);
# ifdef Q_OS_WIN
proc->setNativeArguments(QLatin1String("/v:off /s /c \"") + command + QLatin1Char('"'));
proc->start(m_option->getEnv(QLatin1String("COMSPEC")), QStringList());
#include <QtCore/QHash>
#include <QtCore/QStringList>
+#ifndef QT_BOOTSTRAPPED
+# include <QtCore/QProcess>
+#endif
#ifdef PROEVALUATOR_THREAD_SAFE
# include <QtCore/QMutex>
# include <QtCore/QWaitCondition>
QString qmakespec;
QString cachefile;
QHash<QString, QString> properties;
- QHash<QString, QString> environment;
+#ifndef QT_BOOTSTRAPPED
+ QProcessEnvironment environment;
+#endif
QString sysroot;
//QString pro_ext;