Ouptut non-NOTIFYable warnings again

Task-number: QTBUG-20280

Change-Id: Ia950c8c9dfa14e568a306beeb72474b2d5049db1
Reviewed-on: http://codereview.qt.nokia.com/2069
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/src/declarative/qml/qdeclarativeexpression_p.h b/src/declarative/qml/qdeclarativeexpression_p.h
index 2a26c26700..e9ee69960e 100644
--- a/src/declarative/qml/qdeclarativeexpression_p.h
+++ b/src/declarative/qml/qdeclarativeexpression_p.h
@@ -153,7 +153,7 @@ public:
     inline void setScopeObject(QObject *v);
 
 protected:
-    inline virtual QStringRef expressionString();
+    inline virtual QString expressionIdentifier();
 
 private:
     quint32 m_requiresThisObject:1;
@@ -173,7 +173,7 @@ private:
 
         typedef QPODVector<QDeclarativeEnginePrivate::CapturedProperty> CapturedProperties;
         void updateGuards(QObject *guardObject, int guardObjectNotifyIndex,
-                          const QStringRef &expression, const CapturedProperties &properties);
+                          QDeclarativeJavaScriptExpression *, const CapturedProperties &properties);
 
     private:
         QDeclarativeNotifierEndpoint *endpoints;
@@ -213,7 +213,7 @@ public:
     bool expressionFunctionValid:1;
     bool extractExpressionFromFunction:1;
 
-    inline virtual QStringRef expressionString();
+    inline virtual QString expressionIdentifier();
 
     QString expression;
 
@@ -291,9 +291,9 @@ void QDeclarativeJavaScriptExpression::setScopeObject(QObject *v)
     m_scopeObject = v; 
 }
 
-QStringRef QDeclarativeJavaScriptExpression::expressionString() 
+QString QDeclarativeJavaScriptExpression::expressionIdentifier() 
 { 
-    return QStringRef(); 
+    return QString();
 }
 
 QDeclarativeJavaScriptExpression::GuardList::GuardList() 
@@ -323,9 +323,9 @@ QDeclarativeExpression *QDeclarativeExpressionPrivate::get(QDeclarativeExpressio
     return expr->q_func();
 }
 
-QStringRef QDeclarativeExpressionPrivate::expressionString()
+QString QDeclarativeExpressionPrivate::expressionIdentifier()
 {
-    return QStringRef(&expression);
+    return QLatin1String("\"") + expression + QLatin1String("\"");
 }
 
 QT_END_NAMESPACE