diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-12-02 09:50:36 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-12-09 14:01:23 +0000 |
| commit | f9b8436a07534867686627b656418d62f75ba3e5 (patch) | |
| tree | 896411a3196df42ebfda4e61b9335dabf01958e8 /src/qml/qml/qqmlboundsignal_p.h | |
| parent | d7ef2aa02c9ba736104fe973bfce7d87e30f81af (diff) | |
Mostly use the QV4::Function in javascript expressions
Move the function() accessor from QQmlBoundSIgnal to
QQmlJavaScriptExpression. Change the profiler to
operate on QV4::Function objects for binding profiling.
Change-Id: Ic7ce83c487ceb69cad4b16e3dab42026238b7e82
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlboundsignal_p.h')
| -rw-r--r-- | src/qml/qml/qqmlboundsignal_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlboundsignal_p.h b/src/qml/qml/qqmlboundsignal_p.h index 2234f08497..b9b0c2b481 100644 --- a/src/qml/qml/qqmlboundsignal_p.h +++ b/src/qml/qml/qqmlboundsignal_p.h @@ -87,7 +87,6 @@ public: void evaluate(const QList<QVariant> &args); QString expression() const; - QV4::Function *function() const; QObject *target() const { return m_target; } QQmlEngine *engine() const { return context() ? context()->engine : 0; } @@ -97,7 +96,7 @@ private: void init(QQmlContextData *ctxt, QObject *scope); - bool expressionFunctionValid() const { return !m_function.isNullOrUndefined(); } + bool expressionFunctionValid() const { return function() != 0; } int m_index; QObject *m_target; |