Merge master <-> api_changes

[profile/ivi/qtdeclarative.git] / src / qml / qml / qqmlexpression.cpp

diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp
index 3fbb80c..ecdbf21 100644 (file)
--- 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)
 {