summaryrefslogtreecommitdiffstats
path: root/src/script/api
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-07-15 08:12:36 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-07-15 08:12:36 (GMT)
commitb0e9dc67c7bc2ef7292e7aac20fae846ea89cccf (patch)
tree989ee40e31653548a6e1ee461a914bfa801fd56d /src/script/api
parent58dbd9c74f398b030c44ec2bc6af99af2edd913a (diff)
downloadQt-b0e9dc67c7bc2ef7292e7aac20fae846ea89cccf.zip
Qt-b0e9dc67c7bc2ef7292e7aac20fae846ea89cccf.tar.gz
Qt-b0e9dc67c7bc2ef7292e7aac20fae846ea89cccf.tar.bz2
implement QScriptEngine::isEvaluating()
Diffstat (limited to 'src/script/api')
-rw-r--r--src/script/api/qscriptengine.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index e543572..5f63fde 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -3118,9 +3118,8 @@ int QScriptEngine::processEventsInterval() const
*/
bool QScriptEngine::isEvaluating() const
{
- qWarning("QScriptEngine::isEvaluating() not implemented");
- // check whether we have a lock on the exec state?
- return false;
+ Q_D(const QScriptEngine);
+ return (d->currentFrame != d->globalObject->globalExec());
}
/*!