forked from qt-creator/qt-creator
MSVC: Improve error handling
By not silently failing when the vcvars.bat file is not found. Instead attempt to run it and report the error message when it fails. Change-Id: Ib97dbe17f8fb5529e549ef6c5d132a8571c10c33 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
committed by
Tim Jenssen
parent
c318f7b2a0
commit
41c1abab7e
@@ -382,9 +382,6 @@ static QString winExpandDelayedEnvReferences(QString in, const Utils::Environmen
|
||||
Utils::Environment MsvcToolChain::readEnvironmentSetting(const Utils::Environment& env) const
|
||||
{
|
||||
Utils::Environment result;
|
||||
if (!QFileInfo::exists(m_vcvarsBat))
|
||||
return env;
|
||||
|
||||
QMap<QString, QString> envPairs;
|
||||
if (!generateEnvironmentSettings(env, m_vcvarsBat, m_varsBatArg, envPairs))
|
||||
return env;
|
||||
|
||||
@@ -113,11 +113,6 @@ static QString winExpandDelayedEnvReferences(QString in, const Utils::Environmen
|
||||
Utils::Environment WinCEToolChain::readEnvironmentSetting(const Utils::Environment &env) const
|
||||
{
|
||||
Utils::Environment result;
|
||||
|
||||
if (!QFileInfo::exists(m_vcvarsBat))
|
||||
return env;
|
||||
|
||||
// Get the env pairs
|
||||
QMap<QString, QString> envPairs;
|
||||
|
||||
if (!generateEnvironmentSettings(env, m_vcvarsBat, QString(), envPairs))
|
||||
|
||||
Reference in New Issue
Block a user