From 923c907d2e5380df624b50c8a8172250fe1e279a Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 18 Oct 2010 14:54:42 +0200
Subject: [PATCH] Debugger: Fix slashes in breakpoint display.
Reviewed-by: Arvid Ephraim Picciani <arvid.picciani@nokia.com>
---
src/plugins/debugger/breakhandler.cpp | 3 ++-
src/plugins/debugger/breakpoint.cpp | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 126ebf09ad3..8df0b90f3c4 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -40,6 +40,7 @@
#include <texteditor/basetextmark.h>
#include <utils/qtcassert.h>
+#include <QtCore/QDir>
#include <QtCore/QByteArray>
#include <QtCore/QFileInfo>
@@ -338,7 +339,7 @@ QVariant BreakHandler::data(const QModelIndex &mi, int role) const
// str = data->markerFileName;
str = str.isEmpty() ? empty : str;
if (data->useFullPath)
- str = "/.../" + str;
+ str = QDir::toNativeSeparators(QLatin1String("/.../") + str);
return str;
}
break;
diff --git a/src/plugins/debugger/breakpoint.cpp b/src/plugins/debugger/breakpoint.cpp
index 11175b010c7..1235e8ce14d 100644
--- a/src/plugins/debugger/breakpoint.cpp
+++ b/src/plugins/debugger/breakpoint.cpp
@@ -289,7 +289,7 @@ QString BreakpointData::toToolTip() const
<< "<tr><td>" << BreakHandler::tr("Internal Number:")
<< "</td><td>—</td><td>" << bpNumber << "</td></tr>"
<< "<tr><td>" << BreakHandler::tr("File Name:")
- << "</td><td>" << fileName << "</td><td>" << QDir::toNativeSeparators(bpFileName) << "</td></tr>"
+ << "</td><td>" << QDir::toNativeSeparators(fileName) << "</td><td>" << QDir::toNativeSeparators(bpFileName) << "</td></tr>"
<< "<tr><td>" << BreakHandler::tr("Function Name:")
<< "</td><td>" << funcName << "</td><td>" << bpFuncName << "</td></tr>"
<< "<tr><td>" << BreakHandler::tr("Line Number:") << "</td><td>";
--
GitLab