aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOrgad Shaneh <[email protected]>2015-07-13 17:01:50 +0300
committerOrgad Shaneh <[email protected]>2015-07-22 11:29:07 +0000
commitec2b006d29c243729aa8ce85d5717669c8613b53 (patch)
treef321df2a1c63842a60f217bf70999da40247655a /src
parent631d33de39fa24b489f41281b43269190a366f5c (diff)
Sdktool: Avoid setting invalid debugger entry in kit
Change-Id: Ia8f8e7a5bdc8ab4e9d50fd5f7bca379ec3e3e4f0 Reviewed-by: Tobias Hunger <[email protected]> Reviewed-by: Orgad Shaneh <[email protected]> Reviewed-by: hjk <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/tools/sdktool/addkitoperation.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp
index 70c3f7acc53..2f02c098db4 100644
--- a/src/tools/sdktool/addkitoperation.cpp
+++ b/src/tools/sdktool/addkitoperation.cpp
@@ -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));