diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-12-10 13:11:02 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-12-10 13:20:02 +0100 |
| commit | 541d00453ab134874a2a2f95079703f1f57ebd89 (patch) | |
| tree | fd2d375681c6fb266a740971442964e8a141ac3e /src/plugins/coreplugin/progressmanager | |
| parent | 62b70fb2398ca16c471ce65be2bfb996a030302b (diff) | |
| parent | f8a68cc69a9c8cf0c0ddd15e9dae4bd84ae8b0bd (diff) | |
| download | qt-creator-541d00453ab134874a2a2f95079703f1f57ebd89.tar.gz | |
Merge remote-tracking branch 'origin/3.3'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/projectexplorer/projectexplorer.cpp
src/shared/qbs
Change-Id: I6d91042bb48314d00be721099aed19feca74e0ce
Diffstat (limited to 'src/plugins/coreplugin/progressmanager')
| -rw-r--r-- | src/plugins/coreplugin/progressmanager/progressmanager.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp index 8fe9efc1fe..914ec3afde 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp +++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp @@ -285,6 +285,7 @@ ProgressManagerPrivate::ProgressManagerPrivate() ProgressManagerPrivate::~ProgressManagerPrivate() { + stopFadeOfSummaryProgress(); qDeleteAll(m_taskList); m_taskList.clear(); ExtensionSystem::PluginManager::removeObject(m_statusBarWidgetContainer); |