← 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/qml/qmlcppengine.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/qml/qmlcppengine.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
 
501
501
void QmlCppEngine::slaveEngineStateChanged
502
502
    (DebuggerEngine *slaveEngine, const DebuggerState newState)
503
503
{
504
 
    DebuggerEngine *otherEngine = slaveEngine == d->m_cppEngine
505
 
         ? d->m_qmlEngine : d->m_cppEngine;
506
 
 
507
 
    EDEBUG("GOT SLAVE STATE: " << slaveEngine << newState);
508
 
    EDEBUG("  OTHER ENGINE: " << otherEngine << otherEngine->state());
509
 
    EDEBUG("  COMBINED ENGINE: " << this << state() << isDying());
510
 
 
 
504
    if (debug) {
 
505
        DebuggerEngine *otherEngine = slaveEngine == d->m_cppEngine
 
506
             ? d->m_qmlEngine : d->m_cppEngine;
 
507
 
 
508
        EDEBUG("GOT SLAVE STATE: " << slaveEngine << newState);
 
509
        EDEBUG("  OTHER ENGINE: " << otherEngine << otherEngine->state());
 
510
        EDEBUG("  COMBINED ENGINE: " << this << state() << isDying());
 
511
    }
511
512
    // Idea is to follow the state of the cpp engine,
512
513
    // except where we are stepping in QML
513
514