Display proper file paths and line numbers for errors in more places.

Rule.outputArtifacts, Rule.prepare, and Artifact.filePath will now
display the correct file paths and line numbers for errors thrown from
those locations (including in imported JavaScript files).

Change-Id: I4e3c8e60f30791f5aa4de9e3813d4890c46c09fb
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/src/lib/corelib/tools/error.h b/src/lib/corelib/tools/error.h
index 5c0ea0726..1aa83d485 100644
--- a/src/lib/corelib/tools/error.h
+++ b/src/lib/corelib/tools/error.h
@@ -58,8 +58,11 @@ public:
     CodeLocation codeLocation() const;
     QString toString() const;
 
+    bool isBacktraceItem() const;
+
 private:
-    ErrorItem(const QString &description, const CodeLocation &codeLocation);
+    ErrorItem(const QString &description, const CodeLocation &codeLocation,
+              bool isBacktraceItem = false);
 
     class ErrorItemPrivate;
     QExplicitlySharedDataPointer<ErrorItemPrivate> d;
@@ -72,9 +75,11 @@ public:
     ErrorInfo(const ErrorInfo &rhs);
     ErrorInfo(const QString &description, const CodeLocation &location = CodeLocation(),
               bool internalError = false);
+    ErrorInfo(const QString &description, const QStringList &backtrace);
     ErrorInfo &operator=(const ErrorInfo &other);
     ~ErrorInfo();
 
+    void appendBacktrace(const QString &description, const CodeLocation &location = CodeLocation());
     void append(const QString &description, const CodeLocation &location = CodeLocation());
     void prepend(const QString &description, const CodeLocation &location = CodeLocation());
     QList<ErrorItem> items() const;