Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
flatpak-qt-creator
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Marco Bubke
flatpak-qt-creator
Commits
791fe667
Commit
791fe667
authored
14 years ago
by
Tobias Hunger
Browse files
Options
Downloads
Patches
Plain Diff
Return whether steps were queued or not
* Have the BuildManager report whether it queued the buildsteps or not.
parent
06c7cb9b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/plugins/projectexplorer/buildmanager.cpp
+15
-12
15 additions, 12 deletions
src/plugins/projectexplorer/buildmanager.cpp
src/plugins/projectexplorer/buildmanager.h
+6
-6
6 additions, 6 deletions
src/plugins/projectexplorer/buildmanager.h
with
21 additions
and
18 deletions
src/plugins/projectexplorer/buildmanager.cpp
+
15
−
12
View file @
791fe667
...
@@ -411,7 +411,7 @@ bool BuildManager::buildQueueAppend(QList<BuildStep *> steps)
...
@@ -411,7 +411,7 @@ bool BuildManager::buildQueueAppend(QList<BuildStep *> steps)
return
true
;
return
true
;
}
}
void
BuildManager
::
buildProjects
(
const
QList
<
BuildConfiguration
*>
&
configurations
)
bool
BuildManager
::
buildProjects
(
const
QList
<
BuildConfiguration
*>
&
configurations
)
{
{
QList
<
BuildStep
*>
steps
;
QList
<
BuildStep
*>
steps
;
foreach
(
BuildConfiguration
*
bc
,
configurations
)
foreach
(
BuildConfiguration
*
bc
,
configurations
)
...
@@ -420,15 +420,16 @@ void BuildManager::buildProjects(const QList<BuildConfiguration *> &configuratio
...
@@ -420,15 +420,16 @@ void BuildManager::buildProjects(const QList<BuildConfiguration *> &configuratio
bool
success
=
buildQueueAppend
(
steps
);
bool
success
=
buildQueueAppend
(
steps
);
if
(
!
success
)
{
if
(
!
success
)
{
m_outputWindow
->
popup
(
false
);
m_outputWindow
->
popup
(
false
);
return
;
return
false
;
}
}
if
(
ProjectExplorerPlugin
::
instance
()
->
projectExplorerSettings
().
showCompilerOutput
)
if
(
ProjectExplorerPlugin
::
instance
()
->
projectExplorerSettings
().
showCompilerOutput
)
m_outputWindow
->
popup
(
false
);
m_outputWindow
->
popup
(
false
);
startBuildQueue
();
startBuildQueue
();
return
true
;
}
}
void
BuildManager
::
deployProjects
(
const
QList
<
BuildConfiguration
*>
&
configurations
)
bool
BuildManager
::
deployProjects
(
const
QList
<
BuildConfiguration
*>
&
configurations
)
{
{
QList
<
BuildStep
*>
steps
;
QList
<
BuildStep
*>
steps
;
foreach
(
BuildConfiguration
*
bc
,
configurations
)
foreach
(
BuildConfiguration
*
bc
,
configurations
)
...
@@ -437,15 +438,16 @@ void BuildManager::deployProjects(const QList<BuildConfiguration *> &configurati
...
@@ -437,15 +438,16 @@ void BuildManager::deployProjects(const QList<BuildConfiguration *> &configurati
bool
success
=
buildQueueAppend
(
steps
);
bool
success
=
buildQueueAppend
(
steps
);
if
(
!
success
)
{
if
(
!
success
)
{
m_outputWindow
->
popup
(
false
);
m_outputWindow
->
popup
(
false
);
return
;
return
false
;
}
}
if
(
ProjectExplorerPlugin
::
instance
()
->
projectExplorerSettings
().
showCompilerOutput
)
if
(
ProjectExplorerPlugin
::
instance
()
->
projectExplorerSettings
().
showCompilerOutput
)
m_outputWindow
->
popup
(
false
);
m_outputWindow
->
popup
(
false
);
startBuildQueue
();
startBuildQueue
();
return
true
;
}
}
void
BuildManager
::
cleanProjects
(
const
QList
<
BuildConfiguration
*>
&
configurations
)
bool
BuildManager
::
cleanProjects
(
const
QList
<
BuildConfiguration
*>
&
configurations
)
{
{
QList
<
BuildStep
*>
steps
;
QList
<
BuildStep
*>
steps
;
foreach
(
BuildConfiguration
*
bc
,
configurations
)
foreach
(
BuildConfiguration
*
bc
,
configurations
)
...
@@ -454,27 +456,28 @@ void BuildManager::cleanProjects(const QList<BuildConfiguration *> &configuratio
...
@@ -454,27 +456,28 @@ void BuildManager::cleanProjects(const QList<BuildConfiguration *> &configuratio
bool
success
=
buildQueueAppend
(
steps
);
bool
success
=
buildQueueAppend
(
steps
);
if
(
!
success
)
{
if
(
!
success
)
{
m_outputWindow
->
popup
(
false
);
m_outputWindow
->
popup
(
false
);
return
;
return
false
;
}
}
if
(
ProjectExplorerPlugin
::
instance
()
->
projectExplorerSettings
().
showCompilerOutput
)
if
(
ProjectExplorerPlugin
::
instance
()
->
projectExplorerSettings
().
showCompilerOutput
)
m_outputWindow
->
popup
(
false
);
m_outputWindow
->
popup
(
false
);
startBuildQueue
();
startBuildQueue
();
return
true
;
}
}
void
BuildManager
::
buildProject
(
BuildConfiguration
*
configuration
)
bool
BuildManager
::
buildProject
(
BuildConfiguration
*
configuration
)
{
{
buildProjects
(
QList
<
BuildConfiguration
*>
()
<<
configuration
);
return
buildProjects
(
QList
<
BuildConfiguration
*>
()
<<
configuration
);
}
}
void
BuildManager
::
deployProject
(
BuildConfiguration
*
configuration
)
bool
BuildManager
::
deployProject
(
BuildConfiguration
*
configuration
)
{
{
deployProjects
(
QList
<
BuildConfiguration
*>
()
<<
configuration
);
return
deployProjects
(
QList
<
BuildConfiguration
*>
()
<<
configuration
);
}
}
void
BuildManager
::
cleanProject
(
BuildConfiguration
*
configuration
)
bool
BuildManager
::
cleanProject
(
BuildConfiguration
*
configuration
)
{
{
cleanProjects
(
QList
<
BuildConfiguration
*>
()
<<
configuration
);
return
cleanProjects
(
QList
<
BuildConfiguration
*>
()
<<
configuration
);
}
}
void
BuildManager
::
appendStep
(
BuildStep
*
step
)
void
BuildManager
::
appendStep
(
BuildStep
*
step
)
...
...
This diff is collapsed.
Click to expand it.
src/plugins/projectexplorer/buildmanager.h
+
6
−
6
View file @
791fe667
...
@@ -72,12 +72,12 @@ public:
...
@@ -72,12 +72,12 @@ public:
bool
tasksAvailable
()
const
;
bool
tasksAvailable
()
const
;
void
buildProject
(
BuildConfiguration
*
bc
);
bool
buildProject
(
BuildConfiguration
*
bc
);
void
buildProjects
(
const
QList
<
BuildConfiguration
*>
&
configurations
);
bool
buildProjects
(
const
QList
<
BuildConfiguration
*>
&
configurations
);
void
deployProject
(
BuildConfiguration
*
bc
);
bool
deployProject
(
BuildConfiguration
*
bc
);
void
deployProjects
(
const
QList
<
BuildConfiguration
*>
&
configurations
);
bool
deployProjects
(
const
QList
<
BuildConfiguration
*>
&
configurations
);
void
cleanProject
(
BuildConfiguration
*
configuration
);
bool
cleanProject
(
BuildConfiguration
*
configuration
);
void
cleanProjects
(
const
QList
<
BuildConfiguration
*>
&
configurations
);
bool
cleanProjects
(
const
QList
<
BuildConfiguration
*>
&
configurations
);
bool
isBuilding
(
Project
*
p
);
bool
isBuilding
(
Project
*
p
);
bool
isBuilding
(
BuildStep
*
step
);
bool
isBuilding
(
BuildStep
*
step
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment