Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Tobias Hunger
qt-creator
Commits
937340cc
Commit
937340cc
authored
Mar 17, 2009
by
Roberto Raggi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't process the documents from QtConcurrent threads.
parent
a744a731
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
src/plugins/cpptools/cppmodelmanager.cpp
src/plugins/cpptools/cppmodelmanager.cpp
+4
-5
No files found.
src/plugins/cpptools/cppmodelmanager.cpp
View file @
937340cc
...
...
@@ -214,7 +214,6 @@ private:
Document
::
Ptr
m_currentDoc
;
QSet
<
QString
>
m_todo
;
QSet
<
QString
>
m_processed
;
QFutureSynchronizer
<
void
>
m_synchronizer
;
};
}
// namespace Internal
...
...
@@ -224,9 +223,7 @@ CppPreprocessor::CppPreprocessor(QPointer<CppModelManager> modelManager)
:
snapshot
(
modelManager
->
snapshot
()),
m_modelManager
(
modelManager
),
preprocess
(
this
,
&
env
)
{
m_synchronizer
.
setCancelOnWait
(
true
);
}
{
}
CppPreprocessor
::~
CppPreprocessor
()
{
}
...
...
@@ -510,7 +507,9 @@ void CppPreprocessor::sourceNeeded(QString &fileName, IncludeType type,
snapshot
.
insert
(
doc
->
fileName
(),
doc
);
m_todo
.
remove
(
fileName
);
m_synchronizer
.
addFuture
(
QtConcurrent
::
run
(
Process
(
m_modelManager
),
doc
));
Process
process
(
m_modelManager
);
process
(
doc
);
(
void
)
switchDocument
(
previousDoc
);
}
...
...
Write
Preview
Markdown
is supported
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