feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Cmake: Fix build

Browse Source 
... and shorten some lines along the way.

Change-Id: I154610ebcf2f9592d105c6fcae8084c12a79e1d1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-10-26 15:59:17 +01:00
parent f6fcfb4c9a
commit 95b94cf602
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
View File

@@ -591,10 +591,11 @@ void CMakeRunPage::runCMake()
this, &CMakeRunPage::cmakeReadyReadStandardOutput); this, &CMakeRunPage::cmakeReadyReadStandardOutput);
connect(m_cmakeProcess, &QProcess::readyReadStandardError, connect(m_cmakeProcess, &QProcess::readyReadStandardError,
this, &CMakeRunPage::cmakeReadyReadStandardError); this, &CMakeRunPage::cmakeReadyReadStandardError);
connect(m_cmakeProcess, &QProcess::finished, connect(m_cmakeProcess, static_cast<void(QProcess::*)(int)>(&QProcess::finished),
this, &CMakeRunPage::cmakeFinished); this, &CMakeRunPage::cmakeFinished);
cmakeManager->createXmlFile(m_cmakeProcess, cmake->cmakeExecutable().toString(), m_argumentsLineEdit->text(), cmakeManager->createXmlFile(m_cmakeProcess, cmake->cmakeExecutable().toString(),
m_cmakeWizard->sourceDirectory(), m_buildDirectory, env, m_argumentsLineEdit->text(), m_cmakeWizard->sourceDirectory(),
m_buildDirectory, env,
QString::fromLatin1(generatorInfo.generatorArgument()), QString::fromLatin1(generatorInfo.generatorArgument()),
QString::fromLatin1(generatorInfo.preLoadScriptFileArgument())); QString::fromLatin1(generatorInfo.preLoadScriptFileArgument()));
} else { } else {