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

Merge remote-tracking branch 'origin/3.3'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/projectexplorer/projectexplorer.cpp
	src/shared/qbs

Change-Id: I6d91042bb48314d00be721099aed19feca74e0ce
This commit is contained in:
Eike Ziller
2014-12-10 13:11:02 +01:00
parent 62b70fb239 f8a68cc69a
commit 541d00453a
71 changed files with 13040 additions and 2735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/coreplugin/progressmanager/progressmanager.cpp
View File

@@ -285,6 +285,7 @@ ProgressManagerPrivate::ProgressManagerPrivate()
ProgressManagerPrivate::~ProgressManagerPrivate()
{
stopFadeOfSummaryProgress();
qDeleteAll(m_taskList);
m_taskList.clear();
ExtensionSystem::PluginManager::removeObject(m_statusBarWidgetContainer);