Merge remote-tracking branch 'qt-qa-review/master'

14 files changed, 17 insertions, 17 deletions

diff --git a/demos/mobile/quickhit/ga_src/GEInterfaces.h b/demos/mobile/quickhit/ga_src/GEInterfaces.h
index 7abd984..059e5b3 100644
--- a/demos/mobile/quickhit/ga_src/GEInterfaces.h
+++ b/demos/mobile/quickhit/ga_src/GEInterfaces.h
@@ -57,7 +57,7 @@ namespace GE {
         virtual int pullAudio( AUDIO_SAMPLE_TYPE *target, int bufferLength ) = 0;
         virtual bool canBeDestroyed() { return false; }
 
-        IAudioSource *m_next;                // for listing, do not touch if you dont know what you are doing.
+        IAudioSource *m_next;                // for listing, do not touch if you don't know what you are doing.
     };
 
 
diff --git a/demos/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp b/demos/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp
index fe1d424..59e21a8 100644
--- a/demos/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp
+++ b/demos/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp
@@ -231,7 +231,7 @@ void	ClockCycleCounter::compute_measure_time_total ()
 Name: compute_measure_time_lap
 Description:
 	Computes the duration of one stop_lap() call and store it. It will be used
-	later to get the real duration of the measured operation (by substracting
+	later to get the real duration of the measured operation (by subtracting
 	the measurement duration).
 Throws: Nothing
 ==============================================================================
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
index f1ed8e4..e0e2b8d 100644
--- a/src/corelib/plugin/qlibrary.cpp
+++ b/src/corelib/plugin/qlibrary.cpp
@@ -789,7 +789,7 @@ bool QLibraryPrivate::isPlugin(QSettings *settings)
                     // An exception was thrown when calling qt_plugin_query_verification_data().
                     // This usually happens when plugin is compiled with the /clr compiler flag,
                     // & will only work if the dependencies are loaded & DLLMain() is called.
-                    // LoadLibrary() will do this, try once with this & if it fails dont load.
+                    // LoadLibrary() will do this, try once with this & if it fails don't load.
                     retryLoadLibrary = !retryLoadLibrary;
                 }
 #endif
diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp
index 6fbb59f..d79be41 100644
--- a/src/gui/painting/qbackingstore.cpp
+++ b/src/gui/painting/qbackingstore.cpp
@@ -1625,7 +1625,7 @@ void QWidgetPrivate::repaint_sys(const QRegion &rgn)
         extra->staticContentsSize = data.crect.size();
     }
 
-#ifdef Q_WS_QPA //Dont even call q->p
+#ifdef Q_WS_QPA //Don't even call q->p
     QPaintEngine *engine = 0;
 #else
     QPaintEngine *engine = q->paintEngine();
diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp
index 518c860..b31833a 100644
--- a/src/opengl/qgl_qpa.cpp
+++ b/src/opengl/qgl_qpa.cpp
@@ -404,7 +404,7 @@ QGLContext *QGLContext::fromPlatformGLContext(QPlatformGLContext *platformContex
         return reinterpret_cast<QGLContext *>(platformContext->qGLContextHandle());
     }
     QGLContext *glContext = new QGLContext(platformContext);
-    //Dont call create on context. This can cause the platformFormat to be set on the widget, which
+    //Don't call create on context. This can cause the platformFormat to be set on the widget, which
     //will cause the platformWindow to be recreated.
     return glContext;
 }
diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp
index e963f8c..a15084b 100644
--- a/src/opengl/qwindowsurface_gl.cpp
+++ b/src/opengl/qwindowsurface_gl.cpp
@@ -362,7 +362,7 @@ QGLWindowSurface::~QGLWindowSurface()
 {
     if (d_ptr->ctx)
         glDeleteTextures(1, &d_ptr->tex_id);
-#ifndef Q_WS_QPA // Dont delete the contexts. Destroying the window does that for us
+#ifndef Q_WS_QPA // Don't delete the contexts. Destroying the window does that for us
     foreach(QGLContext **ctx, d_ptr->contexts) {
         delete *ctx;
         *ctx = 0;
diff --git a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp
index 258d586..25abe17 100644
--- a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp
+++ b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp
@@ -46,7 +46,7 @@
 ** Copyright (C) 2004 immodule for Qt Project.  All rights reserved.
 **
 ** This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own
-** licence. You may use this file under your Qt license. Following
+** license. You may use this file under your Qt license. Following
 ** description is copied from their original file headers. Contact
 ** immodule-qt@freedesktop.org if any conditions of this licensing are
 ** not clear to you.
diff --git a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h
index 5d311b3..cc1b1f0 100644
--- a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h
+++ b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h
@@ -46,7 +46,7 @@
 ** Copyright (C) 2004 immodule for Qt Project.  All rights reserved.
 **
 ** This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own
-** licence. You may use this file under your Qt license. Following
+** license. You may use this file under your Qt license. Following
 ** description is copied from their original file headers. Contact
 ** immodule-qt@freedesktop.org if any conditions of this licensing are
 ** not clear to you.
diff --git a/src/plugins/platforms/openkode/qopenkodewindow.cpp b/src/plugins/platforms/openkode/qopenkodewindow.cpp
index c6fe6d0..dedd2d5 100644
--- a/src/plugins/platforms/openkode/qopenkodewindow.cpp
+++ b/src/plugins/platforms/openkode/qopenkodewindow.cpp
@@ -283,7 +283,7 @@ void QOpenKODEWindow::processKeyEvents(const KDEvent *event)
     QEvent::Type keyPressed = QEvent::KeyRelease;
     if (event->data.keyboardInputKey.flags)
         keyPressed = QEvent::KeyPress;
-//KD_KEY_LOCATION_LEFT_ATX // dont care for now
+//KD_KEY_LOCATION_LEFT_ATX // don't care for now
 //KD_KEY_LOCATION_RIGHT_ATX
 //KD_KEY_LOCATION_NUMPAD_ATX
     Qt::KeyboardModifiers mod = Qt::NoModifier;
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp
index 80a1624..4f3021e 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
@@ -59,7 +59,7 @@
 #include <X11/Xlib-xcb.h>
 #endif
 
-#ifdef XCB_USE_EGL //dont pull in eglext prototypes
+#ifdef XCB_USE_EGL //don't pull in eglext prototypes
 #include <EGL/egl.h>
 #endif
 
diff --git a/src/testlib/3rdparty/valgrind_p.h b/src/testlib/3rdparty/valgrind_p.h
index 6380a9f..70ba371 100644
--- a/src/testlib/3rdparty/valgrind_p.h
+++ b/src/testlib/3rdparty/valgrind_p.h
@@ -3703,8 +3703,8 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
 
 
 /* These requests allow control to move from the simulated CPU to the
-   real CPU, calling an arbitary function.
-   
+   real CPU, calling an arbitrary function.
+
    Note that the current ThreadId is inserted as the first argument.
    So this call:
 
diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp
index 7c7cafc..ccc6e8b 100644
--- a/src/xml/dom/qdom.cpp
+++ b/src/xml/dom/qdom.cpp
@@ -3487,10 +3487,10 @@ QDomDocumentTypePrivate::QDomDocumentTypePrivate(QDomDocumentTypePrivate* n, boo
     QDomNodePrivate* p = first;
     while (p) {
         if (p->isEntity())
-            // Dont use normal insert function since we would create infinite recursion
+            // Don't use normal insert function since we would create infinite recursion
             entities->map.insertMulti(p->nodeName(), p);
         if (p->isNotation())
-            // Dont use normal insert function since we would create infinite recursion
+            // Don't use normal insert function since we would create infinite recursion
             notations->map.insertMulti(p->nodeName(), p);
         p = p->next;
     }
@@ -5725,7 +5725,7 @@ static QByteArray encodeEntity(const QByteArray& str)
             len += 4;
             i += 5;
         } else if (d[i] == '&' && i + 1 < len && d[i+1] == '#') {
-            // Dont encode &lt; or &quot; or &custom;.
+            // Don't encode &lt; or &quot; or &custom;.
             // Only encode character references
             tmp.replace(i, 1, "&#38;");
             d = tmp;
diff --git a/tools/assistant/lib/qhelpsearchengine.cpp b/tools/assistant/lib/qhelpsearchengine.cpp
index c33fc96..65b1113 100644
--- a/tools/assistant/lib/qhelpsearchengine.cpp
+++ b/tools/assistant/lib/qhelpsearchengine.cpp
@@ -272,7 +272,7 @@ private:
     functionality to set up a proper search queries list that get's passed to the search engines
     search() function.
 
-    After the list of querys has been passed to the search engine, the signal searchingStarted()
+    After the list of queries have been passed to the search engine, the signal searchingStarted()
     is emitted and after the search has finished the searchingFinished() signal is emitted. The
     search process can be stopped by calling cancelSearching().
 
diff --git a/tools/linguist/lupdate/cpp.cpp b/tools/linguist/lupdate/cpp.cpp
index c7dd9fc..5bafd9d 100644
--- a/tools/linguist/lupdate/cpp.cpp
+++ b/tools/linguist/lupdate/cpp.cpp
@@ -283,7 +283,7 @@ private:
     bool findNamespaceCallback(const Namespace *ns, void *context) const;
     const Namespace *findNamespace(const NamespaceList &namespaces, int nsCount = -1) const;
     void enterNamespace(NamespaceList *namespaces, const HashString &name);
-    void truncateNamespaces(NamespaceList *namespaces, int lenght);
+    void truncateNamespaces(NamespaceList *namespaces, int length);
     Namespace *modifyNamespace(NamespaceList *namespaces, bool haveLast = true);
 
     enum {