Commit 352d9aa5 authored by Yuchen Deng's avatar Yuchen Deng Committed by Daniel Teske

Do not use jom by default if binary doesn't exist

Change-Id: I952c069361988d1f2b3c4f4cdf4566a4d1d02878
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent 6d393252
......@@ -119,6 +119,7 @@
#include <QtPlugin>
#include <QDateTime>
#include <QDebug>
#include <QFileInfo>
#include <QSettings>
#if QT_VERSION < 0x050000
......@@ -944,8 +945,11 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
s->value(QLatin1String("ProjectExplorer/Settings/MergeStdErrAndStdOut"), false).toBool();
d->m_projectExplorerSettings.wrapAppOutput =
s->value(QLatin1String("ProjectExplorer/Settings/WrapAppOutput"), true).toBool();
QFileInfo jom = QFileInfo(MsvcToolChain::findInstalledJom());
if (!jom.exists())
jom.setFile(Utils::Environment::systemEnvironment().searchInPath(QLatin1String("jom.exe")));
d->m_projectExplorerSettings.useJom =
s->value(QLatin1String("ProjectExplorer/Settings/UseJom"), true).toBool();
s->value(QLatin1String("ProjectExplorer/Settings/UseJom"), jom.exists()).toBool();
d->m_projectExplorerSettings.autorestoreLastSession =
s->value(QLatin1String("ProjectExplorer/Settings/AutoRestoreLastSession"), false).toBool();
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