From 3b813accc6f75b446d9374b1ed253b6dc17f45f8 Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Date: Wed, 5 Sep 2012 15:58:32 +0200
Subject: Output absolute paths in qdoc messages.

Change-Id: I4499bb0464cca3703026e317e940612091bf55a2
Reviewed-by: Martin Smith <martin.smith@nokia.com>
---
 src/tools/qdoc/location.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/qdoc/location.cpp b/src/tools/qdoc/location.cpp
index 272be502de..2d7457d61f 100644
--- a/src/tools/qdoc/location.cpp
+++ b/src/tools/qdoc/location.cpp
@@ -376,8 +376,7 @@ QString Location::toString() const
 
     if (isEmpty()) {
         str = programName;
-    }
-    else {
+    } else {
         Location loc2 = *this;
         loc2.setEtc(false);
         loc2.pop();
@@ -405,6 +404,10 @@ QString Location::toString() const
 QString Location::top() const
 {
     QString str = filePath();
+    if (!QDir::isAbsolutePath(str)) {
+        QDir path(str);
+        str = path.absolutePath();
+    }
     if (lineNo() >= 1) {
         str += QLatin1Char(':');
         str += QString::number(lineNo());
-- 
cgit v1.2.3