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

Merge remote-tracking branch 'origin/2.7'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I84145b02bf4f80848c0c1d762de34738f08bb78f
This commit is contained in:
Oswald Buddenhagen
2013-02-18 13:49:05 +01:00
parent e46a63b93e 80263a5221
commit 1ffe15a471
420 changed files with 20260 additions and 13624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1309,7 +1309,8 @@ void PluginManagerPrivate::profilingReport(const char *what, const PluginSpec *s
const int absoluteElapsedMS = m_profileTimer->elapsed();
const int elapsedMS = absoluteElapsedMS - m_profileElapsedMS;
m_profileElapsedMS = absoluteElapsedMS;
m_profileTotal[spec] += elapsedMS;
if (spec)
m_profileTotal[spec] += elapsedMS;
if (spec)
qDebug("%-22s %-22s %8dms (%8dms)", what, qPrintable(spec->name()), absoluteElapsedMS, elapsedMS);
else