Merge remote-tracking branch 'origin/2.7'

2013-03-28 12:19:45 +01:00
parent 5c36c594fe bcbd1eeb4c
commit d3c979dc0f
25 changed files with 218 additions and 70 deletions
--- a/src/plugins/debugger/debuggerkitinformation.cpp
+++ b/src/plugins/debugger/debuggerkitinformation.cpp
@@ -295,6 +295,8 @@ static const char binaryKeyC[] = "Binary";
 DebuggerKitInformation::DebuggerItem DebuggerKitInformation::variantToItem(const QVariant &v)
 {
    DebuggerItem result;
+    if (v.isNull())
+        return result;
    if (v.type() == QVariant::String) { // Convert legacy config items, remove later.
        const QString binary = v.toString();
        result.binary = Utils::FileName::fromString(binary);