Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  changelog
  Compile with DEBUG_FONTENGINE define
  minor optimization
  remove the old compatibility code
  make QFontEngineQPF1 work even without mmap(2) support
  Doc: Fixing typo

28 files changed, 50 insertions, 50 deletions

diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp
index f16a6f72f3..ebac64e814 100644
--- a/tests/auto/mediaobject/tst_mediaobject.cpp
+++ b/tests/auto/mediaobject/tst_mediaobject.cpp
@@ -498,7 +498,7 @@ void tst_MediaObject::initTestCase()
         if (Phonon::ErrorState == s) {
 #ifdef Q_WS_WIN
             if (m_media->errorString().contains(QLatin1String("no audio hardware is available")))
-                QSKIP("On Windows we need an audio devide to perform the MediaObject tests", SkipAll); 
+                QSKIP("On Windows we need an audio device to perform the MediaObject tests", SkipAll);
             else
 #endif
             QFAIL("Loading the URL put the MediaObject into the ErrorState. Check that PHONON_TESTURL is set to a valid URL.");
@@ -748,7 +748,7 @@ void tst_MediaObject::playUrl()
     QVERIFY(media.state() != Phonon::ErrorState);
 
     //we use a long 30s timeout here as it can take a long time for the streaming source to
-    //be sucessfully prepared depending on the network.
+    //be successfully prepared depending on the network.
     if (media.state() != Phonon::StoppedState)
         QTest::waitForSignal(&media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), 30000);
     QCOMPARE(media.state(), Phonon::StoppedState);
@@ -1192,7 +1192,7 @@ void tst_MediaObject::_testOneSeek(qint64 seekTo)
 void tst_MediaObject::volumeSliderMuteVisibility()
 {
     //this test doesn't really belong to mediaobject
-    // ### see if we should create a realy Phonon::VolumeSlider autotest
+    // ### see if we should create a really Phonon::VolumeSlider autotest
     Phonon::VolumeSlider slider;
     QVERIFY(slider.isMuteVisible()); // that is the default value
     slider.setMuteVisible(true);
diff --git a/tests/auto/q3accel/tst_q3accel.cpp b/tests/auto/q3accel/tst_q3accel.cpp
index e87a3e759a..24f9368220 100644
--- a/tests/auto/q3accel/tst_q3accel.cpp
+++ b/tests/auto/q3accel/tst_q3accel.cpp
@@ -877,7 +877,7 @@ void tst_Q3Accel::unicodeCompose()
     sendKeyEvents( META+Qt::Key_9, 0 );
     QCOMPARE( currentResult, Accel1Triggered );
 #else
-    QSKIP( "Unicode composing non-existant in Qt 3.y.z", SkipAll);
+    QSKIP( "Unicode composing non-existent in Qt 3.y.z", SkipAll);
 #endif
 }
 
diff --git a/tests/auto/q3checklistitem/tst_q3checklistitem.cpp b/tests/auto/q3checklistitem/tst_q3checklistitem.cpp
index 70f062374d..6b2f0d6ed0 100644
--- a/tests/auto/q3checklistitem/tst_q3checklistitem.cpp
+++ b/tests/auto/q3checklistitem/tst_q3checklistitem.cpp
@@ -284,7 +284,7 @@ void tst_Q3CheckListItem::setState_data()
 	s.insert( "b_item1", Q3CheckListItem::On );
 	// bring back old state
 	s.insert( "c_item1", Q3CheckListItem::NoChange );
-	// set item9 (and it's children) to On, wich also saves new history for the whole tree to On
+	// set item9 (and it's children) to On, which also saves new history for the whole tree to On
 	s.insert( "d_item9", Q3CheckListItem::On );
 	// bring back old state once again, all should be On now
 	s.insert( "e_item1", Q3CheckListItem::NoChange );
