Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
4c199a3c
Commit
4c199a3c
authored
Sep 30, 2009
by
con
Browse files
Fix problem when canceling cmake build configuration wizard.
parent
92b905a6
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View file @
4c199a3c
...
...
@@ -104,11 +104,6 @@ bool CMakeBuildConfigurationFactory::create(const QString &type) const
if
(
!
ok
||
buildConfigurationName
.
isEmpty
())
return
false
;
BuildConfiguration
*
bc
=
new
BuildConfiguration
(
buildConfigurationName
);
m_project
->
addBuildConfiguration
(
bc
);
// Default to all
if
(
m_project
->
targets
().
contains
(
"all"
))
m_project
->
makeStep
()
->
setBuildTarget
(
buildConfigurationName
,
"all"
,
true
);
CMakeOpenProjectWizard
copw
(
m_project
->
projectManager
(),
m_project
->
sourceDirectory
(),
...
...
@@ -118,6 +113,10 @@ bool CMakeBuildConfigurationFactory::create(const QString &type) const
delete
bc
;
return
false
;
}
m_project
->
addBuildConfiguration
(
bc
);
// this also makes the name unique
// Default to all
if
(
m_project
->
targets
().
contains
(
"all"
))
m_project
->
makeStep
()
->
setBuildTarget
(
buildConfigurationName
,
"all"
,
true
);
bc
->
setValue
(
"buildDirectory"
,
copw
.
buildDirectory
());
bc
->
setValue
(
"msvcVersion"
,
copw
.
msvcVersion
());
m_project
->
parseCMakeLists
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment