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

CMake: Simplify cmakeproject code a bit

Browse Source 
No behavior change is intended in this patch.

Change-Id: I5c49a0a97ede443dbb25bf34b96c346a63f549d2
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-04-01 16:18:03 +02:00
parent 420d9548db
commit 44aaec767f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -204,8 +204,11 @@ void CMakeProject::parseCMakeOutput()
{ {
auto cmakeBc = qobject_cast<CMakeBuildConfiguration *>(sender()); auto cmakeBc = qobject_cast<CMakeBuildConfiguration *>(sender());
QTC_ASSERT(cmakeBc, return); QTC_ASSERT(cmakeBc, return);
if (!activeTarget() || activeTarget()->activeBuildConfiguration() != cmakeBc)
Target *t = activeTarget();
if (!t || t->activeBuildConfiguration() != cmakeBc)
return; return;
Kit *k = t->kit();
BuildDirManager *bdm = cmakeBc->buildDirManager(); BuildDirManager *bdm = cmakeBc->buildDirManager();
QTC_ASSERT(bdm, return); QTC_ASSERT(bdm, return);
@@ -219,7 +222,7 @@ void CMakeProject::parseCMakeOutput()
createGeneratedCodeModelSupport(); createGeneratedCodeModelSupport();
ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(cmakeBc->target()->kit()); ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(k);
if (!tc) { if (!tc) {
emit fileListChanged(); emit fileListChanged();
return; return;
@@ -230,7 +233,7 @@ void CMakeProject::parseCMakeOutput()
CppTools::ProjectPartBuilder ppBuilder(pinfo); CppTools::ProjectPartBuilder ppBuilder(pinfo);
CppTools::ProjectPart::QtVersion activeQtVersion = CppTools::ProjectPart::NoQt; CppTools::ProjectPart::QtVersion activeQtVersion = CppTools::ProjectPart::NoQt;
if (QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(cmakeBc->target()->kit())) { if (QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k)) {
if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0)) if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0))
activeQtVersion = CppTools::ProjectPart::Qt4; activeQtVersion = CppTools::ProjectPart::Qt4;
else else