diff --git a/tests/auto/q3dns/tst_q3dns.cpp b/tests/auto/q3dns/tst_q3dns.cpp
index 7cfdfdca5b..e85376c417 100644
--- a/tests/auto/q3dns/tst_q3dns.cpp
+++ b/tests/auto/q3dns/tst_q3dns.cpp
@@ -123,7 +123,7 @@ void tst_Q3Dns::destructor()
     Q3Socket *s = new Q3Socket(&a);
     s->connectToHost("ftp.qt.nokia.com", 21);
 
-    // dummy verify since this test only makes shure that it does not crash
+    // dummy verify since this test only makes sure that it does not crash
     QVERIFY( TRUE );
 }
 
diff --git a/tests/auto/q3popupmenu/tst_q3popupmenu.cpp b/tests/auto/q3popupmenu/tst_q3popupmenu.cpp
index 8a2893813b..3e60cfd162 100644
--- a/tests/auto/q3popupmenu/tst_q3popupmenu.cpp
+++ b/tests/auto/q3popupmenu/tst_q3popupmenu.cpp
@@ -88,7 +88,7 @@ protected slots:
     void onShiftItem();
     void onSpicy();
     void onSubItem();
-    // Needed to slience QObject about non existant slot
+    // Needed to slience QObject about non existent slot
     void dummySlot() {}
     void itemParameterChanged(int p = 0){itemParameter = p; }
 
diff --git a/tests/auto/qapplication/tst_qapplication.cpp b/tests/auto/qapplication/tst_qapplication.cpp
index 79cb362d87..997f9a5b38 100644
--- a/tests/auto/qapplication/tst_qapplication.cpp
+++ b/tests/auto/qapplication/tst_qapplication.cpp
@@ -1515,7 +1515,7 @@ void tst_QApplication::testDeleteLaterProcessEvents()
 }
 
 /*
-    Test for crash whith QApplication::setDesktopSettingsAware(false).
+    Test for crash with QApplication::setDesktopSettingsAware(false).
 */
 void tst_QApplication::desktopSettingsAware()
 {
diff --git a/tests/auto/qbytearray/tst_qbytearray.cpp b/tests/auto/qbytearray/tst_qbytearray.cpp
index 9889aae09b..54885591a7 100644
--- a/tests/auto/qbytearray/tst_qbytearray.cpp
+++ b/tests/auto/qbytearray/tst_qbytearray.cpp
@@ -644,7 +644,7 @@ void tst_QByteArray::qstrncpy()
     QCOMPARE(QByteArray(::qstrncpy(dst.data(), src.data(), src.size())),
             QByteArray("Tumdelidu"));
 
-    // normal copy with length is longer than neccessary
+    // normal copy with length is longer than necessary
     src = QByteArray( "Tumdelidum\0foo" );
     dst.resize(128*1024);
     QCOMPARE(QByteArray(::qstrncpy(dst.data(), src.data(), dst.size())),
diff --git a/tests/auto/qclipboard/tst_qclipboard.cpp b/tests/auto/qclipboard/tst_qclipboard.cpp
index 7e47c27b59..94981cf8e5 100644
--- a/tests/auto/qclipboard/tst_qclipboard.cpp
+++ b/tests/auto/qclipboard/tst_qclipboard.cpp
@@ -140,8 +140,8 @@ void tst_QClipboard::modes()
 }
 
 /*
-    Test that the apropriate signals are emitted when the cliboard
-    contents is changed by calling the qt funcitons.
+    Test that the appropriate signals are emitted when the cliboard
+    contents is changed by calling the qt functions.
 */
 void tst_QClipboard::testSignals()
 {
@@ -170,7 +170,7 @@ void tst_QClipboard::testSignals()
 
     changedSpy.clear();
 
-    // Test the selction mode signal.
+    // Test the selection mode signal.
     if (clipboard->supportsSelection()) {
         clipboard->setText(text, QClipboard::Selection);
         QCOMPARE(selectionChangedSpy.count(), 1);
diff --git a/tests/auto/qcommandlinkbutton/tst_qcommandlinkbutton.cpp b/tests/auto/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
index 86d5f240fb..6a51bf4bba 100644
--- a/tests/auto/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
+++ b/tests/auto/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
@@ -360,7 +360,7 @@ void tst_QCommandLinkButton::toggled()
     testWidget->toggle();
     QVERIFY( toggle_count == 0 );
 
-    // do it again, just to be shure
+    // do it again, just to be sure
     resetCounters();
     testWidget->toggle();
     QVERIFY( toggle_count == 0 );
diff --git a/tests/auto/qeventloop/tst_qeventloop.cpp b/tests/auto/qeventloop/tst_qeventloop.cpp
index bcc205e68f..3250c77f80 100644
--- a/tests/auto/qeventloop/tst_qeventloop.cpp
+++ b/tests/auto/qeventloop/tst_qeventloop.cpp
@@ -287,7 +287,7 @@ void tst_QEventLoop::onlySymbianActiveScheduler() {
     // In here we try to use timers and sockets exclusively using the Symbian
     // active scheduler and no processEvents().
     // This test should therefore be run first, so that we can verify that
-    // the first occurrence of processEvents does not do any initalization that
+    // the first occurrence of processEvents does not do any initialization that
     // we depend on.
 
     // Open up a pipe so we can test socket notifiers.
diff --git a/tests/auto/qftp/tst_qftp.cpp b/tests/auto/qftp/tst_qftp.cpp
index 7e431cf109..b6b81cbca0 100644
--- a/tests/auto/qftp/tst_qftp.cpp
+++ b/tests/auto/qftp/tst_qftp.cpp
@@ -1429,7 +1429,7 @@ void tst_QFtp::abort()
                 QVERIFY( bytesDone != bytesTotal );
             }
         } else {
-            // this could be tested by verifying that no more progress signals are emited
+            // this could be tested by verifying that no more progress signals are emitted
             QVERIFY(bytesDone <= bytesTotal);
         }
     } else {
diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
index 66a9e47c5a..4f21bb5abb 100644
--- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
@@ -3054,7 +3054,7 @@ void tst_QGraphicsView::task210599_unsetDragWhileDragging()
         QApplication::sendEvent(view.viewport(), &move);
     }
 
-    // Check that no draggin has occured...
+    // Check that no draggin has occurred...
     QCOMPARE(basePos, view.mapFromScene(0, 0));
 }
 
diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
index 5260a1a349..1df9d38bb8 100644
--- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -2456,7 +2456,7 @@ void tst_QGraphicsWidget::popupMouseGrabber()
     QCOMPARE(widgetUngrabEventSpy.count(), 1);
     QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)0);
 
-    // Showing it grabs the mosue again
+    // Showing it grabs the mouse again
     widget->show();
     QCOMPARE(widgetGrabEventSpy.count(), 2);
     QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget);
@@ -3175,7 +3175,7 @@ void tst_QGraphicsWidget::initialShow2()
     // Don't let paint events triggered by the windowing system
     // influence our test case. We're only interested in knowing
     // whether a QGraphicsWidget generates an additional repaint
-    // on the inital show. Hence create a dummy scenario to find out
+    // on the initial show. Hence create a dummy scenario to find out
     // how many repaints we should expect.
     QGraphicsScene dummyScene(0, 0, 200, 200);
     dummyScene.addItem(new QGraphicsRectItem(0, 0, 100, 100));
diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/qhostinfo/tst_qhostinfo.cpp
index 2fa5e76890..9ed1190376 100644
--- a/tests/auto/qhostinfo/tst_qhostinfo.cpp
+++ b/tests/auto/qhostinfo/tst_qhostinfo.cpp
@@ -256,7 +256,7 @@ void tst_QHostInfo::initTestCase()
 
 void tst_QHostInfo::init()
 {
-    // delete the cache so inidividual testcase results are independant from each other
+    // delete the cache so inidividual testcase results are independent from each other
     qt_qhostinfo_clear_cache();
 
     QFETCH_GLOBAL(bool, cache);
diff --git a/tests/auto/qitemmodel/tst_qitemmodel.cpp b/tests/auto/qitemmodel/tst_qitemmodel.cpp
index 4bdfadd9e6..191e9e88a9 100644
--- a/tests/auto/qitemmodel/tst_qitemmodel.cpp
+++ b/tests/auto/qitemmodel/tst_qitemmodel.cpp
@@ -67,7 +67,7 @@ Q_DECLARE_METATYPE(QModelIndex)
     See modelstotest.cpp for instructions on how to have your model tested with these tests.
 
     Each test such as rowCount have a _data() function which populate the QTest data with
-    the tests specified by modelstotest.cpp and any extra data needed for that perticular test.
+    the tests specified by modelstotest.cpp and any extra data needed for that particular test.
 
     setupWithNoTestData() fills the QTest data with just the tests and is used by most tests.
 
@@ -192,7 +192,7 @@ void tst_QItemModel::nonDestructiveBasicTest_data()
 }
 
 /*!
-    nonDestructiveBasicTest trys to call a number of the basic functions (not all)
+    nonDestructiveBasicTest tries to call a number of the basic functions (not all)
     to make sure the model doesn't segfault, testing the functions that makes sense.
  */
 void tst_QItemModel::nonDestructiveBasicTest()
