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

debugger: use DeviceProcessesDialog directly for attaching

Browse Source 
Change-Id: I916c42bc141f5bfbf5dd163b3d9dfeed3703ed94
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
hjk
2012-09-07 15:13:10 +02:00
parent 61291e9421
commit 15ea29533a
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1670,21 +1670,12 @@ void DebuggerPluginPrivate::attachToRunningApplication()
attachToProcess(false);
}
class DebuggerProcessesDialog : public ProjectExplorer::DeviceProcessesDialog {
public:
DebuggerProcessesDialog(DebuggerKitChooser::Mode m, QWidget *parent) :
ProjectExplorer::DeviceProcessesDialog(new DebuggerKitChooser(m), parent)
{
addAcceptButton(DeviceProcessesDialog::tr("&Attach to Process"));
}
};
void DebuggerPluginPrivate::attachToProcess(bool startServerOnly)
{
const DebuggerKitChooser::Mode mode = startServerOnly ?
DebuggerKitChooser::RemoteDebugging : DebuggerKitChooser::LocalDebugging;
DeviceProcessesDialog *dlg = new DebuggerProcessesDialog(mode, mainWindow());
DebuggerKitChooser *kitChooser = new DebuggerKitChooser(mode);
DeviceProcessesDialog *dlg = new DeviceProcessesDialog(kitChooser, mainWindow());
dlg->addAcceptButton(DeviceProcessesDialog::tr("&Attach to Process"));
dlg->showAllDevices();
if (dlg->exec() == QDialog::Rejected) {
@@ -1693,7 +1684,6 @@ void DebuggerPluginPrivate::attachToProcess(bool startServerOnly)
}
dlg->setAttribute(Qt::WA_DeleteOnClose);
KitChooser *kitChooser = dlg->kitChooser();
Kit *kit = kitChooser->currentKit();
QTC_ASSERT(kit, return);
IDevice::ConstPtr device = DeviceKitInformation::device(kit);