diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-07-03 16:55:27 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-07-03 16:55:27 +0200 |
| commit | 8685ff8a28d54938f8178966954f7e36b2d15a20 (patch) | |
| tree | 2e05c46e4ae061f76aa6ab1ed85f5d6ad2269652 /src/plugins/debugger/debuggerplugin.cpp | |
| parent | 99647b89e57e3d2ba48d26b8ae6f607d56b91477 (diff) | |
| parent | b05603a44d67d1cfa080a16ae774485d26152f4f (diff) | |
| download | qt-creator-8685ff8a28d54938f8178966954f7e36b2d15a20.tar.gz | |
Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: I5d2018d3437b99bcdffa92bf1a212f42923c4fad
Diffstat (limited to 'src/plugins/debugger/debuggerplugin.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index f6b662e258..4c54a82050 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -1678,7 +1678,7 @@ void DebuggerPluginPrivate::attachToProcess(bool startServerOnly) DebuggerKitChooser::RemoteDebugging : DebuggerKitChooser::LocalDebugging; DebuggerKitChooser *kitChooser = new DebuggerKitChooser(mode); DeviceProcessesDialog *dlg = new DeviceProcessesDialog(kitChooser, mainWindow()); - dlg->addAcceptButton(DeviceProcessesDialog::tr("&Attach to Process")); + dlg->addAcceptButton(ProjectExplorer::DeviceProcessesDialog::tr("&Attach to Process")); dlg->showAllDevices(); if (dlg->exec() == QDialog::Rejected) { delete dlg; |