diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-05 11:39:24 +1000 |
|---|---|---|
| committer | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-05 11:39:54 +1000 |
| commit | 0284817d6cd7e17afa8da26ee6e9199100754446 (patch) | |
| tree | c351d55d5a606c81c72e481f846b9b9e2603c883 /src/qml/qml/qqmlexpression.cpp | |
| parent | 377eb94eb19dafeca20d12bc6b624f1779fae514 (diff) | |
| parent | 36bd7f616f37f5f60e59bce1f0d8970248d627de (diff) | |
Merge master <-> api_changes
Change-Id: Iad2f07b989b25349fd2d4fff010e24dcd5a1688f
Diffstat (limited to 'src/qml/qml/qqmlexpression.cpp')
| -rw-r--r-- | src/qml/qml/qqmlexpression.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp index 3fbb80c280..ecdbf21d4b 100644 --- a/src/qml/qml/qqmlexpression.cpp +++ b/src/qml/qml/qqmlexpression.cpp @@ -78,13 +78,13 @@ QQmlJavaScriptExpression::~QQmlJavaScriptExpression() clearGuards(); } -static QQmlJavaScriptExpression::VTable QDeclarativeExpressionPrivate_jsvtable = { +static QQmlJavaScriptExpression::VTable QQmlExpressionPrivate_jsvtable = { QQmlExpressionPrivate::expressionIdentifier, QQmlExpressionPrivate::expressionChanged }; QQmlExpressionPrivate::QQmlExpressionPrivate() -: QQmlJavaScriptExpression(&QDeclarativeExpressionPrivate_jsvtable), +: QQmlJavaScriptExpression(&QQmlExpressionPrivate_jsvtable), expressionFunctionValid(true), expressionFunctionRewritten(false), extractExpressionFromFunction(false), line(-1), dataRef(0) { |