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

Debugger: Do not switch to undefined perspectives

Browse Source 
This implies switching to Debug mode and is currently triggered
by the GammrayIntegration. Avoid it as long as GammaRay has
a mode of its own.

Change-Id: I6174554610038cb66fb1bc977dc537b47941a1d8
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2016-03-09 11:02:39 +01:00
parent 27deb9c876
commit ea29a83095
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -959,7 +959,6 @@ public:
const QString &stopButtonText, const QString &cancelButtonText) const;
void registerAction(Core::Id actionId, const ActionDescription &desc, QAction *startAction);
void selectPerspective(const QByteArray &perspectiveId);
// Called when all dependent plugins have loaded.
void initialize();
@@ -3421,11 +3420,6 @@ void DebuggerPluginPrivate::onModeChanged(IMode *mode)
}
}
void DebuggerPluginPrivate::selectPerspective(const QByteArray &perspectiveId)
{
m_mainWindow->restorePerspective(perspectiveId);
}
void DebuggerPluginPrivate::registerAction(Id actionId, const ActionDescription &desc, QAction *startAction)
{
auto action = new QAction(this);
@@ -3616,8 +3610,11 @@ void registerPerspective(const QByteArray &perspectiveId, const Perspective &per
void selectPerspective(const QByteArray &perspectiveId)
{
// FIXME: Work-around aslong as the GammaRay integration does not use the same setup,
if (perspectiveId.isEmpty())
return;
ModeManager::activateMode(MODE_DEBUG);
dd->selectPerspective(perspectiveId);
dd->m_mainWindow->restorePerspective(perspectiveId);
}
void runAction(Id actionId)