Merge branch 'master' into animation-refactor

Conflicts:
	tools/qmlviewer/qdeclarativetester.cpp
	tools/qmlviewer/qmlruntime.cpp

Change-Id: I48f0eb02df27e4b524f45927939b4c257452b0aa

1 files changed, 3 insertions, 3 deletions

diff --git a/src/declarative/util/qdeclarativepath.cpp b/src/declarative/util/qdeclarativepath.cpp
index 146fbf9950..bf3b46ee81 100644
--- a/src/declarative/util/qdeclarativepath.cpp
+++ b/src/declarative/util/qdeclarativepath.cpp
@@ -256,7 +256,7 @@ void QDeclarativePath::endpoint(QList<AttributePoint> &attributePoints, const QS
     }
 }
 
-static QString percentString(QStringLiteral("_qfx_percent"));
+static QString percentString(QLatin1String("_qfx_percent"));
 
 void QDeclarativePath::processPath()
 {
@@ -1396,7 +1396,7 @@ void QDeclarativePathSvg::addToPath(QPainterPath &path, const QDeclarativePathDa
     PathView's path. You can use it to bunch together items on part of
     the path, and spread them out on other parts of the path.
 
-    The examples below show the normal distrubution of items along a path
+    The examples below show the normal distribution of items along a path
     compared to a distribution which places 50% of the items along the
     PathLine section of the path.
     \table
@@ -1438,7 +1438,7 @@ void QDeclarativePathSvg::addToPath(QPainterPath &path, const QDeclarativePathDa
 
 /*!
     \qmlproperty real QtQuick2::PathPercent::value
-    The proporation of items that should be laid out up to this point.
+    The proportion of items that should be laid out up to this point.
 
     This value should always be higher than the last value specified
     by a PathPercent at a previous position in the Path.