diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-04-11 18:27:52 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-04-11 18:27:52 +0200 |
| commit | 9ff8979da32642e60029cb7cf8536eed6442c270 (patch) | |
| tree | 4c1bb2288209c4c9b65408d7ec104747b278cd43 /src/plugins/todo | |
| parent | e6eb061293a63bf52fb34dc39016d0fa8bbbe12b (diff) | |
| parent | 567098f210a7f73b98f02132a545bd5b5420e5a4 (diff) | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
src/plugins/cpptools/cppchecksymbols.h
src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp
Change-Id: I887ba071fa637ad44e39bcae581738fa078a6612
Diffstat (limited to 'src/plugins/todo')
| -rw-r--r-- | src/plugins/todo/todoitemsprovider.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/todo/todoitemsprovider.cpp b/src/plugins/todo/todoitemsprovider.cpp index c20b1b560d..b2e985a633 100644 --- a/src/plugins/todo/todoitemsprovider.cpp +++ b/src/plugins/todo/todoitemsprovider.cpp @@ -108,7 +108,7 @@ void TodoItemsProvider::createScanners() void TodoItemsProvider::setItemsListWithinStartupProject() { QHashIterator<QString, QList<TodoItem> > it(m_itemsHash); - QStringList fileNames = m_startupProject->files(ProjectExplorer::Project::ExcludeGeneratedFiles); + QSet<QString> fileNames = QSet<QString>::fromList(m_startupProject->files(ProjectExplorer::Project::ExcludeGeneratedFiles)); while (it.hasNext()) { it.next(); if (fileNames.contains(it.key())) |