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

Debugger: Simplify *SlaveEngineType StartParameters members

Browse Source 
The secondSlaveEngineType was not really used, and the first
either NoEngineType or identical to the cppEngineType.

Change-Id: I1725728ca38636f228ff9b9d8ca7d643a34c64e8
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2015-03-04 17:50:52 +01:00
parent e79808a8f7
commit e2421afd1b
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -414,13 +414,10 @@ DebuggerRunControl *DebuggerRunControlFactory::doCreate
const bool useCppDebugger = aspect->useCppDebugger() && (sp.languages & CppLanguage); const bool useCppDebugger = aspect->useCppDebugger() && (sp.languages & CppLanguage);
const bool useQmlDebugger = aspect->useQmlDebugger() && (sp.languages & QmlLanguage); const bool useQmlDebugger = aspect->useQmlDebugger() && (sp.languages & QmlLanguage);
if (useQmlDebugger) { if (useQmlDebugger) {
if (useCppDebugger) { if (useCppDebugger)
sp.masterEngineType = QmlCppEngineType; sp.masterEngineType = QmlCppEngineType;
sp.firstSlaveEngineType = sp.cppEngineType; else
sp.secondSlaveEngineType = QmlCppEngineType;
} else {
sp.masterEngineType = QmlEngineType; sp.masterEngineType = QmlEngineType;
}
} else { } else {
sp.masterEngineType = sp.cppEngineType; sp.masterEngineType = sp.cppEngineType;
} }

6
src/plugins/debugger/debuggerstartparameters.h
View File

@@ -79,8 +79,6 @@ public:
DebuggerStartParameters() DebuggerStartParameters()
: masterEngineType(NoEngineType), : masterEngineType(NoEngineType),
firstSlaveEngineType(NoEngineType),
secondSlaveEngineType(NoEngineType),
cppEngineType(NoEngineType), cppEngineType(NoEngineType),
runConfiguration(0), runConfiguration(0),
isSnapshot(false), isSnapshot(false),
@@ -102,11 +100,7 @@ public:
testCase(0) testCase(0)
{} {}
//Core::Id profileId;
DebuggerEngineType masterEngineType; DebuggerEngineType masterEngineType;
DebuggerEngineType firstSlaveEngineType;
DebuggerEngineType secondSlaveEngineType;
DebuggerEngineType cppEngineType; DebuggerEngineType cppEngineType;
QString sysRoot; QString sysRoot;
QString deviceSymbolsRoot; QString deviceSymbolsRoot;

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

@@ -74,7 +74,7 @@ QmlCppEngine::QmlCppEngine(const DebuggerStartParameters &sp, QString *errorMess
{ {
setObjectName(QLatin1String("QmlCppEngine")); setObjectName(QLatin1String("QmlCppEngine"));
m_qmlEngine = new QmlEngine(sp, this); m_qmlEngine = new QmlEngine(sp, this);
m_cppEngine = DebuggerRunControlFactory::createEngine(sp.firstSlaveEngineType, sp, errorMessage); m_cppEngine = DebuggerRunControlFactory::createEngine(sp.cppEngineType, sp, errorMessage);
if (!m_cppEngine) { if (!m_cppEngine) {
*errorMessage = tr("The slave debugging engine required for combined QML/C++-Debugging could not be created: %1").arg(*errorMessage); *errorMessage = tr("The slave debugging engine required for combined QML/C++-Debugging could not be created: %1").arg(*errorMessage);
return; return;