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
b07c1be5
Commit
b07c1be5
authored
Oct 13, 2009
by
Thorbjørn Lindeijer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed a crash on exit when include files are still being scanned
Found by Roberto.
parent
1653e287
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
src/plugins/cpptools/cppmodelmanager.cpp
src/plugins/cpptools/cppmodelmanager.cpp
+2
-2
src/plugins/cpptools/cppmodelmanager.h
src/plugins/cpptools/cppmodelmanager.h
+1
-1
No files found.
src/plugins/cpptools/cppmodelmanager.cpp
View file @
b07c1be5
...
...
@@ -727,7 +727,7 @@ QByteArray CppModelManager::internalDefinedMacros() const
return
macros
;
}
void
CppModelManager
::
setIncludesInPaths
(
const
QMap
<
QString
,
QStringList
>
includesInPaths
)
void
CppModelManager
::
setIncludesInPaths
(
const
QMap
<
QString
,
QStringList
>
&
includesInPaths
)
{
QMutexLocker
locker
(
&
mutex
);
QMapIterator
<
QString
,
QStringList
>
i
(
includesInPaths
);
...
...
@@ -1182,7 +1182,7 @@ void CppModelManager::updateIncludesInPaths(QFutureInterface<void> &future,
future
.
waitForResume
();
if
(
future
.
isCanceled
())
b
re
ak
;
re
turn
;
const
QString
path
=
paths
.
takeFirst
();
...
...
src/plugins/cpptools/cppmodelmanager.h
View file @
b07c1be5
...
...
@@ -163,7 +163,7 @@ private:
QStringList
internalFrameworkPaths
()
const
;
QByteArray
internalDefinedMacros
()
const
;
void
setIncludesInPaths
(
const
QMap
<
QString
,
QStringList
>
includesInPaths
);
void
setIncludesInPaths
(
const
QMap
<
QString
,
QStringList
>
&
includesInPaths
);
static
void
updateIncludesInPaths
(
QFutureInterface
<
void
>
&
future
,
CppModelManager
*
manager
,
...
...
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