Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (182 commits)
  Fixes XPASS
  Revert part of commit 7c1ab9b6a8
  Fixed wrong casing of a Symbian library.
  Fixed wrong static library extension on Symbian.
  Fixed library casing.
  Remove dependencies to pre-Symbian3 platforms from Symbian3 packages
  My changes 4.7.2
  Don't accept input methods when a TextEdit or TextInput is read only.
  Correct error message
  On windows xp using a higher port makes the declarativedebug* tests work
  Correct assert
  Fix qt.sis platform dependencies for Symbian^3 builds.
  Fix few QFileDialog static method issues in Symbian^3
  Update QDeclarative DEF files for Symbian
  Export QDeclarativeRefCount so that symbian compiles.
  Make Flickable's wheel handling more like QAbstractScrollArea.
  Changing header or footer failed to delete the previous.
  Avoid index-out-of bounds related crash in Grid
  Move Qt.application docs into Qt global object page
  Add initial size to ListView in FolderListModel example
  ...

1 files changed, 9 insertions, 0 deletions

diff --git a/src/declarative/qml/qdeclarativecustomparser.cpp b/src/declarative/qml/qdeclarativecustomparser.cpp
index e8ffe3b..8dd6824 100644
--- a/src/declarative/qml/qdeclarativecustomparser.cpp
+++ b/src/declarative/qml/qdeclarativecustomparser.cpp
@@ -304,5 +304,14 @@ const QMetaObject *QDeclarativeCustomParser::resolveType(const QByteArray& name)
     return compiler->resolveType(name);
 }
 
+/*!
+    Rewrites \a expression and returns an identifier that can be
+    used to construct the binding later. \a name
+    is used as the name of the rewritten function.
+*/
+QDeclarativeBinding::Identifier QDeclarativeCustomParser::rewriteBinding(const QString& expression, const QByteArray& name)
+{
+    return compiler->rewriteBinding(expression, name);
+}
 
 QT_END_NAMESPACE