summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2013-08-30 12:56:26 +0200
committerhjk <hjk121@nokiamail.com>2013-08-30 14:13:05 +0200
commit513b884dfc3d29a865e7155cb9cf28582083eaa1 (patch)
tree8752b48b78d7271fce3e390a6e069120430665e2 /src
parent841aa19853998dd87e98be065bef54526dd2b1cb (diff)
downloadqt-creator-513b884dfc3d29a865e7155cb9cf28582083eaa1.tar.gz
Debugger: Silence warning on empty debugger settings in legitim cases
Change-Id: Ibaa830f615a3d739a198a9550cd955dc9151c009 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/debugger/debuggerkitconfigwidget.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/debugger/debuggerkitconfigwidget.cpp b/src/plugins/debugger/debuggerkitconfigwidget.cpp
index 0df34d0f55..c162d65a05 100644
--- a/src/plugins/debugger/debuggerkitconfigwidget.cpp
+++ b/src/plugins/debugger/debuggerkitconfigwidget.cpp
@@ -319,6 +319,8 @@ DebuggerItem DebuggerKitInformation::debuggerItem(const ProjectExplorer::Kit *k)
// <value type="QString" key="Debugger.Information">{75ecf347-f221-44c3-b613-ea1d29929cd4}</value>
QVariant id = k->value(DEBUGGER_INFORMATION);
+ if (!id.isValid())
+ return DebuggerItem();
QString pathOrUid;
if (id.type() == QVariant::Map) // 2.x
@@ -326,7 +328,10 @@ DebuggerItem DebuggerKitInformation::debuggerItem(const ProjectExplorer::Kit *k)
else if (id.type() == QVariant::String) // 3.x
pathOrUid = id.toString();
- DebuggerItem *item;
+ if (pathOrUid.isEmpty())
+ return DebuggerItem();
+
+ DebuggerItem *item = 0;
if (pathOrUid.startsWith(QLatin1Char('{')))
item = DebuggerItemManager::debuggerFromId(id);
else