Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I09ce9ad6e50bdb6034717d45ad73b4d21474a6e2

5 files changed, 5 insertions, 5 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 64ae2094..3042dc14 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -1331,7 +1331,7 @@ void QDeclarativeFlickable::setBoundsBehavior(BoundsBehavior b)
 
     \snippet doc/src/snippets/declarative/flickable.qml document
 
-    In some cases, the the content dimensions can be automatically set
+    In some cases, the content dimensions can be automatically set
     using the \l {Item::childrenRect.width}{childrenRect.width}
     and \l {Item::childrenRect.height}{childrenRect.height} properties.
 */
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index aebf912b..41b56a6a 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -782,7 +782,7 @@ QObject *QDeclarativeComponent::create(QDeclarativeContext *context)
     When QDeclarativeComponent constructs an instance, it occurs in three steps:
     \list 1
     \li The object hierarchy is created, and constant values are assigned.
-    \li Property bindings are evaluated for the the first time.
+    \li Property bindings are evaluated for the first time.
     \li If applicable, QDeclarativeParserStatus::componentComplete() is called on objects.
     \endlist
     QDeclarativeComponent::beginCreate() differs from QDeclarativeComponent::create() in that it
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 612931b2..c67ea236 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -1942,7 +1942,7 @@ void QDeclarativeEnginePrivate::sendQuit()
 
 static void dumpwarning(const QDeclarativeError &error)
 {
-    qWarning().nospace() << qPrintable(error.toString());
+    qWarning("%s", error.toString().toUtf8().constData());
 }
 
 static void dumpwarning(const QList<QDeclarativeError> &errors)
diff --git a/src/declarative/qml/qdeclarativeerror.cpp b/src/declarative/qml/qdeclarativeerror.cpp
index 9a25943a..64d43d70 100644
--- a/src/declarative/qml/qdeclarativeerror.cpp
+++ b/src/declarative/qml/qdeclarativeerror.cpp
@@ -240,7 +240,7 @@ QString QDeclarativeError::toString() const
 
 QDebug operator<<(QDebug debug, const QDeclarativeError &error)
 {
-    debug << qPrintable(error.toString());
+    debug << error.toString().toUtf8().constData();
 
     QUrl url = error.url();
 
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index a72df77a..9f0c73ac 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -791,7 +791,7 @@ void QDeclarativeScriptAction::setScript(const QDeclarativeScriptString &script)
 
 /*!
     \qmlproperty string ScriptAction::scriptName
-    This property holds the the name of the StateChangeScript to run.
+    This property holds the name of the StateChangeScript to run.
 
     This property is only valid when ScriptAction is used as part of a transition.
     If both script and scriptName are set, scriptName will be used.