Commit 151187006bb1fe5e344e77cc9a5bcd97918a3849

con <qtc-committer @no…a.com> (Committer)
Tue Oct 13 12:15:46 CEST 2009
Thorbjørn Lindeijer (Author)
Tue Oct 13 12:12:51 CEST 2009

Tree SHA1: 3641e5d
Parent SHA1: 29a0c6d (Handle ambiguous AST nodes.)
raw diff | raw patch

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

Found by Roberto.
(cherry picked from commit b07c1be547d7beb432c43bb8f0c9301595a0dde8)

Diff rendering mode:
inline
side by side


728	728	return macros;
729	729	}
730	730
731		void CppModelManager::setIncludesInPaths(const QMap<QString, QStringList> includesInPaths)
	731	void CppModelManager::setIncludesInPaths(const QMap<QString, QStringList> &includesInPaths)
732	732	{
733	733	QMutexLocker locker(&mutex);
734	734	QMapIterator<QString, QStringList> i(includesInPaths);
…	…
1178	1178	future.waitForResume();
1179	1179
1180	1180	if (future.isCanceled())
1181		break;
	1181	return;
1182	1182
1183	1183	const QString path = paths.takeFirst();
1184	1184


162	162	QStringList internalFrameworkPaths() const;
163	163	QByteArray internalDefinedMacros() const;
164	164
165		void setIncludesInPaths(const QMap<QString, QStringList> includesInPaths);
	165	void setIncludesInPaths(const QMap<QString, QStringList> &includesInPaths);
166	166
167	167	static void updateIncludesInPaths(QFutureInterface<void> &future,
168	168	CppModelManager *manager,

Commit 151187006bb1fe5e344e77cc9a5bcd97918a3849

Gitorious