diff options
| author | Daniel Teske <daniel.teske@nokia.com> | 2012-04-20 13:03:48 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@nokia.com> | 2012-04-20 13:12:27 +0200 |
| commit | 4823e75d9c12bc18bc8c1d524f82298b5b001284 (patch) | |
| tree | ec4f4ca5186b21747ae83d28dbc03b3ee7ed9735 /src/plugins | |
| parent | d8045030097014e194262c6a9285089bfc3bfddd (diff) | |
| download | qt-creator-4823e75d9c12bc18bc8c1d524f82298b5b001284.tar.gz | |
Fix compile on non windows
Change-Id: I9cfb369f2701c1bf7239f3d8596409660263a06b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/projectexplorer/projectexplorer.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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 = |