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

Debugger: Split off runtime-only items from DebuggerStartParameters

Browse Source 
Right now, DebuggerStartParameter is part of the debugger plugin
external interface. Better not make it fatter than necessary.

Change-Id: I3b9205089f971dd314ccba1335b5ca2d4d9fe7c6
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
hjk
2015-05-27 13:59:56 +02:00
parent 28d2b16165
commit 244cdb7804
36 changed files with 543 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/debugger/qml/qmlcppengine.cpp
View File

@@ -60,7 +60,7 @@ enum { debug = 0 };
} \
} while (0)
DebuggerEngine *createQmlCppEngine(const DebuggerStartParameters &sp,
DebuggerEngine *createQmlCppEngine(const DebuggerRunParameters &sp,
QString *errorMessage)
{
QmlCppEngine *newEngine = new QmlCppEngine(sp, errorMessage);
@@ -77,12 +77,12 @@ DebuggerEngine *createQmlCppEngine(const DebuggerStartParameters &sp,
//
////////////////////////////////////////////////////////////////////////
QmlCppEngine::QmlCppEngine(const DebuggerStartParameters &sp, QString *errorMessage)
: DebuggerEngine(sp)
QmlCppEngine::QmlCppEngine(const DebuggerRunParameters &rp, QString *errorMessage)
: DebuggerEngine(rp)
{
setObjectName(QLatin1String("QmlCppEngine"));
m_qmlEngine = new QmlEngine(sp, this);
m_cppEngine = DebuggerRunControlFactory::createEngine(sp.cppEngineType, sp, errorMessage);
m_qmlEngine = new QmlEngine(rp, this);
m_cppEngine = createEngine(rp.cppEngineType, rp, errorMessage);
if (!m_cppEngine) {
*errorMessage = tr("The slave debugging engine required for combined QML/C++-Debugging could not be created: %1").arg(*errorMessage);
return;
@@ -386,7 +386,7 @@ void QmlCppEngine::setupEngine()
m_qmlEngine->setupSlaveEngine();
m_cppEngine->setupSlaveEngine();
if (startParameters().remoteSetupNeeded)
if (runParameters().remoteSetupNeeded)
notifyEngineRequestRemoteSetup();
}