From e804700bcfb62535fb3a9f3aad8e88ebb266e195 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Wed, 29 Jan 2014 17:09:48 +0100 Subject: [PATCH] Utils::Environment support magic windows environment variables The cmd shell on windows sets environment variables starting with a '='. Task-number: QTCREATORBUG-8716 Change-Id: I3bb5c15b543339f41a4f895c81ed55ac2701b95c Reviewed-by: Daniel Teske --- src/libs/utils/environment.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp index 1f6d29a759e..30d69e60d10 100644 --- a/src/libs/utils/environment.cpp +++ b/src/libs/utils/environment.cpp @@ -73,7 +73,7 @@ QList EnvironmentItem::fromStringList(const QStringList &list) { QList result; foreach (const QString &string, list) { - int pos = string.indexOf(QLatin1Char('=')); + int pos = string.indexOf(QLatin1Char('='), 1); if (pos == -1) { EnvironmentItem item(string, QString()); item.unset = true; @@ -101,7 +101,7 @@ QStringList EnvironmentItem::toStringList(const QList &list) Environment::Environment(const QStringList &env, OsType osType) : m_osType(osType) { foreach (const QString &s, env) { - int i = s.indexOf(QLatin1Char('=')); + int i = s.indexOf(QLatin1Char('='), 1); if (i >= 0) { if (m_osType == OsTypeWindows) m_values.insert(s.left(i).toUpper(), s.mid(i+1));