@@ -516,7 +516,7 @@ void tst_QItemModel::parent()
         QCOMPARE(currentModel->parent(childIndex), topIndex);
     }
 
-    // Common error test #3, the second colum has the same children
+    // Common error test #3, the second column has the same children
     // as the first column in a row.
     QModelIndex topIndex1 = currentModel->index(0, 1, QModelIndex());
     if (currentModel->rowCount(topIndex1) > 0) {
@@ -817,7 +817,7 @@ void tst_QItemModel::remove_data()
         makeTestRow(":valid start, invalid count",  MIDDLE, 9999, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
         makeTestRow(":valid start, invalid count",  END,    9999, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
 
-        // Recursive remove's might assert, havn't decided yet...
+        // Recursive remove's might assert, haven't decided yet...
         //makeTestRow(":one at the start recursivly",  START,  DEFAULTCOUNT, 2, DNS, 2, DNS, RECURSIVE, START, DEFAULTCOUNT, FAIL);
         //makeTestRow(":one at the middle recursivly", MIDDLE, DEFAULTCOUNT, 2, DNS, 2, DNS, RECURSIVE, START, DEFAULTCOUNT, SUCCESS);
         //makeTestRow(":one at the end recursivly",    END,    DEFAULTCOUNT, 2, DNS, 2, DNS, RECURSIVE, START, DEFAULTCOUNT, SUCCESS);
@@ -849,7 +849,7 @@ void tst_QItemModel::remove()
     QFETCH(bool, shouldSucceed);
 
     // Populate the test area so we can remove something.  See: cleanup()
-    // parentOfRemoved is stored so that the slots can make sure parentOfRemoved is the index that is emited.
+    // parentOfRemoved is stored so that the slots can make sure parentOfRemoved is the index that is emitted.
     parentOfRemoved = testModels->populateTestArea(currentModel);
 
     if (count == -1)
@@ -866,7 +866,7 @@ void tst_QItemModel::remove()
     //qDebug() << "remove start:" << start << "count:" << count << "rowCount:" << currentModel->rowCount(parentOfRemoved);
 
     // When a row or column is removed there should be two signals.
-    // Watch to make sure they are emited and get the row/column count when they do get emited by connecting them to a slot
+    // Watch to make sure they are emitted and get the row/column count when they do get emitted by connecting them to a slot
     qRegisterMetaType<QModelIndex>("QModelIndex");
     QSignalSpy columnsAboutToBeRemovedSpy(currentModel, SIGNAL(columnsAboutToBeRemoved( const QModelIndex &, int , int )));
     QSignalSpy rowsAboutToBeRemovedSpy(currentModel, SIGNAL(rowsAboutToBeRemoved( const QModelIndex &, int , int )));
@@ -914,7 +914,7 @@ void tst_QItemModel::remove()
         QVERIFY(parentOfRemoved == parent);
     }
 
-    // Only the row signals should have been emited
+    // Only the row signals should have been emitted
     if (modelResetSpy.count() >= 1 || modelLayoutChangedSpy.count() >=1 ){
         QCOMPARE(columnsAboutToBeRemovedSpy.count(), 0);
         QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
@@ -928,7 +928,7 @@ void tst_QItemModel::remove()
         QCOMPARE(rowsRemovedSpy.count(), numberOfRowsRemovedSignals);
     }
 
-    // The row count should only change *after* rowsAboutToBeRemoved has been emited
+    // The row count should only change *after* rowsAboutToBeRemoved has been emitted
     //qDebug() << beforeRemoveRowCount << afterAboutToRemoveRowCount << afterRemoveRowCount << currentModel->rowCount(parentOfRemoved);
     if (shouldSucceed) {
         if (modelResetSpy.count() == 0 && modelLayoutChangedSpy.count() == 0){
@@ -978,7 +978,7 @@ void tst_QItemModel::remove()
             QCOMPARE(rowsRemovedSpy.count(), numberOfRowsRemovedSignals);
         }
 
-        // The column count should only change *after* rowsAboutToBeRemoved has been emited
+        // The column count should only change *after* rowsAboutToBeRemoved has been emitted
         if (shouldSucceed) {
             if (modelResetSpy.count() == 0 && modelLayoutChangedSpy.count() == 0){
                 QCOMPARE(afterAboutToRemoveColumnCount, beforeRemoveColumnCount);
@@ -1160,7 +1160,7 @@ void tst_QItemModel::insert_data()
         makeTestRow(":valid start, invalid count",  MIDDLE, -2,   NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
         makeTestRow(":valid start, invalid count",  END,    -2,   NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
 
-        // Recursive insert's might assert, havn't decided yet...
+        // Recursive insert's might assert, haven't decided yet...
         //makeTestRow(":one at the start recursivly",  START,  DEFAULTCOUNT, 2, DNS, 2, DNS, RECURSIVE, START, DEFAULTCOUNT, FAIL);
         //makeTestRow(":one at the middle recursivly", MIDDLE, DEFAULTCOUNT, 2, DNS, 2, DNS, RECURSIVE, START, DEFAULTCOUNT, SUCCESS);
         //makeTestRow(":one at the end recursivly",    END,    DEFAULTCOUNT, 2, DNS, 2, DNS, RECURSIVE, START, DEFAULTCOUNT, SUCCESS);
@@ -1191,7 +1191,7 @@ void tst_QItemModel::insert()
     QFETCH(bool, shouldSucceed);
 
     // Populate the test area so we can insert something.  See: cleanup()
-    // parentOfInserted is stored so that the slots can make sure parentOfInserted is the index that is emited.
+    // parentOfInserted is stored so that the slots can make sure parentOfInserted is the index that is emitted.
     parentOfInserted = testModels->populateTestArea(currentModel);
 
     if (count == -1)
@@ -1208,7 +1208,7 @@ void tst_QItemModel::insert()
     //qDebug() << "insert start:" << start << "count:" << count << "rowCount:" << currentModel->rowCount(parentOfInserted);
 
     // When a row or column is inserted there should be two signals.
-    // Watch to make sure they are emited and get the row/column count when they do get emited by connecting them to a slot
+    // Watch to make sure they are emitted and get the row/column count when they do get emitted by connecting them to a slot
     qRegisterMetaType<QModelIndex>("QModelIndex");
     QSignalSpy columnsAboutToBeInsertedSpy(currentModel, SIGNAL(columnsAboutToBeInserted( const QModelIndex &, int , int )));
     QSignalSpy rowsAboutToBeInsertedSpy(currentModel, SIGNAL(rowsAboutToBeInserted( const QModelIndex &, int , int )));
@@ -1253,7 +1253,7 @@ void tst_QItemModel::insert()
         QVERIFY(parentOfInserted == parent);
     }
 
-    // Only the row signals should have been emited
+    // Only the row signals should have been emitted
     if (modelResetSpy.count() >= 1 || modelLayoutChangedSpy.count() >= 1) {
         QCOMPARE(columnsAboutToBeInsertedSpy.count(), 0);
         QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
@@ -1266,7 +1266,7 @@ void tst_QItemModel::insert()
         QCOMPARE(columnsInsertedSpy.count(), 0);
         QCOMPARE(rowsInsertedSpy.count(), numberOfRowsInsertedSignals);
     }
-    // The row count should only change *after* rowsAboutToBeInserted has been emited
+    // The row count should only change *after* rowsAboutToBeInserted has been emitted
     //qDebug() << beforeInsertRowCount << afterAboutToInsertRowCount << afterInsertRowCount << currentModel->rowCount(parentOfInserted);
     if (shouldSucceed) {
         if (modelResetSpy.count() == 0 && modelLayoutChangedSpy.count() == 0) {
@@ -1315,7 +1315,7 @@ void tst_QItemModel::insert()
             QCOMPARE(columnsInsertedSpy.count(), numberOfColumnsInsertedSignals);
             QCOMPARE(rowsInsertedSpy.count(), numberOfRowsInsertedSignals);
         }
-        // The column count should only change *after* rowsAboutToBeInserted has been emited
+        // The column count should only change *after* rowsAboutToBeInserted has been emitted
         if (shouldSucceed) {
             if (modelResetSpy.count() == 0 &&  modelLayoutChangedSpy.count() == 0) {
                 QCOMPARE(afterAboutToInsertColumnCount, beforeInsertColumnCount);
diff --git a/tests/auto/qitemview/tst_qitemview.cpp b/tests/auto/qitemview/tst_qitemview.cpp
index 1f43568240..b957f73eec 100644
--- a/tests/auto/qitemview/tst_qitemview.cpp
+++ b/tests/auto/qitemview/tst_qitemview.cpp
@@ -86,7 +86,7 @@ bool qt_wince_is_mobile() {
     See viewstotest.cpp for instructions on how to have your view tested with these tests.
 
     Each test such as visualRect have a _data() function which populate the QTest data with
-    tests specified by viewstotest.cpp and any extra data needed for that perticular test.
+    tests specified by viewstotest.cpp and any extra data needed for that particular test.
 
     setupWithNoTestData() fills QTest data with only the tests it is used by most tests.
 
@@ -324,7 +324,7 @@ void tst_QItemView::nonDestructiveBasicTest_data()
 }
 
 /*!
-    nonDestructiveBasicTest trys to call a number of the basic functions (not all)
+    nonDestructiveBasicTest tries to call a number of the basic functions (not all)
     to make sure the view doesn't segfault, testing the functions that makes sense.
  */
 void tst_QItemView::nonDestructiveBasicTest()
diff --git a/tests/auto/qkeysequence/tst_qkeysequence.cpp b/tests/auto/qkeysequence/tst_qkeysequence.cpp
index 517e44f743..5753fb8df4 100644
--- a/tests/auto/qkeysequence/tst_qkeysequence.cpp
+++ b/tests/auto/qkeysequence/tst_qkeysequence.cpp
@@ -291,7 +291,7 @@ void tst_QKeySequence::checkMultipleCodes()
 }
 
 /*
-* We must ensure that the keyBindings data is allways sorted
+* We must ensure that the keyBindings data is always sorted
 * so that we can safely perform binary searches.
 */
 void tst_QKeySequence::ensureSorted()
diff --git a/tests/auto/qlistview/tst_qlistview.cpp b/tests/auto/qlistview/tst_qlistview.cpp
index 383006931f..3c4b05bc0f 100644
--- a/tests/auto/qlistview/tst_qlistview.cpp
+++ b/tests/auto/qlistview/tst_qlistview.cpp
@@ -979,7 +979,7 @@ void tst_QListView::selection_data()
         << IntList();                           // expected items
 
 #if defined(Q_OS_WINCE)
-    // depending on wether the display is double-pixeld, we need
+    // depending on whether the display is double-pixeld, we need
     // to click at a different position
     bool doubledSize = false;
     int dpi = GetDeviceCaps(GetDC(0), LOGPIXELSX);
diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/qmenu/tst_qmenu.cpp
index d99df95410..d78f962107 100644
--- a/tests/auto/qmenu/tst_qmenu.cpp
+++ b/tests/auto/qmenu/tst_qmenu.cpp
@@ -306,7 +306,7 @@ void tst_QMenu::mouseActivation()
     QTest::mouseClick(&menu, Qt::LeftButton, 0, menu.rect().center(), 300);
     QVERIFY(!menu.isVisible());
 
-    //context menus can allways be accessed with right click except on windows
+    //context menus can always be accessed with right click except on windows
     menu.show();
     QTest::mouseClick(&menu, Qt::RightButton, 0, menu.rect().center(), 300);
     QVERIFY(!menu.isVisible());
diff --git a/tests/auto/qprinterinfo/tst_qprinterinfo.cpp b/tests/auto/qprinterinfo/tst_qprinterinfo.cpp
index 582fd4694e..7e5da4a6f8 100644
--- a/tests/auto/qprinterinfo/tst_qprinterinfo.cpp
+++ b/tests/auto/qprinterinfo/tst_qprinterinfo.cpp
@@ -292,7 +292,7 @@ void tst_QPrinterInfo::testForPrinters()
 
     for (int i = 0; i < sysPrinters.size(); ++i) {
         if (!qtPrinters.value(sysPrinters.at(i))) {
-            qDebug() << "Avaliable printers: " << qtPrinters;
+            qDebug() << "Available printers: " << qtPrinters;
             QFAIL(qPrintable(QString("Printer '%1' reported by system, but not reported by Qt").arg(sysPrinters.at(i))));
         }
     }
diff --git a/tests/auto/qpushbutton/tst_qpushbutton.cpp b/tests/auto/qpushbutton/tst_qpushbutton.cpp
index 8fcd1bf80b..7742f6b567 100644
--- a/tests/auto/qpushbutton/tst_qpushbutton.cpp
+++ b/tests/auto/qpushbutton/tst_qpushbutton.cpp
@@ -382,7 +382,7 @@ void tst_QPushButton::toggled()
     testWidget->toggle();
     QVERIFY( toggle_count == 0 );
 
-    // do it again, just to be shure
+    // do it again, just to be sure
     resetCounters();
     testWidget->toggle();
     QVERIFY( toggle_count == 0 );
diff --git a/tests/auto/qshortcut/tst_qshortcut.cpp b/tests/auto/qshortcut/tst_qshortcut.cpp
index 01b6b876d1..a78e8cfd27 100644
--- a/tests/auto/qshortcut/tst_qshortcut.cpp
+++ b/tests/auto/qshortcut/tst_qshortcut.cpp
@@ -1030,7 +1030,7 @@ void tst_QShortcut::context()
     other1->clear();
     other2->clear();
 
-    // edit doens't have focus, so ActiveWindow context should work
+    // edit doesn't have focus, so ActiveWindow context should work
     // ..but Focus context shouldn't..
     // Changing focus to edit should make focus context work
     // Application context should always work
diff --git a/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp b/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
index 45c6269148..edc81bc3ec 100644
--- a/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
+++ b/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
@@ -218,7 +218,7 @@ void tst_QSqlRelationalTableModel::data()
     QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
     QCOMPARE(model.data(model.index(0, 2)).toString(), QString("herr"));
 
-    //try a non-existant index
+    //try a non-existent index
     QVERIFY2(model.data(model.index(0,4)).isValid() == false,"Invalid index returned valid QVariant");
 
     //check data retrieval when relational key is a non-integer type
diff --git a/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp
index 0700e9d978..96a1f1caa5 100644
--- a/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp
+++ b/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp
@@ -1293,7 +1293,7 @@ void tst_QSqlTableModel::tableModifyWithBlank()
     QCOMPARE(model.rowCount(), 1); //verify only one entry
     QCOMPARE(model.record(0).value(0).toString(), timeString); //verify correct record
 
-    //At this point we know that the intial value (timestamp) was succsefully stored in the database
+    //At this point we know that the initial value (timestamp) was succsefully stored in the database
     //Attempt to modify the data in the new record
     //equivalent to query.exec("update test set column3="... command in direct test
     //set the data in the first column to "col1ModelData"
diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp
index 5a5bdcc574..5114b2a882 100644
--- a/tests/auto/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp
@@ -1991,9 +1991,9 @@ void tst_QSslSocket::writeBigChunk()
         qWarning() << socket->error() << socket->errorString();
         QFAIL("Error while writing! Check if the OpenSSL BIO size is limited?!");
     }
-    // also check the error string. If another error (than UnknownError) occured, it should be different than before
+    // also check the error string. If another error (than UnknownError) occurred, it should be different than before
     QVERIFY(errorBefore == errorAfter);
- 
+
     // check that everything has been written to OpenSSL
     QVERIFY(socket->bytesToWrite() == 0);
 
diff --git a/tests/auto/qtextformat/tst_qtextformat.cpp b/tests/auto/qtextformat/tst_qtextformat.cpp
index d70df6bf56..b235b112b6 100644
--- a/tests/auto/qtextformat/tst_qtextformat.cpp
+++ b/tests/auto/qtextformat/tst_qtextformat.cpp
@@ -226,7 +226,7 @@ void tst_QTextFormat::resolveFont()
     QVERIFY(fmt.font().underline());
     QVERIFY(!fmt.hasProperty(QTextFormat::FontUnderline));
 
-    // verify that deleting a non-existant property does not affect the font resolving
+    // verify that deleting a non-existent property does not affect the font resolving
 
     QVERIFY(!fmt.hasProperty(QTextFormat::BackgroundBrush));
     fmt.clearProperty(QTextFormat::BackgroundBrush);
@@ -235,7 +235,7 @@ void tst_QTextFormat::resolveFont()
     QVERIFY(!fmt.hasProperty(QTextFormat::FontUnderline));
     QVERIFY(fmt.font().underline());
 
-    // verify that deleting an existant but font _unrelated_ property does not affect the font resolving
+    // verify that deleting an existent but font _unrelated_ property does not affect the font resolving
 
     QVERIFY(fmt.hasProperty(QTextFormat::ForegroundBrush));
     fmt.clearProperty(QTextFormat::ForegroundBrush);
diff --git a/tests/auto/qtipc/qsharedmemory/src/qsystemlock.cpp b/tests/auto/qtipc/qsharedmemory/src/qsystemlock.cpp
index f50bcd2e13..b48bd7bebe 100644
--- a/tests/auto/qtipc/qsharedmemory/src/qsystemlock.cpp
+++ b/tests/auto/qtipc/qsharedmemory/src/qsystemlock.cpp
@@ -124,7 +124,7 @@
         systemLock.unlock();
     }
 
-    If this is called from two seperate processes the resulting log file is
+    If this is called from two separate processes the resulting log file is
     guaranteed to contain both lines.
 
     When you call lock(), other threads or processes that try to call lock()
diff --git a/tests/auto/qudpsocket/tst_qudpsocket.cpp b/tests/auto/qudpsocket/tst_qudpsocket.cpp
index a38082e7a5..beac0e8ccf 100644
--- a/tests/auto/qudpsocket/tst_qudpsocket.cpp
+++ b/tests/auto/qudpsocket/tst_qudpsocket.cpp
@@ -708,7 +708,7 @@ void tst_QUdpSocket::bindMode()
     // Depending on the user's privileges, this or will succeed or
     // fail. Admins are allowed to reuse the address, but nobody else.
     if (!socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint), socket2.errorString().toLatin1().constData())
-        qWarning("Failed to bind with QUdpSocket::ReuseAddressHint, user isn't an adminstrator?");
+        qWarning("Failed to bind with QUdpSocket::ReuseAddressHint, user isn't an administrator?");
     socket.close();
     QVERIFY2(socket.bind(0, QUdpSocket::ShareAddress), socket.errorString().toLatin1().constData());
     QVERIFY(!socket2.bind(socket.localPort()));