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

34 files changed, 125 insertions, 216 deletions

diff --git a/dist/changes-4.8.0 b/dist/changes-4.8.0
index be67901..f10258a 100644
--- a/dist/changes-4.8.0
+++ b/dist/changes-4.8.0
@@ -65,6 +65,7 @@ QtGui
  - Deprecate qGenericMatrixFromMatrix4x4 and qGenericMatrixToMatrix4x4
  - QListView diverses optimisations [QTBUG-11438]
  - QTreeWidget/QListWidget: use localeAwareCompare for string comparisons [QTBUG-10839]
+ - Fixed a rare race condition when showing toplevel windows on X11
 
 QtNetwork
 ---------
@@ -88,6 +89,7 @@ QtNetwork
    OpenGL/ES 2.0 API.
  - Including <QtOpenGL> will not work in combination with GLEW, as
    QGLFunctions will undefine GLEW's defines.
+ - Optimize behavior of QGLTextureCache
 
 QtScript
 --------
@@ -105,6 +107,7 @@ QtScript
 
 Qt for Linux/X11
 ----------------
+ - Added experimental support for armCC
 
 
 Qt for Windows
@@ -119,6 +122,8 @@ Qt for Embedded Linux
 ---------------------
  - Added support for QNX 6.5 with multi-process support, and much improved mouse,
    keyboard and screen drivers.
