17 files changed, 18 insertions, 18 deletions
diff --git a/src/3rdparty/poly2tri/sweep/sweep.cpp b/src/3rdparty/poly2tri/sweep/sweep.cpp
index 4df63038..902c0295 100644
--- a/src/3rdparty/poly2tri/sweep/sweep.cpp
+++ b/src/3rdparty/poly2tri/sweep/sweep.cpp
@@ -789,7 +789,7 @@ void Sweep::FlipScanEdgeEvent(SweepContext& tcx, Point& ep, Point& eq, Triangle&
     // flip with new edge op->eq
     FlipEdgeEvent(tcx, eq, op, &ot, op);
     // TODO: Actually I just figured out that it should be possible to
-    //       improve this by getting the next ot and op before the the above
+    //       improve this by getting the next ot and op before the above
     //       flip and continue the flipScanEdgeEvent here
     // set new ot and op here and loop back to inScanArea test
     // also need to set a new flip_triangle first
diff --git a/src/3rdparty/poly2tri/sweep/sweep_context.h b/src/3rdparty/poly2tri/sweep/sweep_context.h
index 482ab795..cd9a037c 100644
--- a/src/3rdparty/poly2tri/sweep/sweep_context.h
+++ b/src/3rdparty/poly2tri/sweep/sweep_context.h
@@ -38,7 +38,7 @@
 
 namespace p2t {
 
-// Inital triangle factor, seed triangle will extend 30% of
+// Initial triangle factor, seed triangle will extend 30% of
 // PointSet width to both left and right.
 const float kAlpha = float(0.3);
 
diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp
index cfff8d2e..8e939ae3 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp
+++ b/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp
@@ -158,7 +158,7 @@ QT_USE_NAMESPACE
 
     Updates the model based on the provided query parameters.  The model will be populated with a
     list of search suggestions for the partial \l searchTerm and \l searchArea.  If the \l plugin
-    supports it, other paramaters such as \l limit and \l offset may be specified.  \c update()
+    supports it, other parameters such as \l limit and \l offset may be specified.  \c update()
     submits the set of parameters to the \l plugin to process.
 
 
diff --git a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp
index fc88c889..7d50af7e 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp
+++ b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp
@@ -111,7 +111,7 @@ QT_USE_NAMESPACE
     \qmlmethod string QtLocation::CategoryModel::data(ModelIndex index, int role)
     \internal
 
-    This method retrieves the the model's data per \a index and \a role.
+    This method retrieves the model's data per \a index and \a role.
 */
 
 /*!
diff --git a/src/imports/positioning/qdeclarativepositionsource.cpp b/src/imports/positioning/qdeclarativepositionsource.cpp
index f8239aa0..cc8dfe56 100644
--- a/src/imports/positioning/qdeclarativepositionsource.cpp
+++ b/src/imports/positioning/qdeclarativepositionsource.cpp
@@ -636,7 +636,7 @@ void QDeclarativePositionSource::positionUpdateReceived(const QGeoPositionInfo &
 /*!
     \qmlproperty enumeration PositionSource::sourceError
 
-    This property holds the error which last occured with the PositionSource.
+    This property holds the error which last occurred with the PositionSource.
 
     \list
     \li PositionSource.AccessError - The connection setup to the remote positioning backend failed because the
diff --git a/src/location/doc/snippets/places/requesthandler.h b/src/location/doc/snippets/places/requesthandler.h
index e18b6276..8b157ce6 100644
--- a/src/location/doc/snippets/places/requesthandler.h
+++ b/src/location/doc/snippets/places/requesthandler.h
@@ -70,7 +70,7 @@ public:
         searchRequest.setSearchTerm("ice cream");
         searchRequest.setSearchArea(QGeoCircle(QGeoCoordinate(12.34, 56.78)));
 
-        //2) Use the manager to initiate a request and retreive a reply object
+        //2) Use the manager to initiate a request and retrieve a reply object
         QPlaceSearchReply * searchReply = manager->search(searchRequest);
 
         //3) Connect the reply object to a slot which is invoked upon operation completion
diff --git a/src/location/maps/qgeocameracapabilities.cpp b/src/location/maps/qgeocameracapabilities.cpp
index 23b5fb31..c2ffdbeb 100644
--- a/src/location/maps/qgeocameracapabilities.cpp
+++ b/src/location/maps/qgeocameracapabilities.cpp
@@ -213,7 +213,7 @@ double QGeoCameraCapabilities::maximumZoomLevel() const
 
 /*!
     Sets whether the associated plugin can render a map when the camera
-    has an aribtrary bearing to \a supportsBearing.
+    has an arbitrary bearing to \a supportsBearing.
 */
 void QGeoCameraCapabilities::setSupportsBearing(bool supportsBearing)
 {
@@ -223,7 +223,7 @@ void QGeoCameraCapabilities::setSupportsBearing(bool supportsBearing)
 
 /*!
     Returns whether the associated plugin can render a map when the camera
-    has an aribtrary bearing.
+    has an arbitrary bearing.
 */
 bool QGeoCameraCapabilities::supportsBearing() const
 {
diff --git a/src/location/maps/qgeomapdata.cpp b/src/location/maps/qgeomapdata.cpp
index 69e11530..e6d7b68f 100644
--- a/src/location/maps/qgeomapdata.cpp
+++ b/src/location/maps/qgeomapdata.cpp
@@ -250,7 +250,7 @@ void QGeoMapDataPrivate::setCameraData(const QGeoCameraData &cameraData)
 
     // Do not call this expensive function if the width is 0, since it will get called
     // anyway when it is resized to a width > 0.
-    // this is mainly an optimisation to the initalization of the geomap, which would otherwise
+    // this is mainly an optimization to the initialization of the geomap, which would otherwise
     // call changeCameraData four or more times
     if (width() > 0)
         map_->changeCameraData(oldCameraData);
diff --git a/src/location/places/qplaceicon.cpp b/src/location/places/qplaceicon.cpp
index 1ae9c14f..fa31c504 100644
--- a/src/location/places/qplaceicon.cpp
+++ b/src/location/places/qplaceicon.cpp
@@ -111,7 +111,7 @@ bool QPlaceIconPrivate::operator == (const QPlaceIconPrivate &other) const
     \variable QPlaceIcon::SingleUrl
     \brief Parameter key for an icon that only has a single image URL.
 
-    The paramter value to be used with this key is a QUrl.  An icon with this parameter set will
+    The parameter value to be used with this key is a QUrl.  An icon with this parameter set will
     always return the specified URL regardless of the requested size when url() is called.
 */
 const QString QPlaceIcon::SingleUrl(QLatin1String("singleUrl"));
diff --git a/src/location/places/qplacematchrequest.cpp b/src/location/places/qplacematchrequest.cpp
index e7917d97..bb57e3c3 100644
--- a/src/location/places/qplacematchrequest.cpp
+++ b/src/location/places/qplacematchrequest.cpp
@@ -225,7 +225,7 @@ void QPlaceMatchRequest::setResults(const QList<QPlaceSearchResult> &results)
 }
 
 /*!
-    Returns the paramaters for matching places.
+    Returns the parameters for matching places.
 */
 QVariantMap QPlaceMatchRequest::parameters() const
 {
diff --git a/src/location/places/qplaceresult.cpp b/src/location/places/qplaceresult.cpp
index 8a3a99fe..047a7c4e 100644
--- a/src/location/places/qplaceresult.cpp
+++ b/src/location/places/qplaceresult.cpp
@@ -88,7 +88,7 @@ bool QPlaceResultPrivate::compare(const QPlaceSearchResultPrivate *other) const
 
     \snippet places/requesthandler.h Convert search result
 
-    The implmentation is handled in such a way that object slicing is not an issue.
+    The implementation is handled in such a way that object slicing is not an issue.
 
     \sa QPlaceSearchResult
 */
diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
index a6ce9c0a..72ec3307 100644
--- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
@@ -177,7 +177,7 @@ QString QGeoTileFetcherNokia::getLanguageString() const
     // here even though the entire list is updated automagically from the server.
     // The current languages are Arabic, Chinese, Simplified Chinese, English
     // French, German, Italian, Polish, Russian and Spanish. The default is English.
-    // These are acually available from the same host under the URL: /maptiler/v2/info
+    // These are actually available from the same host under the URL: /maptiler/v2/info
 
     switch (locale.language()) {
     case QLocale::Arabic:
diff --git a/src/positioning/qdeclarativegeoaddress.cpp b/src/positioning/qdeclarativegeoaddress.cpp
index 6d14e48f..671b5881 100644
--- a/src/positioning/qdeclarativegeoaddress.cpp
+++ b/src/positioning/qdeclarativegeoaddress.cpp
@@ -131,7 +131,7 @@ void QDeclarativeGeoAddress::setAddress(const QGeoAddress &address)
     string to use to display the address to the user. It typically takes the format of
     an address as found on an envelope, but this is not always necessarily the case.
 
-    The adddress \c text is either automatically generated or explicitly assigned,
+    The address \c text is either automatically generated or explicitly assigned,
     this can be determined by checking \l isTextGenerated.
 
     If an empty string is assigned to \c text, then \l isTextGenerated will be set
diff --git a/src/positioning/qgeoaddress.cpp b/src/positioning/qgeoaddress.cpp
index 180d29dd..4b8ef36a 100644
--- a/src/positioning/qgeoaddress.cpp
+++ b/src/positioning/qgeoaddress.cpp
@@ -415,7 +415,7 @@ bool QGeoAddress::operator==(const QGeoAddress &other) const
     to use to display the address to the user. It typically takes the format of
     an address as found on an envelope, but this is not always necessarily the case.
 
-    The adddress text is either automatically generated or explicitly assigned.
+    The address text is either automatically generated or explicitly assigned.
     This can be determined by checking \l {QGeoAddress::isTextGenerated()} {isTextGenerated}.
 
     If an empty string is provided to setText(), then isTextGenerated() will be set
diff --git a/tests/applications/declarative_map/map3d.qml b/tests/applications/declarative_map/map3d.qml
index 652d19af..9d8d9fac 100644
--- a/tests/applications/declarative_map/map3d.qml
+++ b/tests/applications/declarative_map/map3d.qml
@@ -653,7 +653,7 @@ Rectangle {
             anchors.fill: parent
             target: map
             enabled: false
-            focus: true           // enables keyboard control for convinience
+            focus: true           // enables keyboard control for convenience
             replaySpeedFactor: 1.7 // replay with 1.1 times the recording speed to better see what happens
             Text {
                 id: pinchGenText
diff --git a/tests/applications/declarative_map/map3d_mousetest.qml b/tests/applications/declarative_map/map3d_mousetest.qml
index e875e07d..cc6dbda1 100644
--- a/tests/applications/declarative_map/map3d_mousetest.qml
+++ b/tests/applications/declarative_map/map3d_mousetest.qml
@@ -274,7 +274,7 @@ Item {
             anchors.fill: parent
             target: map
             enabled: false
-            focus: true           // enables keyboard control for convinience
+            focus: true           // enables keyboard control for convenience
             replaySpeedFactor: 1.1 // replay with 1.1 times the recording speed to better see what happens
             Text {
                 text: "PinchArea state: " + pinchGenerator.state + "\n"
diff --git a/tests/auto/qplace/tst_qplace.cpp b/tests/auto/qplace/tst_qplace.cpp
index ed171e35..1b5ea786 100644
--- a/tests/auto/qplace/tst_qplace.cpp
+++ b/tests/auto/qplace/tst_qplace.cpp
@@ -682,7 +682,7 @@ void tst_Place::isEmptyTest()
     place.removeContactDetails(QLatin1String("phone"));
     QVERIFY(place.isEmpty());
 
-    // visiblity
+    // visibility
     place.setVisibility(QLocation::DeviceVisibility);
     QVERIFY(!place.isEmpty());
     place.setVisibility(QLocation::UnspecifiedVisibility);