← Back to branch summary

~timo-jyrinki/ubuntu/saucy/qtcreator/add_workaround_back

« back to all changes in this revision

Viewing changes to src/plugins/debugger/debuggerengine.cpp

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2011-11-18 16:18:49 UTC
  • mfrom: (1.1.16)
  • Revision ID: package-import@ubuntu.com-20111118161849-5t8jugl6egvs4iev
Tags: 2.4.0~rc-0ubuntu1
* New upstream release candidate.
* Drop 04_fix_ftbfs_arm_qreal.diff, merged upstream.
* Refresh 01_fix_installation_paths.diff.
* Compress binary packages with xz.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/debugger/debuggerengine.cpp
4
4
**
5
5
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
6
6
**
7
 
** Contact: Nokia Corporation (info@qt.nokia.com)
 
7
** Contact: Nokia Corporation (qt-info@nokia.com)
8
8
**
9
9
**
10
10
** GNU Lesser General Public License Usage
26
26
** conditions contained in a signed written agreement between you and Nokia.
27
27
**
28
28
** If you have questions regarding the use of this file, please contact
29
 
** Nokia at info@qt.nokia.com.
 
29
** Nokia at qt-info@nokia.com.
30
30
**
31
31
**************************************************************************/
32
32
 
1209
1209
// Called by DebuggerRunControl.
1210
1210
void DebuggerEngine::quitDebugger()
1211
1211
{
1212
 
    showMessage("QUIT DEBUGGER REQUESTED");
 
1212
    showMessage(_("QUIT DEBUGGER REQUESTED IN STATE %1").arg(state()));
1213
1213
    d->m_targetState = DebuggerFinished;
1214
1214
    switch (state()) {
1215
1215
    case InferiorStopOk:
1225
1225
    case EngineRunFailed:
1226
1226
    case DebuggerFinished:
1227
1227
        break;
 
1228
    case InferiorSetupRequested:
 
1229
        notifyInferiorSetupFailed();
 
1230
        break;
1228
1231
    default:
1229
1232
        // FIXME: We should disable the actions connected to that.
1230
1233
        notifyInferiorIll();
1232
1235
    }
1233
1236
}
1234
1237
 
 
1238
void DebuggerEngine::abortDebugger()
 
1239
{
 
1240
    // Overridden in e.g. GdbEngine.
 
1241
    quitDebugger();
 
1242
}
 
1243
 
1235
1244
void DebuggerEngine::requestInterruptInferior()
1236
1245
{
1237
1246
    d->doInterruptInferior();