WinRT: Enable debugging for local packages.

Change-Id: Ic04f1a471f951caf7a79c69cceecb0ebd5d09919
Reviewed-by: hjk <hjk121@nokiamail.com>

src/plugins/debugger/cdb/cdbengine.cpp

@@ -2699,8 +2699,7 @@ void CdbEngine::parseOutputLine(QByteArray line)
                 m_autoBreakPointCorrection = major > 6 || (major == 6 && minor >= 2 && minor < 10);
                 showMessage(QString::fromLocal8Bit(line), LogMisc);
                 showMessage(QString::fromLatin1("Using ")
-                            + m_autoBreakPointCorrection ? QLatin1String("CDB ")
-                                                         : QLatin1String("codemodel ")
+                            + QLatin1String(m_autoBreakPointCorrection ? "CDB " : "codemodel ")
                             + QString::fromLatin1("based breakpoint correction."), LogMisc);
             }
         }

src/plugins/debugger/cdb/cdbparsehelpers.cpp

@@ -135,18 +135,6 @@ int breakPointIdToCdbId(const BreakpointModelId &id)
     return cdbBreakPointStartId + id.majorPart() * cdbBreakPointIdMinorPart + id.minorPart();
 }
 
-template <class ModelId>
-inline ModelId cdbIdToBreakpointId(const GdbMi &data)
-{
-    if (data.isValid()) { // Might not be valid if there is not id
-        bool ok;
-        const int id = data.data().toInt(&ok);
-        if (ok)
-            return cdbIdToBreakpointId<ModelId>(id);
-    }
-    return ModelId();
-}
-
 template <class ModelId>
 inline ModelId cdbIdToBreakpointId(const int &id)
 {
@@ -161,6 +149,18 @@ inline ModelId cdbIdToBreakpointId(const int &id)
     return ModelId();
 }
 
+template <class ModelId>
+inline ModelId cdbIdToBreakpointId(const GdbMi &data)
+{
+    if (data.isValid()) { // Might not be valid if there is not id
+        bool ok;
+        const int id = data.data().toInt(&ok);
+        if (ok)
+            return cdbIdToBreakpointId<ModelId>(id);
+    }
+    return ModelId();
+}
+
 BreakpointModelId cdbIdToBreakpointModelId(const GdbMi &id)
 {
     return cdbIdToBreakpointId<BreakpointModelId>(id);