From 4823e75d9c12bc18bc8c1d524f82298b5b001284 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Fri, 20 Apr 2012 13:03:48 +0200 Subject: Fix compile on non windows Change-Id: I9cfb369f2701c1bf7239f3d8596409660263a06b Reviewed-by: Daniel Teske --- src/plugins/projectexplorer/projectexplorer.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index d1923f5f43..665d1f6b44 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -945,11 +945,16 @@ 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(); +#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 = s->value(QLatin1String("ProjectExplorer/Settings/UseJom"), jom.exists()).toBool(); +#else + d->m_projectExplorerSettings.useJom = true; // No need to read any settings +#endif d->m_projectExplorerSettings.autorestoreLastSession = s->value(QLatin1String("ProjectExplorer/Settings/AutoRestoreLastSession"), false).toBool(); d->m_projectExplorerSettings.prompToStopRunControl = -- cgit v1.2.1