diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2018-04-05 14:38:02 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-04-05 14:38:02 +0200 |
commit | 882a8c139cf75cbeac54904072916ce62883e1cb (patch) | |
tree | ce4f2a509d6e8266b327eb4e4e6f01d217b87100 /src/lib/corelib/language/evaluatorscriptclass.cpp | |
parent | baa09164ae14c58ec11a925a1f0fa57117e8ff1d (diff) | |
parent | 8da0e97f40abf19a089197c6aec8333a4e92d729 (diff) |
Merge 1.11 into master
Change-Id: Ia9e19bf1317c55d84602e4e0f54f7a4f412dd600
Diffstat (limited to 'src/lib/corelib/language/evaluatorscriptclass.cpp')
-rw-r--r-- | src/lib/corelib/language/evaluatorscriptclass.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/corelib/language/evaluatorscriptclass.cpp b/src/lib/corelib/language/evaluatorscriptclass.cpp index 3c276956f..b7c2576df 100644 --- a/src/lib/corelib/language/evaluatorscriptclass.cpp +++ b/src/lib/corelib/language/evaluatorscriptclass.cpp @@ -72,7 +72,7 @@ class SVConverter : ValueHandler ScriptEngine * const engine; QScriptContext * const scriptContext; const QScriptValue * const object; - const ValuePtr &valuePtr; + Value * const valuePtr; const Item * const itemOfProperty; const QScriptString * const propertyName; const EvaluationData * const data; @@ -88,7 +88,7 @@ public: , engine(static_cast<ScriptEngine *>(esc->engine())) , scriptContext(esc->engine()->currentContext()) , object(obj) - , valuePtr(v) + , valuePtr(v.get()) , itemOfProperty(_itemOfProperty) , propertyName(propertyName) , data(data) |