From 26296c06badf25e412b2641ea301a02e8bdd531b Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 19 Jan 2011 19:16:34 +0100
Subject: [PATCH] debugger: don't show the <global> frame in qml stack

---
 src/plugins/debugger/qml/qmlengine.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 6243a23d342..f4ba5b48183 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -693,6 +693,8 @@ void QmlEngine::messageReceived(const QByteArray &message)
         for (int i = 0; i != stackFrames.size(); ++i)
             stackFrames[i].level = i + 1;
 
+        if (stackFrames.size() && stackFrames.back().function == "<global>")
+            stackFrames.takeLast();
         stackHandler()->setFrames(stackFrames);
 
         watchHandler()->beginCycle();
@@ -735,8 +737,10 @@ void QmlEngine::messageReceived(const QByteArray &message)
             logString += QLatin1String(" ") + error;
             logMessage(LogReceive, logString);
 
-            QString msg =
-                tr("<p>An Uncaught Exception occured in <i>%1</i>:</p><p>%2</p>")
+            QString msg = stackFrames.isEmpty()
+                ? tr("<p>An Uncaught Exception occured:</p><p>%2</p>")
+                    .arg(Qt::escape(error))
+                : tr("<p>An Uncaught Exception occured in <i>%1</i>:</p><p>%2</p>")
                     .arg(stackFrames.value(0).file, Qt::escape(error));
             showMessageBox(QMessageBox::Information, tr("Uncaught Exception"), msg);
         } else {