diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-04-13 10:29:45 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-04-24 19:57:32 +0000 |
| commit | 895fe4b881ae819981c337d65c8fae5f5daaf164 (patch) | |
| tree | b10c1b2bd3e062bfbca122547774c15abde93f6b /src/qml/qml/qqmlexpression_p.h | |
| parent | 590c23b23c5f60d78aa92030f89259833496b8be (diff) | |
Get rid of QQmlAbstractExpression
The class is always used together with QQmlJavaScriptExpression,
so we can just as well fold the functionality together into one
class and simplify our code.
Change-Id: I23820e51efaaea16ae5db7e2153a827d7b22999e
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 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlexpression_p.h b/src/qml/qml/qqmlexpression_p.h index d8da387878..f1c02c51b0 100644 --- a/src/qml/qml/qqmlexpression_p.h +++ b/src/qml/qml/qqmlexpression_p.h @@ -52,7 +52,6 @@ #include <private/qflagpointer_p.h> #include <private/qdeletewatcher_p.h> #include <private/qpointervaluepair_p.h> -#include <private/qqmlabstractexpression_p.h> #include <private/qqmljavascriptexpression_p.h> QT_BEGIN_NAMESPACE @@ -60,8 +59,7 @@ QT_BEGIN_NAMESPACE class QQmlExpression; class QString; class QQmlExpressionPrivate : public QObjectPrivate, - public QQmlJavaScriptExpression, - public QQmlAbstractExpression + public QQmlJavaScriptExpression { Q_DECLARE_PUBLIC(QQmlExpression) public: |