+ - Improved support for INTEGRITY RTOS
+ - Allow hard-coding the temp path in mkspecs (QT_UNIX_TEMP_PATH_OVERRIDE define)
 
 Qt for Symbian
 --------------
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 88618c3..67dbadb 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -2939,7 +2939,7 @@ bool QObject::disconnect(const QObject *sender, const char *signal,
     \a receiver. Returns true if the connection is successfully broken;
     otherwise returns false.
 
-    This function provides the same posibilities like
+    This function provides the same possibilities like
     disconnect(const QObject *sender, const char *signal, const QObject *receiver, const char *method)
     but uses QMetaMethod to represent the signal and the method to be disconnected.
 
@@ -2957,7 +2957,7 @@ bool QObject::disconnect(const QObject *sender, const char *signal,
 
     QMetaMethod() may be used as wildcard in the meaning "any signal" or "any slot in receiving object".
     In the same way 0 can be used for \a receiver in the meaning "any receiving object". In this case
-    method shoud also be QMetaMethod(). \a sender parameter should be never 0.
+    method should also be QMetaMethod(). \a sender parameter should be never 0.
 
     \sa disconnect(const QObject *sender, const char *signal, const QObject *receiver, const char *method)
  */
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 5a566d1..435e12a 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -2737,7 +2737,7 @@ QRectF QPainter::clipBoundingRect() const
     }
 
     // Accumulate the bounding box in device space. This is not 100%
-    // precise, but it fits within the guarantee and it is resonably
+    // precise, but it fits within the guarantee and it is reasonably
     // fast.
     QRectF bounds;
     for (int i=0; i<d->state->clipInfo.size(); ++i) {
diff --git a/src/gui/text/qfontengine_qpf.cpp b/src/gui/text/qfontengine_qpf.cpp
index 4c1045e..30a1623 100644
--- a/src/gui/text/qfontengine_qpf.cpp
+++ b/src/gui/text/qfontengine_qpf.cpp
@@ -251,8 +251,8 @@ QList<QByteArray> QFontEngineQPF::cleanUpAfterClientCrash(const QList<int> &cras
 {
     QList<QByteArray> removedFonts;
     QDir dir(qws_fontCacheDir(), QLatin1String("*.qsf"));
-    for (int i = 0; i < int(dir.count()); ++i) {
-        const QByteArray fileName = QFile::encodeName(dir.absoluteFilePath(dir[i]));
+    foreach (const QFileInfo &fi, dir.entryInfoList()) {
+        const QByteArray fileName = QFile::encodeName(fi.absoluteFilePath());
 
         int fd = QT_OPEN(fileName.constData(), O_RDONLY, 0);
         if (fd >= 0) {
@@ -342,14 +342,14 @@ QFontEngineQPF::QFontEngineQPF(const QFontDef &def, int fileDescriptor, QFontEng
                 fd = QT_OPEN(encodedFileName, O_RDONLY);
                 if (fd == -1) {
 #if defined(DEBUG_FONTENGINE)
-                    qErrnoWarning("QFontEngineQPF: unable to open %s", encodedName.constData());
+                    qErrnoWarning("QFontEngineQPF: unable to open %s", encodedFileName.constData());
 #endif
                     return;
                 }
             }
             if (fd == -1) {
 #if defined(DEBUG_FONTENGINE)
-                qWarning("QFontEngineQPF: insufficient access rights to %s", encodedName.constData());
+                qWarning("QFontEngineQPF: insufficient access rights to %s", encodedFileName.constData());
 #endif
                 return;
             }
@@ -361,7 +361,7 @@ QFontEngineQPF::QFontEngineQPF(const QFontDef &def, int fileDescriptor, QFontEng
                 fd = QT_OPEN(encodedFileName, O_RDWR | O_EXCL | O_CREAT, 0644);
                 if (fd == -1) {
 #if defined(DEBUG_FONTENGINE)
-                    qErrnoWarning(errno, "QFontEngineQPF: open() failed for %s", encodedName.constData());
+                    qErrnoWarning(errno, "QFontEngineQPF: open() failed for %s", encodedFileName.constData());
 #endif
                     return;
                 }
@@ -374,7 +374,7 @@ QFontEngineQPF::QFontEngineQPF(const QFontDef &def, int fileDescriptor, QFontEng
                 const QByteArray &data = buffer.data();
                 if (QT_WRITE(fd, data.constData(), data.size()) == -1) {
 #if defined(DEBUG_FONTENGINE)
-                    qErrnoWarning(errno, "QFontEngineQPF: write() failed for %s", encodedName.constData());
+                    qErrnoWarning(errno, "QFontEngineQPF: write() failed for %s", encodedFileName.constData());
 #endif
                     return;
                 }
diff --git a/src/gui/text/qfontengine_qws.cpp b/src/gui/text/qfontengine_qws.cpp
index 4c6dff2..237842b 100644
--- a/src/gui/text/qfontengine_qws.cpp
+++ b/src/gui/text/qfontengine_qws.cpp
@@ -40,7 +40,6 @@
 ****************************************************************************/
 
 #include "qfontengine_p.h"
-#include <private/qunicodetables_p.h>
 #include <qwsdisplay_qws.h>
 #include <qvarlengtharray.h>
 #include <private/qpainter_p.h>
@@ -51,15 +50,17 @@
 
 #include <qdebug.h>
 
-
 #ifndef QT_NO_QWS_QPF
 
+#include "qplatformdefs.h"
 #include "qfile.h"
-#include "qdir.h"
 
-#define QT_USE_MMAP
 #include <stdlib.h>
 
+#if !defined(Q_OS_INTEGRITY)
+#define QT_USE_MMAP
+#endif
+
 #ifdef QT_USE_MMAP
 // for mmap
 #include <unistd.h>
@@ -69,22 +70,17 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#  if defined(QT_LINUXBASE) && !defined(MAP_FILE)
-     // LSB 3.2 does not define MAP_FILE
-#    define MAP_FILE 0
-#  endif
-
+#ifndef MAP_FILE
+#  define MAP_FILE 0
+#endif
+#ifndef MAP_FAILED
+#  define MAP_FAILED (void *)-1
 #endif
 
-#endif // QT_NO_QWS_QPF
+#endif // QT_USE_MMAP
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_QWS_QPF
-QT_BEGIN_INCLUDE_NAMESPACE
-#include "qplatformdefs.h"
-QT_END_INCLUDE_NAMESPACE
-
 static inline unsigned int getChar(const QChar *str, int &i, const int len)
 {
     unsigned int uc = str[i].unicode();
@@ -161,17 +157,10 @@ public:
     QPFGlyphTree* more;
     QPFGlyph* glyph;
 public:
-#ifdef QT_USE_MMAP
     QPFGlyphTree(uchar*& data)
     {
         read(data);
     }
-#else
-    QPFGlyphTree(QIODevice& f)
-    {
-        read(f);
-    }
-#endif
 
     ~QPFGlyphTree()
     {
@@ -237,7 +226,6 @@ private:
     {
     }
 
-#ifdef QT_USE_MMAP
     void read(uchar*& data)
     {
         // All node data first
@@ -247,19 +235,7 @@ private:
         // Then all video data
         readData(data);
     }
-#else
-    void read(QIODevice& f)
-    {
-        // All node data first
-        readNode(f);
-        // Then all non-video data
-        readMetrics(f);
-        // Then all video data
-        readData(f);
-    }
-#endif
 
-#ifdef QT_USE_MMAP
     void readNode(uchar*& data)
     {
         uchar rw = *data++;
@@ -285,38 +261,7 @@ private:
         if ( more )
             more->readNode(data);
     }
-#else
-    void readNode(QIODevice& f)
-    {
-        char rw;
-        char cl;
-        f.getChar(&rw);
-        f.getChar(&cl);
-        min = (rw << 8) | cl;
-        f.getChar(&rw);
-        f.getChar(&cl);
-        max = (rw << 8) | cl;
-        char flags;
-        f.getChar(&flags);
-        if ( flags & 1 )
-            less = new QPFGlyphTree;
-        else
-            less = 0;
-        if ( flags & 2 )
-            more = new QPFGlyphTree;
-        else
-            more = 0;
-        int n = max-min+1;
-        glyph = new QPFGlyph[n];
-
-        if ( less )
-            less->readNode(f);
-        if ( more )
-            more->readNode(f);
-    }
-#endif
 
-#ifdef QT_USE_MMAP
     void readMetrics(uchar*& data)
     {
         int n = max-min+1;
@@ -329,22 +274,7 @@ private:
         if ( more )
             more->readMetrics(data);
     }
-#else
-    void readMetrics(QIODevice& f)
-    {
-        int n = max-min+1;
-        for (int i=0; i<n; i++) {
-            glyph[i].metrics = new QPFGlyphMetrics;
-            f.read((char*)glyph[i].metrics, sizeof(QPFGlyphMetrics));
-        }
-        if ( less )
-            less->readMetrics(f);
-        if ( more )
-            more->readMetrics(f);
-    }
-#endif
 
-#ifdef QT_USE_MMAP
     void readData(uchar*& data)
     {
         int n = max-min+1;
@@ -359,24 +289,6 @@ private:
         if ( more )
             more->readData(data);
     }
-#else
-    void readData(QIODevice& f)
-    {
-        int n = max-min+1;
-        for (int i=0; i<n; i++) {
-            QSize s( glyph[i].metrics->width, glyph[i].metrics->height );
-            //############### s = qt_screen->mapToDevice( s );
-            uint datasize = glyph[i].metrics->linestep * s.height();
-            glyph[i].data = new uchar[datasize]; // ### deleted?
-            f.read((char*)glyph[i].data, datasize);
-        }
-        if ( less )
-            less->readData(f);
-        if ( more )
-            more->readData(f);
-    }
-#endif
-
 };
 
 class QFontEngineQPF1Data
@@ -384,73 +296,58 @@ class QFontEngineQPF1Data
 public:
     QPFFontMetrics fm;
     QPFGlyphTree *tree;
-    void *mmapStart;
+    uchar *mmapStart;
     size_t mmapLength;
-};
-
-#if defined(Q_OS_INTEGRITY)
-static void *qt_mmap(void *start, size_t length, int /*prot*/, int /*flags*/, int fd, off_t offset)
-{
-    // INTEGRITY cannot mmap local files - load it into a local buffer
-    if (::lseek(fd, offset, SEEK_SET) == -1) {
-#  if defined(DEBUG_FONTENGINE)
-        perror("lseek failed");
-#  endif
-    }
-    void *buf = malloc(length);
-    if (::read(fd, buf, length) != (ssize_t)length) {
-#  if defined(DEBUG_FONTENGINE)
-        perror("read failed");
-#  endif
-    }
-
-    return buf;
-}
-#else
-static inline void *qt_mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset)
-{
-    return mmap(start, length, prot, flags, fd, offset);
-}
+#ifdef QT_USE_MMAP
+    bool used_mmap;
 #endif
-
-
+};
 
 QFontEngineQPF1::QFontEngineQPF1(const QFontDef&, const QString &fn)
 {
     cache_cost = 1;
 
-    int f = QT_OPEN( QFile::encodeName(fn), O_RDONLY, 0);
-    Q_ASSERT(f>=0);
+    int fd = QT_OPEN(QFile::encodeName(fn).constData(), O_RDONLY, 0);
+    if (fd == -1)
+        qFatal("Failed to open '%s'", QFile::encodeName(fn).constData());
+
     QT_STATBUF st;
-    if ( QT_FSTAT( f, &st ) )
-        qFatal("Failed to stat %s",QFile::encodeName(fn).data());
-    uchar* data = (uchar*)qt_mmap( 0, // any address
-                                st.st_size, // whole file
-                                PROT_READ, // read-only memory
-#if defined(Q_OS_INTEGRITY)
-	                        0,
-#elif !defined(Q_OS_SOLARIS) && !defined(Q_OS_QNX4) && !defined(Q_OS_VXWORKS)
-                                MAP_FILE | MAP_PRIVATE, // swap-backed map from file
-#else
-                                MAP_PRIVATE,
-#endif
-                                f, 0 ); // from offset 0 of f
-#if !defined(MAP_FAILED) && (defined(Q_OS_QNX4) || defined(Q_OS_INTEGRITY))
-#define MAP_FAILED ((void *)-1)
-#endif
-    if ( !data || data == (uchar*)MAP_FAILED )
-        qFatal("Failed to mmap %s",QFile::encodeName(fn).data());
-    QT_CLOSE(f);
+    if (QT_FSTAT(fd, &st) != 0)
+        qFatal("Failed to stat '%s'", QFile::encodeName(fn).constData());
 
     d = new QFontEngineQPF1Data;
-    d->mmapStart = data;
+    d->mmapStart = 0;
     d->mmapLength = st.st_size;
-    memcpy(reinterpret_cast<char*>(&d->fm),data,sizeof(d->fm));
 
-    data += sizeof(d->fm);
-    d->tree = new QPFGlyphTree(data);
-    glyphFormat = (d->fm.flags & FM_SMOOTH) ? QFontEngineGlyphCache::Raster_A8
-                  : QFontEngineGlyphCache::Raster_Mono;
+#ifdef QT_USE_MMAP
+    d->used_mmap = true;
+    d->mmapStart = (uchar *)::mmap(0, st.st_size,             // any address, whole file
+                                   PROT_READ,                 // read-only memory
+                                   MAP_FILE | MAP_PRIVATE,    // swap-backed map from file
+                                   fd, 0);                   // from offset 0 of fd
+    if (d->mmapStart == (uchar *)MAP_FAILED)
+        d->mmapStart = 0;
+#endif
+
+    if (!d->mmapStart) {
+#ifdef QT_USE_MMAP
+        d->used_mmap = false;
+#endif
+        d->mmapStart = new uchar[d->mmapLength];
+        if (QT_READ(fd, d->mmapStart, d->mmapLength) != d->mmapLength)
+            qFatal("Failed to read '%s'", QFile::encodeName(fn).constData());
+    }
+    QT_CLOSE(fd);
+
+    if (d->mmapStart) {
+        uchar* data = d->mmapStart;
+
+        memcpy(reinterpret_cast<char*>(&d->fm), data, sizeof(d->fm));
+        data += sizeof(d->fm);
+
+        d->tree = new QPFGlyphTree(data);
+        glyphFormat = (d->fm.flags & FM_SMOOTH) ? QFontEngineGlyphCache::Raster_A8
+                                                : QFontEngineGlyphCache::Raster_Mono;
 #if 0
     qDebug() << "font file" << fn
              << "ascent" << d->fm.ascent << "descent" << d->fm.descent
@@ -462,12 +359,19 @@ QFontEngineQPF1::QFontEngineQPF1(const QFontDef&, const QString &fn)
              << "underlinepos" << d->fm.underlinepos
              << "underlinewidth" << d->fm.underlinewidth;
 #endif
+    }
 }
 
 QFontEngineQPF1::~QFontEngineQPF1()
 {
-    if (d->mmapStart)
-        munmap(d->mmapStart, d->mmapLength);
+    if (d->mmapStart) {
+#if defined(QT_USE_MMAP)
+        if (d->used_mmap)
+            ::munmap(d->mmapStart, d->mmapLength);
+        else
+#endif
+            delete [] d->mmapStart;
+    }
     delete d->tree;
     delete d;
 }
diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp
index f16a6f7..ebac64e 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 e87a3e7..24f9368 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 70f0623..6b2f0d6 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 7cfdfdc..e85376c 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 8a28938..3e60cfd 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 79cb362..997f9a5 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 9889aae..5488559 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 7e47c27..94981cf 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 86d5f24..6a51bf4 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 bcc205e..3250c77 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 7e431cf..b6b81cb 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 66a9e47..4f21bb5 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 5260a1a..1df9d38 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 2fa5e76..9ed1190 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 4bdfadd..191e9e8 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 1f43568..b957f73 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 517e44f..5753fb8 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 3830069..3c4b05b 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 d99df95..d78f962 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 582fd46..7e5da4a 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 8fcd1bf..7742f6b 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 01b6b87..a78e8cf 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 45c6269..edc81bc 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 0700e9d..96a1f1c 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 5a5bdcc..5114b2a 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 d70df6b..b235b11 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 f50bcd2..b48bd7b 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 a38082e..beac0e8 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()));
diff --git a/tools/linguist/tests/tst_lupdate.cpp b/tools/linguist/tests/tst_lupdate.cpp
index eb6e865..21d83ef 100644
--- a/tools/linguist/tests/tst_lupdate.cpp
+++ b/tools/linguist/tests/tst_lupdate.cpp
@@ -118,7 +118,7 @@ void tst_linguist::fetchtr()
     //qDebug() << "resname:" << resname;
     ////qDebug() << "resfile:" << resfile;
     //qDebug() << "resline:" << resline;
-    //qDebug() << "ressource:" << ressrc;
+    //qDebug() << "resource:" << ressrc;
 
     QCOMPARE(src + ":    " + resname, src + ":    " + name);
     QCOMPARE(src + ":    " + resline, src + ":    " + line);