diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 21:00:03 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 21:00:03 +0100 |
| commit | 0af88dc973d3410cdd905265ce935916693b2d44 (patch) | |
| tree | 44b0196250538538c53a09a7b70c1f34f1ba3afd /src/script/api/qscriptengine.cpp | |
| parent | d80f57f60f39bb98948e22e94036104ddabd5e2b (diff) | |
| parent | 525c18f7780a39474e71790d54cf90de29bc1fd6 (diff) | |
| download | qtscript-0af88dc973d3410cdd905265ce935916693b2d44.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I125a7421f2d449b5670fbb250ad167d97f156fff
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 699d2e6..3719cdf 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -3035,7 +3035,6 @@ void QScriptEngine::setDefaultPrototype(int metaTypeId, const QScriptValue &prot /*! \typedef QScriptEngine::FunctionSignature - \relates QScriptEngine The function signature \c{QScriptValue f(QScriptContext *, QScriptEngine *)}. @@ -3045,7 +3044,6 @@ void QScriptEngine::setDefaultPrototype(int metaTypeId, const QScriptValue &prot /*! \typedef QScriptEngine::FunctionWithArgSignature - \relates QScriptEngine The function signature \c{QScriptValue f(QScriptContext *, QScriptEngine *, void *)}. |