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
  ...

2 files changed, 15 insertions, 0 deletions

diff --git a/src/script/bridge/qscriptdeclarativeclass.cpp b/src/script/bridge/qscriptdeclarativeclass.cpp
index 0dcf1ec..6126b32 100644
--- a/src/script/bridge/qscriptdeclarativeclass.cpp
+++ b/src/script/bridge/qscriptdeclarativeclass.cpp
@@ -179,6 +179,11 @@ QScriptDeclarativeClass::PersistentIdentifier::operator=(const PersistentIdentif
     return *this;
 }
 
+QString QScriptDeclarativeClass::PersistentIdentifier::toString() const
+{
+    return ((JSC::Identifier &)d).ustring();
+}
+
 QScriptDeclarativeClass::QScriptDeclarativeClass(QScriptEngine *engine)
 : d_ptr(new QScriptDeclarativeClassPrivate)
 {
@@ -468,6 +473,14 @@ QString QScriptDeclarativeClass::toString(const Identifier &identifier)
     return QString((QChar *)r->data(), r->size());
 }
 
+bool QScriptDeclarativeClass::startsWithUpper(const Identifier &identifier)
+{
+    JSC::UString::Rep *r = (JSC::UString::Rep *)identifier;
+    if (r->size() < 1)
+        return false;
+    return QChar::category((ushort)(r->data()[0])) == QChar::Letter_Uppercase;
+}
+
 quint32 QScriptDeclarativeClass::toArrayIndex(const Identifier &identifier, bool *ok)
 {
     JSC::UString::Rep *r = (JSC::UString::Rep *)identifier;
diff --git a/src/script/bridge/qscriptdeclarativeclass_p.h b/src/script/bridge/qscriptdeclarativeclass_p.h
index 25dc396..e4c18f5 100644
--- a/src/script/bridge/qscriptdeclarativeclass_p.h
+++ b/src/script/bridge/qscriptdeclarativeclass_p.h
@@ -107,6 +107,7 @@ public:
         PersistentIdentifier(const PersistentIdentifier &other);
         PersistentIdentifier &operator=(const PersistentIdentifier &other);
 
+        QString toString() const;
     private:
         friend class QScriptDeclarativeClass;
         PersistentIdentifier(QScriptEnginePrivate *e) : identifier(0), engine(e), d(0) {}
@@ -126,6 +127,7 @@ public:
     PersistentIdentifier createPersistentIdentifier(const Identifier &);
 
     QString toString(const Identifier &);
+    bool startsWithUpper(const Identifier &);
     quint32 toArrayIndex(const Identifier &, bool *ok);
 
     virtual QScriptClass::QueryFlags queryProperty(Object *, const Identifier &,