forked from qt-creator/qt-creator
Fixes: debugger: remove cached projecte explorer singleton pointer
This commit is contained in:
@@ -339,7 +339,6 @@ void GdbOptionPage::apply()
|
|||||||
|
|
||||||
DebuggerPlugin::DebuggerPlugin()
|
DebuggerPlugin::DebuggerPlugin()
|
||||||
{
|
{
|
||||||
m_pm = 0;
|
|
||||||
m_generalOptionPage = 0;
|
m_generalOptionPage = 0;
|
||||||
m_locationMark = 0;
|
m_locationMark = 0;
|
||||||
m_manager = 0;
|
m_manager = 0;
|
||||||
@@ -390,8 +389,6 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *error_mes
|
|||||||
|
|
||||||
m_manager = new DebuggerManager;
|
m_manager = new DebuggerManager;
|
||||||
|
|
||||||
m_pm = ExtensionSystem::PluginManager::instance();
|
|
||||||
|
|
||||||
ICore *core = ICore::instance();
|
ICore *core = ICore::instance();
|
||||||
QTC_ASSERT(core, return false);
|
QTC_ASSERT(core, return false);
|
||||||
|
|
||||||
@@ -708,7 +705,7 @@ void DebuggerPlugin::extensionsInitialized()
|
|||||||
|
|
||||||
ProjectExplorer::ProjectExplorerPlugin *DebuggerPlugin::projectExplorer() const
|
ProjectExplorer::ProjectExplorerPlugin *DebuggerPlugin::projectExplorer() const
|
||||||
{
|
{
|
||||||
return m_pm->getObject<ProjectExplorer::ProjectExplorerPlugin>();
|
return ProjectExplorer::ProjectExplorerPlugin::instance();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*! Activates the previous mode when the current mode is the debug mode. */
|
/*! Activates the previous mode when the current mode is the debug mode. */
|
||||||
|
|||||||
@@ -104,7 +104,6 @@ private:
|
|||||||
DebuggerManager *m_manager;
|
DebuggerManager *m_manager;
|
||||||
DebugMode *m_debugMode;
|
DebugMode *m_debugMode;
|
||||||
|
|
||||||
ExtensionSystem::PluginManager *m_pm;
|
|
||||||
GdbOptionPage *m_generalOptionPage;
|
GdbOptionPage *m_generalOptionPage;
|
||||||
|
|
||||||
QString m_previousMode;
|
QString m_previousMode;
|
||||||
|
|||||||
Reference in New Issue
Block a user