diff options
Diffstat (limited to 'src/lib/corelib/buildgraph/rulesevaluationcontext.h')
-rw-r--r-- | src/lib/corelib/buildgraph/rulesevaluationcontext.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/lib/corelib/buildgraph/rulesevaluationcontext.h b/src/lib/corelib/buildgraph/rulesevaluationcontext.h index bb7955496..7ff75b51f 100644 --- a/src/lib/corelib/buildgraph/rulesevaluationcontext.h +++ b/src/lib/corelib/buildgraph/rulesevaluationcontext.h @@ -42,12 +42,11 @@ #include <language/forward_decls.h> #include <logging/logger.h> +#include <quickjs.h> + #include <QtCore/qhash.h> #include <QtCore/qstring.h> -#include <QtScript/qscriptprogram.h> -#include <QtScript/qscriptvalue.h> - namespace qbs { namespace Internal { class ProgressObserver; @@ -70,7 +69,7 @@ public: }; ScriptEngine *engine() const { return m_engine.get(); } - QScriptValue scope() const { return m_scope; } + JSValue scope() const { return m_scope; } void setObserver(ProgressObserver *observer) { m_observer = observer; } ProgressObserver *observer() const { return m_observer; } @@ -79,8 +78,6 @@ public: void checkForCancelation(); private: - friend class Scope; - void initScope(); void cleanupScope(); @@ -88,8 +85,8 @@ private: const std::unique_ptr<ScriptEngine> m_engine; ProgressObserver *m_observer; unsigned int m_initScopeCalls; - QScriptValue m_scope; - QScriptValue m_prepareScriptScope; + JSValue m_scope = JS_UNDEFINED; + const JSValue m_prepareScriptScope; }; } // namespace Internal |