summaryrefslogtreecommitdiffstats
path: root/src/script/api/qscriptengine.cpp
diff options
context:
space:
mode:
authorBenjamin Poulain <benjamin.poulain@nokia.com>2009-07-27 17:07:08 (GMT)
committerBenjamin Poulain <benjamin.poulain@nokia.com>2009-07-27 17:07:08 (GMT)
commit0a4579306706f1fbe91d8b54734491376cb92093 (patch)
tree9fe5bcfb91c204dfa23d0e871d72346f9ab440c5 /src/script/api/qscriptengine.cpp
parenta8dae30f3825d0527a38499e13bd8e36485aac47 (diff)
downloadQt-0a4579306706f1fbe91d8b54734491376cb92093.zip
Qt-0a4579306706f1fbe91d8b54734491376cb92093.tar.gz
Qt-0a4579306706f1fbe91d8b54734491376cb92093.tar.bz2
The line number is correctly reported for exception
Enable the tests checking the line number of exception. Add a lower bound on the lineNumber of QScriptEngin::evaluate()
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
-rw-r--r--src/script/api/qscriptengine.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index fbc65d6..5cbb8d7 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -2055,6 +2055,7 @@ QScriptSyntaxCheckResult QScriptEnginePrivate::checkSyntax(const QString &progra
QScriptValue QScriptEngine::evaluate(const QString &program, const QString &fileName, int lineNumber)
{
Q_D(QScriptEngine);
+ lineNumber = qMax(lineNumber, 1);
JSC::JSLock lock(false); // ### hmmm