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

Sdktool: Avoid setting invalid debugger entry in kit

Browse Source 
Change-Id: Ia8f8e7a5bdc8ab4e9d50fd5f7bca379ec3e3e4f0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-07-13 17:01:50 +03:00
committed by Orgad Shaneh
parent 631d33de39
commit ec2b006d29
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/tools/sdktool/addkitoperation.cpp
View File

@@ -245,9 +245,6 @@ bool AddKitOperation::setArguments(const QStringList &args)
return false;
}
if (m_debuggerId.isEmpty() && m_debugger.isEmpty())
m_debugger = QLatin1String("auto");
return !m_id.isEmpty() && !m_displayName.isEmpty() && !m_deviceType.isEmpty();
}
@@ -622,7 +619,7 @@ QVariantMap AddKitOperation::addKit(const QVariantMap &map, const QVariantMap &t
data << KeyValuePair(QStringList() << kit << QLatin1String(AUTODETECTED), QVariant(true));
data << KeyValuePair(QStringList() << kit << QLatin1String(SDK), QVariant(true));
if (!debuggerId.isNull() || !debugger.isNull()) {
if (!debuggerId.isEmpty() || !debugger.isEmpty()) {
if (debuggerId.isEmpty()) {
data << KeyValuePair(QStringList() << kit << QLatin1String(DATA)
<< QLatin1String(DEBUGGER) << QLatin1String(DEBUGGER_ENGINE), QVariant(debuggerType));