Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
fba7d769
Commit
fba7d769
authored
Sep 23, 2009
by
dt
Browse files
Canceling the wizard for a new cmake build configuration still created.
Made virtual newBuildConfiguration return a bool
parent
0f353387
Changes
10
Hide whitespace changes
Inline
Side-by-side
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View file @
fba7d769
...
...
@@ -114,6 +114,7 @@ void CMakeProject::slotActiveBuildConfiguration()
void
CMakeProject
::
fileChanged
(
const
QString
&
fileName
)
{
Q_UNUSED
(
fileName
)
if
(
m_insideFileChanged
==
true
)
return
;
m_insideFileChanged
=
true
;
...
...
@@ -537,7 +538,7 @@ QList<ProjectExplorer::BuildConfigWidget*> CMakeProject::subConfigWidgets()
return
list
;
}
void
CMakeProject
::
newBuildConfiguration
(
const
QString
&
buildConfiguration
)
bool
CMakeProject
::
newBuildConfiguration
(
const
QString
&
buildConfiguration
)
{
// Default to all
if
(
targets
().
contains
(
"all"
))
...
...
@@ -548,7 +549,9 @@ QList<ProjectExplorer::BuildConfigWidget*> CMakeProject::subConfigWidgets()
setValue
(
buildConfiguration
,
"buildDirectory"
,
copw
.
buildDirectory
());
setValue
(
buildConfiguration
,
"msvcVersion"
,
copw
.
msvcVersion
());
parseCMakeLists
();
return
true
;
}
return
false
;
}
ProjectExplorer
::
ProjectNode
*
CMakeProject
::
rootProjectNode
()
const
...
...
src/plugins/cmakeprojectmanager/cmakeproject.h
View file @
fba7d769
...
...
@@ -94,7 +94,7 @@ public:
// This method is called for new build configurations
// You should probably set some default values in this method
virtual
void
newBuildConfiguration
(
const
QString
&
buildConfiguration
);
virtual
bool
newBuildConfiguration
(
const
QString
&
buildConfiguration
);
virtual
ProjectExplorer
::
ProjectNode
*
rootProjectNode
()
const
;
...
...
src/plugins/genericprojectmanager/genericproject.cpp
View file @
fba7d769
...
...
@@ -437,9 +437,10 @@ QList<ProjectExplorer::BuildConfigWidget*> GenericProject::subConfigWidgets()
return
QList
<
ProjectExplorer
::
BuildConfigWidget
*>
();
}
void
GenericProject
::
newBuildConfiguration
(
const
QString
&
buildConfiguration
)
bool
GenericProject
::
newBuildConfiguration
(
const
QString
&
buildConfiguration
)
{
makeStep
()
->
setBuildTarget
(
buildConfiguration
,
"all"
,
true
);
return
true
;
}
GenericProjectNode
*
GenericProject
::
rootProjectNode
()
const
...
...
src/plugins/genericprojectmanager/genericproject.h
View file @
fba7d769
...
...
@@ -82,7 +82,7 @@ public:
virtual
ProjectExplorer
::
BuildConfigWidget
*
createConfigWidget
();
virtual
QList
<
ProjectExplorer
::
BuildConfigWidget
*>
subConfigWidgets
();
virtual
void
newBuildConfiguration
(
const
QString
&
buildConfiguration
);
virtual
bool
newBuildConfiguration
(
const
QString
&
buildConfiguration
);
virtual
GenericProjectNode
*
rootProjectNode
()
const
;
virtual
QStringList
files
(
FilesMode
fileMode
)
const
;
...
...
src/plugins/projectexplorer/buildsettingspropertiespage.cpp
View file @
fba7d769
...
...
@@ -282,12 +282,13 @@ void BuildSettingsWidget::createConfiguration()
newDisplayName
+=
QString
::
number
(
i
);
}
m_project
->
add
BuildConfiguration
(
newBuildConfiguration
)
;
m_project
->
setDisplayNameFor
(
newBuildConfiguration
,
newDisplayName
);
m_project
->
newBuildConfiguration
(
newBuildConfiguration
);
m_buildConfiguration
=
newBuildConfiguration
;
if
(
m_project
->
new
BuildConfiguration
(
newBuildConfiguration
)
)
{
m_project
->
addBuildConfiguration
(
newBuildConfiguration
);
m_project
->
setDisplayNameFor
(
newBuildConfiguration
,
newDisplayName
);
m_buildConfiguration
=
newBuildConfiguration
;
updateBuildSettings
();
updateBuildSettings
();
}
}
void
BuildSettingsWidget
::
cloneConfiguration
()
...
...
src/plugins/projectexplorer/project.h
View file @
fba7d769
...
...
@@ -132,7 +132,7 @@ public:
/* This method is called for new build configurations. You should probably
* set some default values in this method.
*/
virtual
void
newBuildConfiguration
(
const
QString
&
buildConfiguration
)
=
0
;
virtual
bool
newBuildConfiguration
(
const
QString
&
buildConfiguration
)
=
0
;
virtual
ProjectNode
*
rootProjectNode
()
const
=
0
;
...
...
src/plugins/qmlprojectmanager/qmlproject.cpp
View file @
fba7d769
...
...
@@ -214,8 +214,9 @@ QList<ProjectExplorer::BuildConfigWidget*> QmlProject::subConfigWidgets()
return
QList
<
ProjectExplorer
::
BuildConfigWidget
*>
();
}
void
QmlProject
::
newBuildConfiguration
(
const
QString
&
)
bool
QmlProject
::
newBuildConfiguration
(
const
QString
&
)
{
return
true
;
}
QmlProjectNode
*
QmlProject
::
rootProjectNode
()
const
...
...
src/plugins/qmlprojectmanager/qmlproject.h
View file @
fba7d769
...
...
@@ -76,7 +76,7 @@ public:
virtual
ProjectExplorer
::
BuildConfigWidget
*
createConfigWidget
();
virtual
QList
<
ProjectExplorer
::
BuildConfigWidget
*>
subConfigWidgets
();
virtual
void
newBuildConfiguration
(
const
QString
&
buildConfiguration
);
virtual
bool
newBuildConfiguration
(
const
QString
&
buildConfiguration
);
virtual
QmlProjectNode
*
rootProjectNode
()
const
;
virtual
QStringList
files
(
FilesMode
fileMode
)
const
;
...
...
src/plugins/qt4projectmanager/qt4project.cpp
View file @
fba7d769
...
...
@@ -759,9 +759,10 @@ void Qt4Project::addDefaultBuild()
}
}
void
Qt4Project
::
newBuildConfiguration
(
const
QString
&
buildConfiguration
)
bool
Qt4Project
::
newBuildConfiguration
(
const
QString
&
buildConfiguration
)
{
Q_UNUSED
(
buildConfiguration
)
return
true
;
}
void
Qt4Project
::
proFileParseError
(
const
QString
&
errorMessage
)
...
...
src/plugins/qt4projectmanager/qt4project.h
View file @
fba7d769
...
...
@@ -170,7 +170,7 @@ public:
QList
<
ProjectExplorer
::
BuildConfigWidget
*>
subConfigWidgets
();
void
setQtVersion
(
const
QString
&
buildConfiguration
,
int
id
);
virtual
void
newBuildConfiguration
(
const
QString
&
buildConfiguration
);
virtual
bool
newBuildConfiguration
(
const
QString
&
buildConfiguration
);
QList
<
Internal
::
Qt4ProFileNode
*>
applicationProFiles
()
const
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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