feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

debugger: don't show the <global> frame in qml stack

Browse Source
This commit is contained in:
hjk
2011-01-19 19:16:34 +01:00
parent 05b77b958d
commit 26296c06ba
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -693,6 +693,8 @@ void QmlEngine::messageReceived(const QByteArray &message)
for (int i = 0; i != stackFrames.size(); ++i) for (int i = 0; i != stackFrames.size(); ++i)
stackFrames[i].level = i + 1; stackFrames[i].level = i + 1;
if (stackFrames.size() && stackFrames.back().function == "<global>")
stackFrames.takeLast();
stackHandler()->setFrames(stackFrames); stackHandler()->setFrames(stackFrames);
watchHandler()->beginCycle(); watchHandler()->beginCycle();
@@ -735,8 +737,10 @@ void QmlEngine::messageReceived(const QByteArray &message)
logString += QLatin1String(" ") + error; logString += QLatin1String(" ") + error;
logMessage(LogReceive, logString); logMessage(LogReceive, logString);
QString msg = QString msg = stackFrames.isEmpty()
tr("<p>An Uncaught Exception occured in <i>%1</i>:</p><p>%2</p>") ? 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)); .arg(stackFrames.value(0).file, Qt::escape(error));
showMessageBox(QMessageBox::Information, tr("Uncaught Exception"), msg); showMessageBox(QMessageBox::Information, tr("Uncaught Exception"), msg);
} else { } else {