diff options
| author | axis <qt-info@nokia.com> | 2009-10-29 08:20:38 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-10-29 08:20:38 (GMT) |
| commit | eed04255446df8a749390e14cef7672c26329f6e (patch) | |
| tree | 1b6cbd53bb0f90f27db3d4e36370bca024e4abad /src/script/api/qscriptengine.h | |
| parent | f360555f3c7ded3c729ce972fbd65f035876b1b4 (diff) | |
| parent | f425c08d4f2e7f061a0ee8e4a1eee2b17fa64962 (diff) | |
| download | Qt-eed04255446df8a749390e14cef7672c26329f6e.zip Qt-eed04255446df8a749390e14cef7672c26329f6e.tar.gz Qt-eed04255446df8a749390e14cef7672c26329f6e.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/script/api/qscriptengine.h')
| -rw-r--r-- | src/script/api/qscriptengine.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/script/api/qscriptengine.h b/src/script/api/qscriptengine.h index 701f9c6..3f438da 100644 --- a/src/script/api/qscriptengine.h +++ b/src/script/api/qscriptengine.h @@ -67,6 +67,7 @@ class QDateTime; class QScriptClass; class QScriptEngineAgent; class QScriptEnginePrivate; +class QScriptProgram; #ifndef QT_NO_QOBJECT @@ -166,6 +167,8 @@ public: QScriptValue evaluate(const QString &program, const QString &fileName = QString(), int lineNumber = 1); + QScriptValue evaluate(const QScriptProgram &program); + bool isEvaluating() const; void abortEvaluation(const QScriptValue &result = QScriptValue()); |