diff options
| author | hjk <hjk121@nokiamail.com> | 2013-08-14 18:30:40 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2013-08-29 16:12:08 +0200 |
| commit | 36227d5c3a3f0ed5b399cf8da2efa923bd24455d (patch) | |
| tree | 3cd0605afc5d2c5f63a41201b209ffc692ea04dd /src/plugins/debugger/debuggerplugin.cpp | |
| parent | c90df2b35b7e5d3408e9ca2cfc3500d4b50b10c9 (diff) | |
| download | qt-creator-36227d5c3a3f0ed5b399cf8da2efa923bd24455d.tar.gz | |
ProjectExplorer: Introduce per-kit debugger configuration page
Change-Id: I65c76f3ff43e1479075926c7e3fa460cca74d8fe
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/debugger/debuggerplugin.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index d3e368dfb6..fec22e0a44 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -33,6 +33,7 @@ #include "debuggeractions.h" #include "debuggerinternalconstants.h" #include "debuggercore.h" +#include "debuggerkitconfigwidget.h" #include "debuggerdialogs.h" #include "debuggerengine.h" #include "debuggermainwindow.h" @@ -1626,7 +1627,7 @@ void DebuggerPluginPrivate::attachCore() DebuggerStartParameters sp; QString display = dlg.useLocalCoreFile() ? dlg.localCoreFile() : dlg.remoteCoreFile(); QTC_ASSERT(fillParameters(&sp, dlg.kit()), return); - DebuggerKitInformation::DebuggerItem info = DebuggerKitInformation::debuggerItem(dlg.kit()); + DebuggerItem info = DebuggerKitInformation::debuggerItem(dlg.kit()); sp.masterEngineType = info.engineType; sp.executable = dlg.localExecutableFile(); sp.coreFile = dlg.localCoreFile(); @@ -3182,6 +3183,7 @@ void DebuggerPluginPrivate::extensionsInitialized() foreach (IOptionsPage *op, engineOptionPages) m_plugin->addAutoReleasedObject(op); m_plugin->addAutoReleasedObject(new LocalsAndExpressionsOptionsPage); + m_plugin->addAutoReleasedObject(new DebuggerOptionsPage); connect(ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)), SLOT(onModeChanged(Core::IMode*))); @@ -3436,6 +3438,8 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess mstart->addSeparator(globalcontext, Constants::G_GENERAL); mstart->addSeparator(globalcontext, Constants::G_SPECIAL); + DebuggerItemManager::restoreDebuggers(); + KitManager::registerKitInformation(new DebuggerKitInformation); return theDebuggerCore->initialize(arguments, errorMessage); |