diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-08-26 12:35:45 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-08-26 12:35:45 (GMT) |
| commit | 7e30c92186878beb300a13093c3668ae8a10f2be (patch) | |
| tree | 313aa7f7a8345e65b7803bae1cb68ad866bdadbc /src/scripttools/debugging/qscriptdebuggerstackmodel.cpp | |
| parent | b98042831f4f6f6c5844965731b2dd64f27c076e (diff) | |
| parent | aeb4251c76560a070ce22320be00e860950b4668 (diff) | |
| download | Qt-7e30c92186878beb300a13093c3668ae8a10f2be.zip Qt-7e30c92186878beb300a13093c3668ae8a10f2be.tar.gz Qt-7e30c92186878beb300a13093c3668ae8a10f2be.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggerstackmodel.cpp')
| -rw-r--r-- | src/scripttools/debugging/qscriptdebuggerstackmodel.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/scripttools/debugging/qscriptdebuggerstackmodel.cpp b/src/scripttools/debugging/qscriptdebuggerstackmodel.cpp index 651b062..a6bb78b 100644 --- a/src/scripttools/debugging/qscriptdebuggerstackmodel.cpp +++ b/src/scripttools/debugging/qscriptdebuggerstackmodel.cpp @@ -131,11 +131,14 @@ QVariant QScriptDebuggerStackModel::data(const QModelIndex &index, int role) con name = QString::fromLatin1("<anonymous>"); return name; } else if (index.column() == 2) { - if (info.lineNumber() == -1) - return QString::fromLatin1("<native>"); QString fn = QFileInfo(info.fileName()).fileName(); - if (fn.isEmpty()) - fn = QString::fromLatin1("<anonymous script, id=%0>").arg(info.scriptId()); + if (fn.isEmpty()) { + if (info.functionType() == QScriptContextInfo::ScriptFunction) + fn = QString::fromLatin1("<anonymous script, id=%0>").arg(info.scriptId()); + else + fn = QString::fromLatin1("<native>"); + + } return QString::fromLatin1("%0:%1").arg(fn).arg(info.lineNumber()); } } else if (role == Qt::ToolTipRole) { |