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
Marco Bubke
flatpak-qt-creator
Commits
af7b39e3
Commit
af7b39e3
authored
Oct 25, 2010
by
dt
Browse files
Qt4ProjectManager: Add some safety code
Might, or might not fix Task-Nr: QTCREATORBUG-2361
parent
a96267ea
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt4nodes.cpp
View file @
af7b39e3
...
...
@@ -1299,6 +1299,7 @@ void Qt4ProFileNode::asyncUpdate()
{
m_project
->
incrementPendingEvaluateFutures
();
setupReader
();
m_parseFutureWatcher
.
waitForFinished
();
QFuture
<
bool
>
future
=
QtConcurrent
::
run
(
&
Qt4ProFileNode
::
asyncEvaluate
,
this
);
m_parseFutureWatcher
.
setFuture
(
future
);
}
...
...
src/plugins/qt4projectmanager/qt4project.cpp
View file @
af7b39e3
...
...
@@ -628,6 +628,8 @@ void Qt4Project::update()
void
Qt4Project
::
scheduleAsyncUpdate
(
Qt4ProFileNode
*
node
)
{
if
(
m_asyncUpdateState
==
ShuttingDown
)
return
;
if
(
debug
)
qDebug
()
<<
"schduleAsyncUpdate (node)"
;
Q_ASSERT
(
m_asyncUpdateState
!=
NoState
);
...
...
@@ -694,6 +696,8 @@ void Qt4Project::scheduleAsyncUpdate()
{
if
(
debug
)
qDebug
()
<<
"scheduleAsyncUpdate"
;
if
(
m_asyncUpdateState
==
ShuttingDown
)
return
;
Q_ASSERT
(
m_asyncUpdateState
!=
NoState
);
if
(
m_cancelEvaluate
)
{
// we are in progress of canceling
// and will start the evaluation after that
...
...
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