diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-04-16 10:27:59 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-04-16 11:20:28 +0200 |
| commit | f103f283c2c2d488877e7159b4b8b8f8d3ae1976 (patch) | |
| tree | 69f417be2546ea2f0bf0c6ef575ee260773a2b1f /src/lib/corelib/buildgraph/jscommandexecutor.cpp | |
| parent | 097aabb9ad63e716f1bd3f02964bfab6d4bb05b2 (diff) | |
Prevent user code from hanging qbs during resolving.
Long-running commands are handled already, but badly written project
files could still hang qbs with e.g. infinite JS loops on the right
hand side of a binding. Such code can now also be interrupted.
Change-Id: Ie0d114bd37d540e764d5ec5bb323c91bfd64a67a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib/corelib/buildgraph/jscommandexecutor.cpp')
| -rw-r--r-- | src/lib/corelib/buildgraph/jscommandexecutor.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/corelib/buildgraph/jscommandexecutor.cpp b/src/lib/corelib/buildgraph/jscommandexecutor.cpp index 0b65c813d..e2d1e14e4 100644 --- a/src/lib/corelib/buildgraph/jscommandexecutor.cpp +++ b/src/lib/corelib/buildgraph/jscommandexecutor.cpp @@ -118,10 +118,8 @@ public slots: private: ScriptEngine *provideScriptEngine() { - if (!m_scriptEngine) { + if (!m_scriptEngine) m_scriptEngine = new ScriptEngine(m_logger, this); - m_scriptEngine->setProcessEventsInterval(1000); // So long-running code can be aborted. - } return m_scriptEngine; } |