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

2 files changed, 5 insertions, 5 deletions

diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index e757675..3f11425 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -246,7 +246,7 @@ QDeclarativeComponent::~QDeclarativeComponent()
     \o Component.Ready - the component has been loaded, and can be used to create instances.
     \o Component.Loading - the component is currently being loaded
     \o Component.Error - an error occurred while loading the component.
-               Calling errorsString() will provide a human-readable description of any errors.
+               Calling errorString() will provide a human-readable description of any errors.
     \endlist
  */
 
@@ -492,7 +492,7 @@ QList<QDeclarativeError> QDeclarativeComponent::errors() const
 }
 
 /*!
-    \qmlmethod string Component::errorsString()
+    \qmlmethod string Component::errorString()
 
     Returns a human-readable description of any errors.
 
@@ -504,9 +504,9 @@ QList<QDeclarativeError> QDeclarativeComponent::errors() const
 
 /*!
     \internal
-    errorsString is only meant as a way to get the errors in script
+    errorString is only meant as a way to get the errors in script
 */
-QString QDeclarativeComponent::errorsString() const
+QString QDeclarativeComponent::errorString() const
 {
     Q_D(const QDeclarativeComponent);
     QString ret;
diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h
index 688e233..1d1fca7 100644
--- a/src/declarative/qml/qdeclarativecomponent.h
+++ b/src/declarative/qml/qdeclarativecomponent.h
@@ -86,7 +86,7 @@ public:
     bool isLoading() const;
 
     QList<QDeclarativeError> errors() const;
-    Q_INVOKABLE QString errorsString() const;
+    Q_INVOKABLE QString errorString() const;
 
     qreal progress() const;