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

Merge remote-tracking branch 'origin/3.4'

Browse Source 
Conflicts:
	src/libs/extensionsystem/pluginview.cpp

Change-Id: I316199fe0a257cb085668ccb183b1590555278f2
This commit is contained in:
Eike Ziller
2015-04-02 11:56:55 +02:00
parent 97631c25df fd0b383932
commit e56118cc1e
37 changed files with 344 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/extensionsystem/pluginmanager.cpp
View File

@@ -1589,8 +1589,8 @@ void PluginManagerPrivate::profilingSummary() const
total += it1.value();
}
Sorter::ConstIterator it2 = sorter.begin();
Sorter::ConstIterator et2 = sorter.end();
Sorter::ConstIterator it2 = sorter.constBegin();
Sorter::ConstIterator et2 = sorter.constEnd();
for (; it2 != et2; ++it2)
qDebug("%-22s %8dms ( %5.2f%% )", qPrintable(it2.value()->name()),
it2.key(), 100.0 * it2.key() / total);