diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-29 08:10:27 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-29 08:10:41 (GMT) |
| commit | df37b2e9023bc2cebe00c77be6040019cfdc24b6 (patch) | |
| tree | 06739d09b63dd673b510a5af31de7c30407bed6e /src/script/api/qscriptengine.h | |
| parent | f32abd2b9febdeadeb5536d0318f77be4180f142 (diff) | |
| parent | cabfa68f3e37e79a18775a9970f6d166e75ece07 (diff) | |
| download | Qt-df37b2e9023bc2cebe00c77be6040019cfdc24b6.zip Qt-df37b2e9023bc2cebe00c77be6040019cfdc24b6.tar.gz Qt-df37b2e9023bc2cebe00c77be6040019cfdc24b6.tar.bz2 | |
Merge commit origin/4.6 into team-widgets/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()); |