Output absolute paths in qdoc messages.
authorFrederik Gladhorn <frederik.gladhorn@nokia.com>
Wed, 5 Sep 2012 13:58:32 +0000 (15:58 +0200)
committerQt by Nokia <qt-info@nokia.com>
Tue, 11 Sep 2012 10:09:47 +0000 (12:09 +0200)
Change-Id: I4499bb0464cca3703026e317e940612091bf55a2
Reviewed-by: Martin Smith <martin.smith@nokia.com>
src/tools/qdoc/location.cpp

index 272be50..2d7457d 100644 (file)
@@ -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());