feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixed a crash on exit when include files are still being scanned

Browse Source 
Found by Roberto.
(cherry picked from commit b07c1be547)
This commit is contained in:
Thorbjørn Lindeijer
2009-10-13 12:12:51 +02:00
committed by con
parent 29a0c6d2a4
commit 151187006b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -728,7 +728,7 @@ QByteArray CppModelManager::internalDefinedMacros() const
return macros; return macros;
} }
void CppModelManager::setIncludesInPaths(const QMap<QString, QStringList> includesInPaths) void CppModelManager::setIncludesInPaths(const QMap<QString, QStringList> &includesInPaths)
{ {
QMutexLocker locker(&mutex); QMutexLocker locker(&mutex);
QMapIterator<QString, QStringList> i(includesInPaths); QMapIterator<QString, QStringList> i(includesInPaths);
@@ -1178,7 +1178,7 @@ void CppModelManager::updateIncludesInPaths(QFutureInterface<void> &future,
future.waitForResume(); future.waitForResume();
if (future.isCanceled()) if (future.isCanceled())
break; return;
const QString path = paths.takeFirst(); const QString path = paths.takeFirst();

2
src/plugins/cpptools/cppmodelmanager.h
View File

@@ -162,7 +162,7 @@ private:
QStringList internalFrameworkPaths() const; QStringList internalFrameworkPaths() const;
QByteArray internalDefinedMacros() const; QByteArray internalDefinedMacros() const;
void setIncludesInPaths(const QMap<QString, QStringList> includesInPaths); void setIncludesInPaths(const QMap<QString, QStringList> &includesInPaths);
static void updateIncludesInPaths(QFutureInterface<void> &future, static void updateIncludesInPaths(QFutureInterface<void> &future,
CppModelManager *manager, CppModelManager *manager,