summaryrefslogtreecommitdiff
path: root/src/plugins/debugger/qml/qmlcppengine.cpp
diff options
context:
space:
mode:
authorhjk <hjk@theqtcompany.com>2015-05-27 13:59:56 +0200
committerhjk <hjk@theqtcompany.com>2015-05-28 08:54:48 +0000
commit244cdb7804e7e45f235836d4656644d5bf9135ee (patch)
treee64714447f4df3d547340abab29845e3142804b9 /src/plugins/debugger/qml/qmlcppengine.cpp
parent28d2b1616541eee4ab0e06e89c7e8cab04bd9961 (diff)
downloadqt-creator-244cdb7804e7e45f235836d4656644d5bf9135ee.tar.gz
Debugger: Split off runtime-only items from DebuggerStartParameters
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>
Diffstat (limited to 'src/plugins/debugger/qml/qmlcppengine.cpp')
-rw-r--r--src/plugins/debugger/qml/qmlcppengine.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index 222fc097e6..e95ebef02a 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -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();
}