Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  typo for windows ce exclusion rule
  Updated .gitignore with the new name of the qmlviewer
  Fixed the close button of the find widget in Assistant
  Doc: brief Qt Quick introduction on "What's New" page.
  Interview Demo: Fix warning about pixmap leak on X11.
  Perform latin1 conversion directly on JSC::UString
  Avoid conversion between JavaScriptCore String type and QString
  Doc: Rephrase documentation for QColor::isValidColor and add \since 4.7.
  Use QList::reserve() in QDataStream>>QList
  Added static method isValidColor to QColor.
  compile fix with namespaces
  build fix for WinCE
  qDetectCPUFeatures: compile fix with namespaces
  compile fix for WinCE
  Mac: using Qt to write plugins disables quit for 3rd party application
  doc: Fixed building documentation
  Updated syncqt to use relative include paths on cygwin as well.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/script/api/qscriptvalue_p.h b/src/script/api/qscriptvalue_p.h
index 77b7330..089b923 100644
--- a/src/script/api/qscriptvalue_p.h
+++ b/src/script/api/qscriptvalue_p.h
@@ -88,8 +88,8 @@ public:
 
     inline JSC::JSValue property(const JSC::Identifier &id, int resolveMode) const;
     inline JSC::JSValue property(quint32 index, int resolveMode) const;
-    inline JSC::JSValue property(const QString &, int resolveMode) const;
-    inline void setProperty(const QString &name, const JSC::JSValue &value,
+    inline JSC::JSValue property(const JSC::UString &, int resolveMode) const;
+    inline void setProperty(const JSC::UString &name, const JSC::JSValue &value,
                             const QScriptValue::PropertyFlags &flags);
     inline void setProperty(const JSC::Identifier &id, const JSC::JSValue &value,
                             const QScriptValue::PropertyFlags &flags);