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:
  QNAM HTTP: tst_qnetworkreply with setReadBufferSize() set
  Fix compilation on AIX 5.3 with gcc
  Doc: Fixed typo
  Fix poor English in QStyle::polish documentation.
  Fix a few typos in comments and docs.

6 files changed, 9 insertions, 9 deletions

diff --git a/src/corelib/kernel/qmimedata.cpp b/src/corelib/kernel/qmimedata.cpp
index bf4001a..899ca7b 100644
--- a/src/corelib/kernel/qmimedata.cpp
+++ b/src/corelib/kernel/qmimedata.cpp
@@ -249,7 +249,7 @@ QVariant QMimeDataPrivate::retrieveTypedData(const QString &format, QVariant::Ty
     \o  We can subclass QMimeData and reimplement hasFormat(),
         formats(), and retrieveData().
 
-    \o  If the drag and drop operation occurs withing a single
+    \o  If the drag and drop operation occurs within a single
         application, we can subclass QMimeData and add extra data in
         it, and use a qobject_cast() in the receiver's drop event
         handler. For example:
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index 4b371f7..6324cc9 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -178,7 +178,7 @@ QT_BEGIN_NAMESPACE
 
 QStateMachinePrivate::QStateMachinePrivate()
 {
-    QAbstractStatePrivate::isMachine = true;
+    isMachine = true;
 
     state = NotRunning;
     _startState = 0;
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 0c99ea8..6906f21 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -608,7 +608,7 @@ QDeclarativeContext *QDeclarativeEngine::rootContext() const
   QNetworkAccessManager with specialized caching, proxy and cookie
   support.
 
-  The factory must be set before exceuting the engine.
+  The factory must be set before executing the engine.
 */
 void QDeclarativeEngine::setNetworkAccessManagerFactory(QDeclarativeNetworkAccessManagerFactory *factory)
 {
diff --git a/src/gui/kernel/qcocoamenuloader_mac.mm b/src/gui/kernel/qcocoamenuloader_mac.mm
index 8d38f45..4bf6ed9 100644
--- a/src/gui/kernel/qcocoamenuloader_mac.mm
+++ b/src/gui/kernel/qcocoamenuloader_mac.mm
@@ -89,7 +89,7 @@ QT_USE_NAMESPACE
 - (void)ensureAppMenuInMenu:(NSMenu *)menu
 {
     // The application menu is the menu in the menu bar that contains the
-    // 'Quit' item. When changing menu bar (e.g when swithing between
+    // 'Quit' item. When changing menu bar (e.g when switching between
     // windows with different menu bars), we never recreate this menu, but
     // instead pull it out the current menu bar and place into the new one:
     NSMenu *mainMenu = [NSApp mainMenu];
diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp
index ac9b994..8a1c154 100644
--- a/src/gui/painting/qbackingstore.cpp
+++ b/src/gui/painting/qbackingstore.cpp
@@ -446,7 +446,7 @@ QRegion QWidgetBackingStore::dirtyRegion(QWidget *widget) const
 
 /*!
     Returns the static content inside the \a parent if non-zero; otherwise the static content
-    for the entire backing store is returned. The content will be clipped to \a withingClipRect
+    for the entire backing store is returned. The content will be clipped to \a withinClipRect
     if non-empty.
 */
 QRegion QWidgetBackingStore::staticContents(QWidget *parent, const QRect &withinClipRect) const
diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp
index 0a75492..3ebfab2 100644
--- a/src/gui/styles/qstyle.cpp
+++ b/src/gui/styles/qstyle.cpp
@@ -367,10 +367,10 @@ QStyle::~QStyle()
     Note that the default implementation does nothing. Reasonable
     actions in this function might be to call the
     QWidget::setBackgroundMode() function for the widget. Do not use
-    the function to set, for example, the geometry; reimplementing
-    this function do provide a back-door through which the appearance
-    of a widget can be changed, but with Qt 4.0's style engine there
-    is rarely necessary to implement this function; reimplement the
+    the function to set, for example, the geometry. Reimplementing
+    this function provides a back-door through which the appearance
+    of a widget can be changed, but with Qt's style engine it is
+    rarely necessary to implement this function; reimplement
     drawItemPixmap(), drawItemText(), drawPrimitive(), etc. instead.
 
     The QWidget::inherits() function may provide enough information to