diff options
| author | Yuchen Deng <loaden@gmail.com> | 2012-04-20 16:24:50 +0800 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@nokia.com> | 2012-04-20 11:53:04 +0200 |
| commit | 352d9aa5ec26a94469511bfef0ce52fc8d5d8237 (patch) | |
| tree | 3a66e5973d61e1898de1b40bb9d0c01971bb0ba9 /src/plugins/projectexplorer/projectexplorer.cpp | |
| parent | 6d393252c4fa0c3961cacab0f3aeeff80024a978 (diff) | |
| download | qt-creator-352d9aa5ec26a94469511bfef0ce52fc8d5d8237.tar.gz | |
Do not use jom by default if binary doesn't exist
Change-Id: I952c069361988d1f2b3c4f4cdf4566a4d1d02878
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/projectexplorer/projectexplorer.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/projectexplorer.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 84d3d67cef..d1923f5f43 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -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 = |