Merge remote-tracking branch 'origin/4.12'

Change-Id: Ia8254720b2ba6e3e7b859017e1c2b6e289bed771

1 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 930f63bf4fa..7c8920c0952 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -1793,8 +1793,8 @@ void BreakpointItem::destroyMarker()
 FilePath BreakpointItem::markerFileName() const
 {
     // Some heuristics to find a "good" file name.
-    if (!m_parameters.fileName.exists())
-        return FilePath::fromString(m_parameters.fileName.toFileInfo().absolutePath());
+    if (m_parameters.fileName.exists())
+        return FilePath::fromString(m_parameters.fileName.toFileInfo().absoluteFilePath());
 
     const FilePath origFileName = requestedParameters().fileName;
     if (m_parameters.fileName.endsWith(origFileName.fileName()))
@@ -2268,7 +2268,7 @@ void GlobalBreakpointItem::updateFileName(const FilePath &fileName)
 FilePath GlobalBreakpointItem::markerFileName() const
 {
     // Some heuristics to find a "good" file name.
-    if (!m_params.fileName.exists())
+    if (m_params.fileName.exists())
         return FilePath::fromString(m_params.fileName.toFileInfo().absoluteFilePath());
     return m_params.fileName;
 }