diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-04-13 11:49:18 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-04-25 05:26:08 +0000 |
commit | 54daa0035c9649ab92a70ae050534832b37c09be (patch) | |
tree | 38ab301521ef124f6aacb306855e0df01d890c81 /src/qml/qml/qqmlexpression_p.h | |
parent | 895fe4b881ae819981c337d65c8fae5f5daaf164 (diff) |
Remove the manual vtable from QQmlJavaScriptExpression
Now that the class got unified with QQmlAbstractExpression, it has a
vtable anyway, so we can just as well remove the old hack.
Change-Id: Ifa095297e3d75564c4305ce3655eaa57436ef4a8
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlexpression_p.h')
-rw-r--r-- | src/qml/qml/qqmlexpression_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlexpression_p.h b/src/qml/qml/qqmlexpression_p.h index f1c02c51b0..f7fb7cb7c3 100644 --- a/src/qml/qml/qqmlexpression_p.h +++ b/src/qml/qml/qqmlexpression_p.h @@ -80,9 +80,8 @@ public: bool expressionFunctionValid:1; - // "Inherited" from QQmlJavaScriptExpression - static QString expressionIdentifier(QQmlJavaScriptExpression *); - static void expressionChanged(QQmlJavaScriptExpression *); + // Inherited from QQmlJavaScriptExpression + virtual QString expressionIdentifier(); virtual void expressionChanged(); QString expression; |