Cumulate delayed product errors

If a delayed error leads to other errors later on, we would output the
later errors without showing the original - more important - delayed
errors.

Cumulate delayed product errors and pass them up the stack.

Change-Id: Ibdfc6d3e301a80ef265792907b3e4a150a22ef8b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 12 insertions, 0 deletions

diff --git a/src/lib/corelib/tools/error.cpp b/src/lib/corelib/tools/error.cpp
index 82e351611..6ebee2879 100644
--- a/src/lib/corelib/tools/error.cpp
+++ b/src/lib/corelib/tools/error.cpp
@@ -208,6 +208,11 @@ void ErrorInfo::appendBacktrace(const QString &description, const CodeLocation &
     d->items.append(ErrorItem(description, location, true));
 }
 
+void ErrorInfo::append(const ErrorItem &item)
+{
+    d->items.append(item);
+}
+
 void ErrorInfo::append(const QString &description, const CodeLocation &location)
 {
     d->items.append(ErrorItem(description, location));
@@ -277,4 +282,11 @@ void ErrorInfo::store(Internal::PersistentPool &pool) const
     pool.store(d->internalError);
 }
 
+void appendError(ErrorInfo &dst, const ErrorInfo &src)
+{
+    const QList<ErrorItem> &sourceItems = src.items();
+    for (const ErrorItem &item : sourceItems)
+        dst.append(item);
+}
+
 } // namespace qbs