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/timeline/qml/MainView.qml
	src/plugins/git/gitclient.cpp

Change-Id: I0b6ec7b9a592014deb0dd2e1145b19dd6753b1c3
This commit is contained in:
Eike Ziller
2015-04-15 17:45:47 +02:00
parent 3d6d33f60d bd964ab0be
commit 50fe3585a8
65 changed files with 2457 additions and 1578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/coreplugin/coreplugin.cpp
View File

@@ -44,6 +44,8 @@
#include <coreplugin/locator/locator.h>
#include <coreplugin/coreconstants.h>
#include <extensionsystem/pluginerroroverview.h>
#include <extensionsystem/pluginmanager.h>
#include <utils/macroexpander.h>
#include <utils/savefile.h>
#include <utils/stringutils.h>
@@ -217,6 +219,12 @@ void CorePlugin::extensionsInitialized()
m_findPlugin->extensionsInitialized();
m_locator->extensionsInitialized();
m_mainWindow->extensionsInitialized();
if (ExtensionSystem::PluginManager::hasError()) {
auto errorOverview = new ExtensionSystem::PluginErrorOverview(m_mainWindow);
errorOverview->setAttribute(Qt::WA_DeleteOnClose);
errorOverview->setModal(true);
errorOverview->show();
}
}
bool CorePlugin::delayedInitialize()