Commit d7079ed8 authored by Eike Ziller's avatar Eike Ziller
Browse files

Windows build fix.

Broke with d3c05574


Remove the logic for setting jom as default or not, and just set it as
default, since the new AbstractMsvcToolChain::makeCommand uses nmake as
a fallback if jom is not found.

Task-number: QTCREATORBUG-7876
Change-Id: Ia96c2449863fbbd027fbaf003d75bb6155206289
Reviewed-by: default avatarOliver Wolff <oliver.wolff@nokia.com>
parent 77a6b71f
...@@ -919,16 +919,8 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er ...@@ -919,16 +919,8 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
s->value(QLatin1String("ProjectExplorer/Settings/MergeStdErrAndStdOut"), false).toBool(); s->value(QLatin1String("ProjectExplorer/Settings/MergeStdErrAndStdOut"), false).toBool();
d->m_projectExplorerSettings.wrapAppOutput = d->m_projectExplorerSettings.wrapAppOutput =
s->value(QLatin1String("ProjectExplorer/Settings/WrapAppOutput"), true).toBool(); s->value(QLatin1String("ProjectExplorer/Settings/WrapAppOutput"), true).toBool();
#ifdef Q_OS_WIN
QFileInfo jom = QFileInfo(MsvcToolChain::findInstalledJom());
if (!jom.exists())
jom.setFile(Utils::Environment::systemEnvironment().searchInPath(QLatin1String("jom.exe")));
d->m_projectExplorerSettings.useJom = d->m_projectExplorerSettings.useJom =
s->value(QLatin1String("ProjectExplorer/Settings/UseJom"), jom.exists()).toBool(); s->value(QLatin1String("ProjectExplorer/Settings/UseJom"), true).toBool();
#else
d->m_projectExplorerSettings.useJom = true; // No need to read any settings
#endif
d->m_projectExplorerSettings.autorestoreLastSession = d->m_projectExplorerSettings.autorestoreLastSession =
s->value(QLatin1String("ProjectExplorer/Settings/AutoRestoreLastSession"), false).toBool(); s->value(QLatin1String("ProjectExplorer/Settings/AutoRestoreLastSession"), false).toBool();
d->m_projectExplorerSettings.prompToStopRunControl = d->m_projectExplorerSettings.prompToStopRunControl =
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment