diff options
| -rw-r--r-- | doc/src/examples/widgets/mousebuttons.qdoc | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qsimd.cpp | 2 | ||||
| -rw-r--r-- | src/gui/doc/examples/analogclockwindow.qdoc | 2 | ||||
| -rw-r--r-- | src/gui/doc/examples/rasterwindow.qdoc | 2 | ||||
| -rw-r--r-- | src/platformsupport/linuxaccessibility/atspiadaptor.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/qnx/qqnxintegration.cpp | 4 | ||||
| -rw-r--r-- | src/testlib/doc/src/qttestlib-manual.qdoc | 2 | ||||
| -rw-r--r-- | src/tools/qdoc/doc/examples/componentset/ProgressBar.qml | 2 | ||||
| -rw-r--r-- | src/tools/qdoc/doc/qdoc-manual.qdoc | 4 | ||||
| -rw-r--r-- | src/xml/doc/src/xml-processing.qdoc | 6 | ||||
| -rw-r--r-- | tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp | 2 |
11 files changed, 15 insertions, 15 deletions
diff --git a/doc/src/examples/widgets/mousebuttons.qdoc b/doc/src/examples/widgets/mousebuttons.qdoc index bf63cd5076..c495698a29 100644 --- a/doc/src/examples/widgets/mousebuttons.qdoc +++ b/doc/src/examples/widgets/mousebuttons.qdoc @@ -37,7 +37,7 @@ Many 'gamer' mouse devices are configured with high-numbered "buttons" sending text shortcuts for certain games. With such a mouse, no mouse button events occur: The "mouse" sends keystrokes, and the - 'Mouse Button Tester' Window will not see the event. Receving no event, + 'Mouse Button Tester' Window will not see the event. Receiving no event, it will not repaint the Window with new text describing a \button event. And so, in addition to it's use as Qt example code, the program may be diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp index 244ed2ef75..dd57c1a7e0 100644 --- a/src/corelib/tools/qsimd.cpp +++ b/src/corelib/tools/qsimd.cpp @@ -390,7 +390,7 @@ void qDetectCpuFeatures() // For that reason, simply forego the CPUID check at all and return the set // of features that we found at compile time, through the #defines from the // compiler. This should at least allow code to execute, even if none of - // the specialised code found in QtGui and elsewhere will ever be enabled + // the specialized code found in QtGui and elsewhere will ever be enabled // (it's the user's fault for using a broken compiler). // // This also disables the runtime checking that the processor actually diff --git a/src/gui/doc/examples/analogclockwindow.qdoc b/src/gui/doc/examples/analogclockwindow.qdoc index 0fdad483c6..17db0511f8 100644 --- a/src/gui/doc/examples/analogclockwindow.qdoc +++ b/src/gui/doc/examples/analogclockwindow.qdoc @@ -51,7 +51,7 @@ \snippet gui/analogclock/main.cpp 6 - We set a title on the window and resize to a resonable size. Then + We set a title on the window and resize to a reasonable size. Then we start a timer which we will use to redraw the clock every second. diff --git a/src/gui/doc/examples/rasterwindow.qdoc b/src/gui/doc/examples/rasterwindow.qdoc index fd69d6d9f9..d78f003b40 100644 --- a/src/gui/doc/examples/rasterwindow.qdoc +++ b/src/gui/doc/examples/rasterwindow.qdoc @@ -78,7 +78,7 @@ create the window in the windowing system. Without calling create, the window will not get events and will not be visible in the windowing system. The call to create does not show the window. We - then set the geometry to be something resonable. + then set the geometry to be something reasonable. Then we create the backingstore and pass it the window instance it is supposed to manage. diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp index f9aedb4d61..28a18cb00c 100644 --- a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp +++ b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp @@ -60,7 +60,7 @@ \brief AtSpiAdaptor is the main class to forward between QAccessibleInterface and AT-SPI DBus AtSpiAdaptor implements the functions specified in all at-spi interfaces. - It sends notifications comming from Qt via dbus and listens to incoming dbus requests. + It sends notifications coming from Qt via dbus and listens to incoming dbus requests. */ QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/qnx/qqnxintegration.cpp b/src/plugins/platforms/qnx/qqnxintegration.cpp index 8789a608ff..b988020293 100644 --- a/src/plugins/platforms/qnx/qqnxintegration.cpp +++ b/src/plugins/platforms/qnx/qqnxintegration.cpp @@ -135,7 +135,7 @@ QQnxIntegration::QQnxIntegration() qFatal("QQnx: failed to connect to composition manager, errno=%d", errno); } - // Not on BlackBerry, it has specialised event dispatcher which also handles navigator events + // Not on BlackBerry, it has specialized event dispatcher which also handles navigator events #if !defined(Q_OS_BLACKBERRY) && defined(QQNX_PPS) // Create/start navigator event notifier m_navigatorEventNotifier = new QQnxNavigatorEventNotifier(m_navigatorEventHandler); @@ -156,7 +156,7 @@ QQnxIntegration::QQnxIntegration() m_screenEventThread->start(); #endif - // Not on BlackBerry, it has specialised event dispatcher which also handles virtual keyboard events + // Not on BlackBerry, it has specialized event dispatcher which also handles virtual keyboard events #if !defined(Q_OS_BLACKBERRY) && defined(QQNX_PPS) // Create/start the keyboard class. m_virtualKeyboard = new QQnxVirtualKeyboardPps(); diff --git a/src/testlib/doc/src/qttestlib-manual.qdoc b/src/testlib/doc/src/qttestlib-manual.qdoc index 1c1d8ecb3a..e06fb05a0c 100644 --- a/src/testlib/doc/src/qttestlib-manual.qdoc +++ b/src/testlib/doc/src/qttestlib-manual.qdoc @@ -305,7 +305,7 @@ \table \header \li Name - \li Commmand-line Argument + \li Command-line Argument \li Availability \row \li Walltime \li (default) diff --git a/src/tools/qdoc/doc/examples/componentset/ProgressBar.qml b/src/tools/qdoc/doc/examples/componentset/ProgressBar.qml index e3867e9783..8b1cdf1d6d 100644 --- a/src/tools/qdoc/doc/examples/componentset/ProgressBar.qml +++ b/src/tools/qdoc/doc/examples/componentset/ProgressBar.qml @@ -56,7 +56,7 @@ Item { id: progressbar /*! - The minumum value of the ProgressBar range. + The minimum value of the ProgressBar range. The \l value must not be less than this value. */ property int minimum: 0 diff --git a/src/tools/qdoc/doc/qdoc-manual.qdoc b/src/tools/qdoc/doc/qdoc-manual.qdoc index c29d0c895d..d995ffeb90 100644 --- a/src/tools/qdoc/doc/qdoc-manual.qdoc +++ b/src/tools/qdoc/doc/qdoc-manual.qdoc @@ -3398,7 +3398,7 @@ \target legalese-command \section1 \\legalese - The \\legalese and \\endlegalese commands delimit a licence agreement. + The \\legalese and \\endlegalese commands delimit a license agreement. In the generated HTML, the delimited text is surrounded by a \b {<div class="LegaleseLeft">} and \b {</div>} tags. @@ -8709,7 +8709,7 @@ */ /*! - \page 27-qdoc-commmands-alphabetical.html + \page 27-qdoc-commands-alphabetical.html \previouspage Introduction to QDoc \contentspage Table of Contents \nextpage Topic Commands diff --git a/src/xml/doc/src/xml-processing.qdoc b/src/xml/doc/src/xml-processing.qdoc index 56fa93990f..a131b60f89 100644 --- a/src/xml/doc/src/xml-processing.qdoc +++ b/src/xml/doc/src/xml-processing.qdoc @@ -172,7 +172,7 @@ \endlist With the Qt XML classes elements and attributes can be accessed in two - ways: either by refering to their qualified names consisting of the + ways: either by referring to their qualified names consisting of the namespace prefix and the "real" name (or \e local name) or by the combination of local name and namespace URI. @@ -191,7 +191,7 @@ \li A \e {namespace prefix} in a qualified name is the part to the left of the ":". (\e book is the namespace prefix in \e book:title.) - \li The \e {local part} of a name (also refered to as the \e {local + \li The \e {local part} of a name (also referred to as the \e {local name}) appears to the right of the ":". (Thus \e title is the local part of \e book:title.) \li The \e {namespace URI} ("Uniform Resource Identifier") is a unique @@ -254,7 +254,7 @@ The pendent to QXmlStreamReader is QXmlStreamWriter, which provides an XML writer with a simple streaming API. QXmlStreamWriter operates on a - QIODevice and has specialised functions for all XML tokens or events you + QIODevice and has specialized functions for all XML tokens or events you want to write, such as \l{QXmlStreamWriter::writeDTD()}{writeDTD()}, \l{QXmlStreamWriter::writeCharacters()}{writeCharacters()}, \l{QXmlStreamWriter::writeComment()}{writeComment()} and so on. diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp index 8807195277..c0dc3e1b52 100644 --- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp @@ -1152,7 +1152,7 @@ void tst_QLocalSocket::verifyListenWithDescriptor_data() QTest::newRow("absrtact") << QString::fromLatin1("abstractsocketname") << true << true; QTest::newRow("abstractwithslash") << QString::fromLatin1("abstractsocketwitha/inthename") << true << true; #endif - QTest::newRow("no path") << QString::fromLatin1("/invalid/no path name speficied") << true << false; + QTest::newRow("no path") << QString::fromLatin1("/invalid/no path name specified") << true << false; #endif |