Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
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
Tobias Hunger
qt-creator
Commits
dfa0c14f
Commit
dfa0c14f
authored
15 years ago
by
dt
Browse files
Options
Downloads
Patches
Plain Diff
Fix crash on unloading project that is building.
Task-Nr: QTCREATOR-7
parent
e72517e4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/plugins/projectexplorer/buildmanager.cpp
+16
-0
16 additions, 0 deletions
src/plugins/projectexplorer/buildmanager.cpp
src/plugins/projectexplorer/buildmanager.h
+1
-0
1 addition, 0 deletions
src/plugins/projectexplorer/buildmanager.h
with
17 additions
and
0 deletions
src/plugins/projectexplorer/buildmanager.cpp
+
16
−
0
View file @
dfa0c14f
...
...
@@ -43,6 +43,7 @@
#include
<coreplugin/icore.h>
#include
<coreplugin/progressmanager/progressmanager.h>
#include
<coreplugin/progressmanager/futureprogress.h>
#include
<projectexplorer/session.h>
#include
<extensionsystem/pluginmanager.h>
#include
<utils/qtcassert.h>
...
...
@@ -84,6 +85,9 @@ BuildManager::BuildManager(ProjectExplorerPlugin *parent)
connect
(
&
m_watcher
,
SIGNAL
(
progressRangeChanged
(
int
,
int
)),
this
,
SLOT
(
progressChanged
()));
connect
(
parent
->
session
(),
SIGNAL
(
aboutToRemoveProject
(
ProjectExplorer
::
Project
*
)),
this
,
SLOT
(
aboutToRemoveProject
(
ProjectExplorer
::
Project
*
)));
m_outputWindow
=
new
CompileOutputWindow
(
this
);
pm
->
addObject
(
m_outputWindow
);
...
...
@@ -114,6 +118,18 @@ BuildManager::~BuildManager()
delete
m_outputWindow
;
}
void
BuildManager
::
aboutToRemoveProject
(
ProjectExplorer
::
Project
*
p
)
{
QHash
<
Project
*
,
int
>::
iterator
it
=
m_activeBuildSteps
.
find
(
p
);
QHash
<
Project
*
,
int
>::
iterator
end
=
m_activeBuildSteps
.
end
();
if
(
it
!=
end
&&
*
it
>
0
)
{
// We are building the project that's about to be removed.
// We cancel the whole queue, which isn't the nicest thing to do
// but a safe thing.
cancel
();
}
}
bool
BuildManager
::
isBuilding
()
const
{
// we are building even if we are not running yet
...
...
This diff is collapsed.
Click to expand it.
src/plugins/projectexplorer/buildmanager.h
+
1
−
0
View file @
dfa0c14f
...
...
@@ -85,6 +85,7 @@ public slots:
void
showTaskWindow
();
void
toggleTaskWindow
();
void
toggleOutputWindow
();
void
aboutToRemoveProject
(
ProjectExplorer
::
Project
*
p
);
signals:
void
buildStateChanged
(
ProjectExplorer
::
Project
*
pro
);
...
...
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