summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@nokia.com>2012-07-18 12:02:35 +0200
committerDaniel Teske <daniel.teske@nokia.com>2012-07-18 12:03:01 +0200
commitde9ad59590c7626b8285a1456f30430e4244b3a8 (patch)
tree9d8a95f7096630f2ec0bd5966d115548a38010f4 /src
parenteef043e0552a0121f80fc5e3641d82c02ff33e33 (diff)
downloadqt-creator-de9ad59590c7626b8285a1456f30430e4244b3a8.tar.gz
Fix compile
Change-Id: I1f9afb9f802d8eae4d95e8505328d1dccafdc98a Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp6
-rw-r--r--src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h1
2 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 6bdb1c0c99..423596e518 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -56,10 +56,10 @@ const char CMAKE_BC_ID[] = "CMakeProjectManager.CMakeBuildConfiguration";
const char BUILD_DIRECTORY_KEY[] = "CMakeProjectManager.CMakeBuildConfiguration.BuildDirectory";
} // namespace
-CMakeBuildConfiguration::CMakeBuildConfiguration(CMakeProject *parent) :
+CMakeBuildConfiguration::CMakeBuildConfiguration(ProjectExplorer::Target *parent) :
BuildConfiguration(parent, Core::Id(CMAKE_BC_ID))
{
- m_buildDirectory = parent->defaultBuildDirectory();
+ m_buildDirectory = static_cast<CMakeProject *>(parent->project())->defaultBuildDirectory();
}
CMakeBuildConfiguration::CMakeBuildConfiguration(ProjectExplorer::Target *parent,
@@ -187,7 +187,7 @@ CMakeBuildConfiguration *CMakeBuildConfigurationFactory::create(ProjectExplorer:
if (!ok || buildConfigurationName.isEmpty())
return 0;
- CMakeBuildConfiguration *bc = new CMakeBuildConfiguration(project);
+ CMakeBuildConfiguration *bc = new CMakeBuildConfiguration(parent);
bc->setDisplayName(buildConfigurationName);
ProjectExplorer::BuildStepList *buildSteps = bc->stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
index ca4285606d..01be5dab51 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
@@ -43,7 +43,6 @@ class ToolChain;
namespace CMakeProjectManager {
namespace Internal {
-class CMakeProject;
class CMakeBuildConfigurationFactory;
class CMakeBuildConfiguration : public ProjectExplorer::BuildConfiguration