summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Bennett <nicholas.bennett@qt.io>2022-08-29 12:28:25 +0300
committerDaniel Smith <Daniel.Smith@qt.io>2022-09-27 10:05:05 +0000
commit53877edfd1b4aee38305c7dca17a5bd1a3575f3b (patch)
tree1c2077b60da64fd2404e72b92698571fb46cc4b8
parent884cd0fe94179c9fe0af145d9182c665f35b1125 (diff)
downloadqtdoc-53877edfd1b4aee38305c7dca17a5bd1a3575f3b.tar.gz
Doc: Spellcheck
Mostly just simple spell check but trying to remove confusing hyphenation or world conglomeration that required a rephrase in some places. Change-Id: I57f25b7bcc4c02220e9205ce978fa0d071844dea Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 713fe3cf5344d433da16fc173f41361da54ef3d0) Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
-rw-r--r--doc/src/configure.qdoc6
-rw-r--r--doc/src/connectivity.qdoc4
-rw-r--r--doc/src/datastorage.qdoc2
-rw-r--r--doc/src/frameworks-technologies/accessible.qdoc2
-rw-r--r--doc/src/frameworks-technologies/threads.qdoc2
-rw-r--r--doc/src/frameworks-technologies/unicode.qdoc2
-rw-r--r--doc/src/frameworks-technologies/why-moc.qdoc2
-rw-r--r--doc/src/highdpi.qdoc26
-rw-r--r--doc/src/howtos/unix-signal-handlers.qdoc2
-rw-r--r--doc/src/internationalization/i18n.qdoc8
-rw-r--r--doc/src/platforms/configure-linux-device.qdoc2
-rw-r--r--doc/src/platforms/emb-linux.qdoc8
-rw-r--r--doc/src/platforms/inputs-linux-device.qdoc8
-rw-r--r--doc/src/platforms/integrity-build-monolith-app-tutorial.qdoc2
-rw-r--r--doc/src/platforms/integrity.qdoc2
-rw-r--r--doc/src/platforms/linux.qdoc4
-rw-r--r--doc/src/platforms/macos.qdoc2
-rw-r--r--doc/src/platforms/wasm.qdoc18
-rw-r--r--doc/src/platforms/windows.qdoc4
-rw-r--r--doc/src/porting.qdoc2
-rw-r--r--doc/src/qtmodules.qdoc2
-rw-r--r--doc/src/scripting.qdoc7
-rw-r--r--doc/src/signalslotsyntaxes.qdoc4
-rw-r--r--doc/src/wayland-and-qt.qdoc2
24 files changed, 61 insertions, 62 deletions
diff --git a/doc/src/configure.qdoc b/doc/src/configure.qdoc
index d9345bb9..71a19bf2 100644
--- a/doc/src/configure.qdoc
+++ b/doc/src/configure.qdoc
@@ -24,7 +24,7 @@
\section1 Configure Workflow
configure must be called in a working build environment where
- cmake, compilers, and required build tools are readily available.
+ CMake, compilers, and required build tools are readily available.
\l{Building Qt Sources} lists such dependencies per platform.
After setting up such an environment, the typical workflow is to create
@@ -158,7 +158,7 @@
\section2 Excluding Qt Modules
- configure's \b -skip option allows top-level source directories to be
+ \c configure's \b -skip option allows top-level source directories to be
excluded from the Qt build. Note that some directories contain multiple Qt
modules. For example, to exclude the Qt Wayland Compositor and the
Qt Wayland integration plugin from the Qt build, provide
@@ -297,7 +297,7 @@
standard build, and all Qt code compiles with a higher warning
level. It also changes the default prefix to the build directory, avoiding
the need to install Qt before testing things, and finally enables the
- compilation of Qt's autotests by default.
+ compilation of Qt's auto-tests by default.
\section1 Specific Options for Platforms
diff --git a/doc/src/connectivity.qdoc b/doc/src/connectivity.qdoc
index d8f0832a..f9623ded 100644
--- a/doc/src/connectivity.qdoc
+++ b/doc/src/connectivity.qdoc
@@ -7,7 +7,7 @@
\brief Qt's network and connectivity features
Qt provides classes for both high-level and low-level network communication,
-classes for web integration, and classes for interprocess communication.
+classes for web integration, and classes for inter-process communication.
For high-level network traffic, \l{Qt Network} provides an abstraction layer
over the operations used, showing only high-level classes and functions. Qt
@@ -20,7 +20,7 @@ QNetWorkProxy class.
Qt also offers functionalities for \e{inter-process communication} (IPC). The
class QProcess is used to start external programs. \l{Qt D-Bus} provides support
-for D-Bus, an interprocess communication and remoteprocedure calling mechanism.
+for D-Bus, an inter-process communication and remote procedure calling mechanism.
It mostly communicates via a central server application, called a bus. However,
it is also possible to let applications communicate directly with each other.
QSharedMemory provides access to a shared memory segment by multiple threads
diff --git a/doc/src/datastorage.qdoc b/doc/src/datastorage.qdoc
index d87f6704..66322db4 100644
--- a/doc/src/datastorage.qdoc
+++ b/doc/src/datastorage.qdoc
@@ -127,8 +127,6 @@ necessary infrastructure:
\li It can automatically format the generated XML data by adding
line-breaks and indentation, making it readable. This feature can be
turned on with the auto-formatting property.
- \li It encodes XML in UTF-8 by default. Different encodings can be enforced
- using setCodec().
\endlist
\endlist
diff --git a/doc/src/frameworks-technologies/accessible.qdoc b/doc/src/frameworks-technologies/accessible.qdoc
index 0d0cb5a1..da212460 100644
--- a/doc/src/frameworks-technologies/accessible.qdoc
+++ b/doc/src/frameworks-technologies/accessible.qdoc
@@ -666,7 +666,7 @@
accessibility tools to trigger the button, needs to have the same effect as
tapping or clicking the text.
- Wheras textual content is inherently accessible, multimedia content is not.
+ Whereas textual content is inherently accessible, multimedia content is not.
So it's important to provide necessary accessibility metadata to
multimedia content such as images, videos, and audio. Here's an example of
providing accessibility metadata to an image, which represents a pie chart:
diff --git a/doc/src/frameworks-technologies/threads.qdoc b/doc/src/frameworks-technologies/threads.qdoc
index ff9b4d78..a050e389 100644
--- a/doc/src/frameworks-technologies/threads.qdoc
+++ b/doc/src/frameworks-technologies/threads.qdoc
@@ -113,7 +113,7 @@
Creating and destroying threads frequently can be expensive. To reduce this
overhead, existing threads can be reused for new tasks. QThreadPool is a
- collection of reuseable QThreads.
+ collection of reusable QThreads.
To run code in one of a QThreadPool's threads, reimplement QRunnable::run()
and instantiate the subclassed QRunnable. Use QThreadPool::start() to put
diff --git a/doc/src/frameworks-technologies/unicode.qdoc b/doc/src/frameworks-technologies/unicode.qdoc
index 75bc7f3a..62bd37a0 100644
--- a/doc/src/frameworks-technologies/unicode.qdoc
+++ b/doc/src/frameworks-technologies/unicode.qdoc
@@ -58,7 +58,7 @@
\list
- \li Translation to/from legacy encodings for file I/O: see
+ \li Translation to/from legacy encoding for file I/O: see
QTextCodec and QTextStream.
\li Support for locale specific Input Methods and keyboards.
\li A string class, QString, that stores Unicode characters, with
diff --git a/doc/src/frameworks-technologies/why-moc.qdoc b/doc/src/frameworks-technologies/why-moc.qdoc
index 8ecd3bf6..ec2fdf47 100644
--- a/doc/src/frameworks-technologies/why-moc.qdoc
+++ b/doc/src/frameworks-technologies/why-moc.qdoc
@@ -13,7 +13,7 @@
in Qt. However, there are limitations: There are things that you can
easily express with templates, and there are things that are
impossible to express with templates. A generic vector container class
- is easily expressible, even with partial specialisation for pointer
+ is easily expressible, even with partial specialization for pointer
types, while a function that sets up a graphical user interface based
on an XML description given as a string is not expressible as a
template. And then there is a gray area in between. Things that you can
diff --git a/doc/src/highdpi.qdoc b/doc/src/highdpi.qdoc
index 0605c7ed..c611a041 100644
--- a/doc/src/highdpi.qdoc
+++ b/doc/src/highdpi.qdoc
@@ -36,7 +36,7 @@
pixel ratio of 1.0), but will cover 400x400 pixels on a high density display
(with a device pixel ratio of 2.0).
- This model applies to most units in higher level Qt Gui, Widgets, and Quick
+ This model applies to most units in higher level Qt GUI, Widgets, and Quick
APIs, including widget and item geometry, event geometry, desktop, window and
screen geometry, as well as animation velocities.
@@ -63,7 +63,7 @@
as a result do not operate in the device independent coordinate system
described earlier. A QImage of size 400x400, with a device pixel ratio
of 2.0, will fit a 200x200 QWindow on a high density (2x) display, or
- will be automatically downscaled to 200x200 during drawing if targeting
+ will be automatically down-scaled to 200x200 during drawing if targeting
a normal density (1x) display. See \l{Drawing High Resolution Versions
of Pixmaps and Images} for more details.
@@ -99,7 +99,7 @@
will produce an islands-of-screens type virtual desktop geometry.
Application code should not assume that positions immediately adjacent to and
- outside one screen is a valid position on the neighbouring screen. Instead,
+ outside one screen is a valid position on the neighboring screen. Instead,
get the screen list using QGuiApplication::screens() and use that list to reason
about available screen geometry.
@@ -171,12 +171,12 @@
either global logical DPI or per-screen physical DPI. Neither of these are exactly what Qt
needs, which can make DPI configuration on X11 more complicated than on other platforms.
- Desktops environments such as Ubuntu and Kubntu implement workardounds for the lack of logical
+ Desktops environments such as Ubuntu and Kubntu implement workarounds for the lack of logical
DPI, and provide easily configurable high-DPI support. If you instead want to configure
X11 DPI settings manually then this section describes which X11 settings Qt reads.
Some X11 configuration workflows involves overriding the reported physical size of the
- screen in order to make DPI calculations yield a spesific DPI value. Qt supports this
+ screen in order to make DPI calculations yield a specific DPI value. Qt supports this
workflow, but this requires opting in, as described below.
The exact configuration priority is as follows, where Qt uses the first option available.
@@ -198,8 +198,8 @@
\row
\li 3. RandR physical DPI
[Qt 5 Only]
- \li DPI calculated from per-screen physical size and pixel size, as reported by randr.
- specifically, the mwidth and mheight fields of the xcb_randr_screen_change_notify_event_t
+ \li DPI calculated from per-screen physical size and pixel size, as reported by \c randr.
+ specifically, the \c mwidth and \c mheight fields of the \c xcb_randr_screen_change_notify_event_t
structure is used. The DPI will be rounded to an integer and clamped to be not less than 96.
\row
\li 4. 96 DPI
@@ -209,20 +209,20 @@
The QT_USE_PHYSICAL_DPI override
Set QT_USE_PHYSICAL_DPI=1 to make Qt use RandR physical DPI unconditionally; specifically
- the mwidth and mheight fields of the xcb_randr_screen_change_notify_event_t structure is used.
+ the \c mwidth and \c mheight fields of the xcb_randr_screen_change_notify_event_t structure is used.
The DPI value will be rounded to an integer.
\section3 Configuring Windows
- Qt uses the Windows display scale settings automatically; no spesific settings are required.
+ Qt uses the Windows display scale settings automatically; no specific settings are required.
For example, if a display is configured for 175% scale then Qt apps will see a device pixel
ratio of 1.75 on that screen.
Windows defines several\l{https://docs.microsoft.com/en-us/windows/win32/hidpi/high-dpi-desktop-application-development-on-windows}
{DPI Awareness} levels, which applications set in order to
- opt-in to high-DPI featuers. Qt 6 is Per-Monitor DPI Aware V2 by default. If you are
+ opt-in to high-DPI features. Qt 6 is Per-Monitor DPI Aware V2 by default. If you are
incorporating code which assumes a single global DPI then you might want to set a different
- awarness level. This can be done by adding an entry to qt.conf:
+ awareness level. This can be done by adding an entry to qt.conf:
\badcode
[Platforms]
@@ -275,7 +275,7 @@
In alphabetical order:
\list
- \li QT_ENABLE_HIGHDPI_SCALING Set to 0 to disable high-dpi scaling; effectivly reverting
+ \li QT_ENABLE_HIGHDPI_SCALING Set to 0 to disable high-dpi scaling; effectively reverting
to Qt 5 default behavior. Note that this has no effect on platforms such as Wayland
or macOS - it does not disable any native high-DPI support. This variable is intended
for testing purposes only, and we do not recommend setting it on a permanent basis.
@@ -314,7 +314,7 @@
\li Native Pixels This is the coordinate system used by the native API, such as Win32 or Cocoa (macOS).
Depending on platform and screen configuration, native pixels may be equivalent to device
- independent or device pxiels.
+ independent or device pixels.
\endlist
*/
diff --git a/doc/src/howtos/unix-signal-handlers.qdoc b/doc/src/howtos/unix-signal-handlers.qdoc
index 2535854e..31dc3661 100644
--- a/doc/src/howtos/unix-signal-handlers.qdoc
+++ b/doc/src/howtos/unix-signal-handlers.qdoc
@@ -60,7 +60,7 @@
In the slot functions connected to the
QSocketNotifier::activated() signals, you \e read the byte. Now
you are safely back in Qt with your signal, and you can do all the
- Qt stuff you weren'tr allowed to do in the Unix signal handler.
+ Qt stuff you were not allowed to do in the Unix signal handler.
\snippet snippets/code/doc_src_unix-signal-handlers.cpp 4
*/
diff --git a/doc/src/internationalization/i18n.qdoc b/doc/src/internationalization/i18n.qdoc
index 00865cd4..9c827c4b 100644
--- a/doc/src/internationalization/i18n.qdoc
+++ b/doc/src/internationalization/i18n.qdoc
@@ -45,7 +45,7 @@
application usable by Japanese users, or a Korean application usable
by German users, will require that the software operate not only in
different languages, but use different input techniques, character
- encodings and presentation conventions.
+ encoding and presentation conventions.
Qt tries to make internationalization as painless as possible for
developers. All input controls and text drawing methods in Qt offer
@@ -181,7 +181,7 @@
The Qt translation catalogs are located in the \c qttranslations repository.
\warning Qt translations are contributed by the Qt community, and provided
- without any guarantees. Translations migh be missing, outdated, or entirely
+ without any guarantees. Translations might be missing, outdated, or entirely
incorrect, up to the point of being malicious. It is recommended that you
audit any translations you ship.
@@ -265,7 +265,7 @@
preserves Unicode information while looking like plain ASCII if the text
is wholly ASCII.
- For converting Unicode to local 8-bit encodings, a shortcut is
+ For converting Unicode to local 8-bit encoding, a shortcut is
available: the QString::toLocal8Bit() function returns such 8-bit
data. On Unix systems this is equivalent to toUtf8(), on Windows the
systems current code page is being used.
@@ -730,7 +730,7 @@
\section1 Using QKeySequence() for Accelerator Values
Accelerator values such as Ctrl+Q or Alt+F need to be translated
- too. If you hardcode \c{Qt::CTRL + Qt::Key_Q} for "quit" in your
+ too. If you hard-code \c{Qt::CTRL + Qt::Key_Q} for "quit" in your
application, translators won't be able to override it. The
correct idiom is:
diff --git a/doc/src/platforms/configure-linux-device.qdoc b/doc/src/platforms/configure-linux-device.qdoc
index c15055c4..cc1068da 100644
--- a/doc/src/platforms/configure-linux-device.qdoc
+++ b/doc/src/platforms/configure-linux-device.qdoc
@@ -73,7 +73,7 @@
post}.
\note The toolchain file presented below is an example, that will often need further
- customizations for a given device. Users and system integrators are also free to
+ customization for a given device. Users and system integrators are also free to
create their own toolchain files in any way they see fit.
While CMake is the only supported build system for building Qt itself, applications
diff --git a/doc/src/platforms/emb-linux.qdoc b/doc/src/platforms/emb-linux.qdoc
index 8302a6e4..cbfe3411 100644
--- a/doc/src/platforms/emb-linux.qdoc
+++ b/doc/src/platforms/emb-linux.qdoc
@@ -124,7 +124,7 @@
\row
\li \c {QT_QPA_EGLFS_FORCE888}
\li When set, the red, green, and blue color channel sizes are ignored
- when \c eglfs creates a new context, window or offscreen surface.
+ when \c eglfs creates a new context, window or off-screen surface.
Instead, the plugin requests a configuration with 8 bits per channel.
This can be helpful on devices where configurations with less than 32
or 24 bits per pixel (for example, 5-6-5 or 4-4-4) are chosen by
@@ -365,7 +365,7 @@
width\c{x}height, width\c{x}height\c{@}vrefresh, or a modeline string.
Specifying \c current chooses a mode with a resolution that matches the
- current one. Because modesetting is done only when the desired mode is
+ current one. Because mode-setting is done only when the desired mode is
actually different from the active one (unless forced via the
\c QT_QPA_EGLFS_ALWAYS_SET_MODE environment variable), this value is useful to
preserve the current mode and any content in the planes not touched by Qt.
@@ -539,7 +539,7 @@
It's up to the configuration and the application to ensure these.
As of Qt 5.11, headless mode via DRM render nodes is supported. This allows
- performing GPU compute (OpenGL compute shaders, OpenCL) or offscreen OpenGL
+ performing GPU compute (OpenGL compute shaders, OpenCL) or off-screen OpenGL
rendering without needing DRM master privileges. In this mode, applications can
function even when there is already another process outputting to the screen.
@@ -559,7 +559,7 @@
screen size, hence the need for specifying a size in the \c headless
property. There is also a lack of vsync-based throttling.
- Once enabled, applications have two typical choices to perform offscreen
+ Once enabled, applications have two typical choices to perform off-screen
rendering in headless mode:
Use an ordinary window, such as a QOpenGLWindow subclass, targeting the
diff --git a/doc/src/platforms/inputs-linux-device.qdoc b/doc/src/platforms/inputs-linux-device.qdoc
index 87ae0cf1..3640f002 100644
--- a/doc/src/platforms/inputs-linux-device.qdoc
+++ b/doc/src/platforms/inputs-linux-device.qdoc
@@ -68,7 +68,7 @@
\li When set to \c 1, Qt grabs the device for exclusive use.
\row
\li \c abs
- \li Some touchscreens report absolute coordinates and can't be differentiated from touchpads.
+ \li Some touchscreens report absolute coordinates and can't be differentiated from touch pads.
In this case, pass \c abs to indicate that the device is using absolute events.
\endtable
@@ -155,9 +155,9 @@
\section2 Touch
- While it's not necessary for modern touch screens, some resistive, single-touch touch screens may
- require that you fallback to using \c tslib instead of relying on the Linux multi-touch protocol
- and the event devices.
+ While it's not necessary for modern touchscreens, some older resistance touchscreens that only
+ support single-touch may require that you fall back to using \c tslib, instead of relying on the
+ Linux multi-touch protocol and the event devices.
To enable \c tslib support, set the \c QT_QPA_EGLFS_TSLIB (for \c eglfs) or \c QT_QPA_FB_TSLIB
(for \c linuxfb) environment variable to 1. To change the device, set the \c TSLIB_TSDEVICE
diff --git a/doc/src/platforms/integrity-build-monolith-app-tutorial.qdoc b/doc/src/platforms/integrity-build-monolith-app-tutorial.qdoc
index c13c345f..bbf1d857 100644
--- a/doc/src/platforms/integrity-build-monolith-app-tutorial.qdoc
+++ b/doc/src/platforms/integrity-build-monolith-app-tutorial.qdoc
@@ -281,7 +281,7 @@
\li Select \e {monolith-service.int}
\image project-structure.png "Project tree."
- Selected \e {monolith-service.int} file is highlited in the project tree.
+ Selected \e {monolith-service.int} file is highlighted in the project tree.
\li Right-click on the file, then select \uicontrol {Edit} from the context menu.
\li Add the following lines at the end of the file.
diff --git a/doc/src/platforms/integrity.qdoc b/doc/src/platforms/integrity.qdoc
index f542b127..247cdb09 100644
--- a/doc/src/platforms/integrity.qdoc
+++ b/doc/src/platforms/integrity.qdoc
@@ -8,7 +8,7 @@
\ingroup supportedplatform
\brief Platform support for INTEGRITY.
- From Qt 5.9 onwards, the Green Hills Software
+ From Qt 5.9 onward, the Green Hills Software
\l {http://www.ghs.com/products/rtos/integrity.html} {INTEGRITY}
Real-Time Operating System (RTOS) is a supported platform.
diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc
index 5660cdd6..d7aecbf2 100644
--- a/doc/src/platforms/linux.qdoc
+++ b/doc/src/platforms/linux.qdoc
@@ -101,7 +101,7 @@
table. To build Qt from its source code, you will also need to install the
development packages for these libraries for your system.
- \note From Qt 5.15 onwards, Qt does require libxcb 1.11. Also, the
+ \note From Qt 5.15 onward, Qt does require libxcb 1.11. Also, the
\c{-qt-xcb} configure option got removed that was bundling some of the
libs below. Anyhow, you can now configure with \c{-bundled-xcb-xinput}
to avoid a dependency to system xcb-xinput.
@@ -706,7 +706,7 @@
above. Do this by adding them to the \c LIBS variable in your
project file.
- From Qt version 5.2 onwards, the officially supported version for
+ From Qt version 5.2 onward, the officially supported version for
OpenSSL is 1.0.0 or later. Versions >= 0.9.7 and < 1.0.0 might work,
but are not guaranteed to.
diff --git a/doc/src/platforms/macos.qdoc b/doc/src/platforms/macos.qdoc
index 03f78816..a927e1a9 100644
--- a/doc/src/platforms/macos.qdoc
+++ b/doc/src/platforms/macos.qdoc
@@ -758,7 +758,7 @@
The bundle provides many advantages to the user:
\list
- \li It is easily installable as it is identified as a single entity.
+ \li It is easy to install as it is identified as a single entity.
\li Information about a bundle is accessible from code.
\endlist
This is specific to \macos and beyond the scope of this document. For
diff --git a/doc/src/platforms/wasm.qdoc b/doc/src/platforms/wasm.qdoc
index 02ece51e..fa3726b9 100644
--- a/doc/src/platforms/wasm.qdoc
+++ b/doc/src/platforms/wasm.qdoc
@@ -221,7 +221,7 @@ logo to the app logo, is also possible. In both cases, \e {qtloader.js} provides
API for loading the application.
We recommend compressing the wasm file using e.g. gzip or brotli before deployment,
-as this can provide a significant reductiton in file size.
+as this can provide a significant reduction in file size.
Enabling certain features, such as multi-threading and SIMD, produces .wasm binaries
that are incompatible with browsers that do not support the enabled feature. It is
@@ -348,7 +348,7 @@ is not completely leak free. See \l {https://emscripten.org/docs/porting/pthread
for further info.
Multithreading requires browser support for SharedArrayBuffer, see \l {https://caniuse.com/sharedarraybuffer}
-{ caniuse sharedarraybuffer } for current supported status. If suppoerted, SharedArrayBuffer will
+{ caniuse sharedarraybuffer } for current supported status. If supported, SharedArrayBuffer will
be enabled provided the web server sets the COOP and and COEP headers:
\list
\li Cross-Origin-Opener-Policy: same-origin
@@ -358,7 +358,7 @@ be enabled provided the web server sets the COOP and and COEP headers:
\section2 SIMD
The LLVM compiler supports generating \l{https://emscripten.org/docs/porting/simd.html}{WebAssembly SIMD}.
-Pass the -msimd128 flag at compile time to enable. This enables LLVM autovectorization, which
+Pass the -msimd128 flag at compile time to enable. This enables LLVM auto-vectorization, which
makes it possible to benefit from SIMD without making source code modifications.
You can target WebAssembly SIMD directly using either GCC/Clang SIMD Vector Extensions or WASM
@@ -512,11 +512,11 @@ int main(int argc, char **argc)
\section3 Asyncify
The default build of Qt for WebAssembly does not support reentering the event loop,
-for example by calling QEventLoop::exec() or QDialog::exec(), due to resitrictions
+for example by calling QEventLoop::exec() or QDialog::exec(), due to restrictions
of the web platform.
Emscripten's \l{https://emscripten.org/docs/porting/asyncify.html}{asyncify} feature lifts
-these restrictions by allowing sychronous calls (like QEventLoop::exec() and QDialog::exec())
+these restrictions by allowing synchronous calls (like QEventLoop::exec() and QDialog::exec())
to yield to the event loop. Nested calls are not supported, and for this reason asyncify is
not used for the top-level QApplication::exec() call.
@@ -538,13 +538,13 @@ usage. Build with optimizations enabled to minimize the overhead.
\section2 Debugging and Profiling
-Wasm debugging is done on browser javascript console, debugging applications on Wasm
+Wasm debugging is done on browser JavaScript console, debugging applications on Wasm
directly within Qt Creator is not possible.
\list
\li Qt debug and logging output is printed on the JavaScript console, which can be
accessed via browser "Developer Tools" or similar.
-\li Source maps for stepping through code, can be created by reconfiguring Qt with
+\li Source maps for stepping through code, can be created by re-configuring Qt with
the --device-option QT_WASM_SOURCE_MAP=1, and building a debug build.
\list
\li \l {https://developer.mozilla.org/en-US/docs/Tools/Debugger/How_to/Use_a_source_map}
@@ -559,7 +559,7 @@ the --device-option QT_WASM_SOURCE_MAP=1, and building a debug build.
\li To stop execution on a certain line and popup the browser debugger
programmatically, you can add the function emscripten_debugger(); to the application
source code.
-\li Profiling can be accomplished by using a debug build and the javascript console
+\li Profiling can be accomplished by using a debug build and the JavaScript console
profiling features. Qt adds --profiling-funcs to the linker arguments in debug builds,
which preserve function names in profiling
\endlist
@@ -682,7 +682,7 @@ files. There's generally no need to have special handling of wasm files.
\li \l {https://www.qt.io/web-assembly-example-gallery}
{A gallery of available controls in Qt Quick Controls}
\li \l {https://www.qt.io/web-assembly-example-pizza-shop}
- {Web app for prdering pizzas}
+ {Web app for ordering pizzas}
\endlist
\section1 External resources
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index 7e828582..c4a42188 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -240,7 +240,7 @@
nothing is disabled, regardless of the driver or OS.
\note While not typically needed, \c{QT_NO_OPENGL_BUGLIST} can become relevant in
- certain virtualized environments, with multiple, possibly virtual, graphics adapters
+ certain virtual environments, with multiple, possibly virtual, graphics adapters
present. If the logs from categories like \c{qt.qpa.gl} indicate that the detection of
the driver and display adapter leads to incorrectly disabling OpenGL, it is then
recommended to set this environment variable in order to enable the application to run
@@ -773,7 +773,7 @@
When looking at the plugin DLLs the exact same dependencies
are listed.
- From Qt version 5.2 onwards, the officially supported version
+ From Qt version 5.2 onward, the officially supported version
for OpenSSL is 1.0.0 or later. Versions >= 0.9.7 and < 1.0.0 might
work, but are not guaranteed to.
diff --git a/doc/src/porting.qdoc b/doc/src/porting.qdoc
index a94fb0ed..6410c61b 100644
--- a/doc/src/porting.qdoc
+++ b/doc/src/porting.qdoc
@@ -109,7 +109,7 @@ platform.
\section1 Use Porting Tool
-A Clazy-based tool is available to facilate porting from Qt 5 to Qt 6:
+A Clazy-based tool is available to facilitate porting from Qt 5 to Qt 6:
\l {Porting C++ Applications to Qt 6 using Clazy checks}.
\section1 Further Reading
diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc
index 9ee1e7a9..6999bdab 100644
--- a/doc/src/qtmodules.qdoc
+++ b/doc/src/qtmodules.qdoc
@@ -236,7 +236,7 @@
\li \l[QtTextToSpeech]{Qt TextToSpeech}
\li All
\li All
- \li Provides support for synthesising speech from text and playing it as audio
+ \li Provides support for synthesizing speech from text and playing it as audio
output.
\row
\li \l[QtUITools]{Qt UI Tools}
diff --git a/doc/src/scripting.qdoc b/doc/src/scripting.qdoc
index d50ff7a9..a9a6af16 100644
--- a/doc/src/scripting.qdoc
+++ b/doc/src/scripting.qdoc
@@ -6,9 +6,10 @@
\title Scripting
\brief Qt's scripting features
-Qt has two main ways to help make an application scriptable. All of them allow easy
-integration of the \l{ECMA-262}{ECMAScript} (more widely known as JavaScript) language into the application. Depending on how deep
-the integration should be, one of these APIs can be used:
+Qt has two main ways to help make a scripted application. All of these allow
+easy integration of the \l{ECMA-262}{ECMAScript} (more widely known as
+JavaScript) language into the application. Depending on how deep the integration
+should be, one of these APIs can be used:
\section1 JS API
This is a simple API, but limited to basic functionality. The main classes
diff --git a/doc/src/signalslotsyntaxes.qdoc b/doc/src/signalslotsyntaxes.qdoc
index a3323a9b..1b7608ef 100644
--- a/doc/src/signalslotsyntaxes.qdoc
+++ b/doc/src/signalslotsyntaxes.qdoc
@@ -6,7 +6,7 @@
\title Differences between String-Based and Functor-Based Connections
\brief Compares the two syntaxes for making signal-slot connections in C++.
-From Qt 5.0 onwards, Qt offers two different ways to write \l{Signals and Slots}
+From Qt 5.0 onward, Qt offers two different ways to write \l{Signals and Slots}
{signal-slot connections} in C++: The \e{string-based} connection syntax and the
\e{functor-based} connection syntax. There are pros and cons to both syntaxes.
The table below summarizes their differences.
@@ -163,7 +163,7 @@ With the string-based syntax, parameter types are explicitly specified. As a
result, the desired instance of an overloaded signal or slot is unambiguous.
In contrast, with the functor-based syntax, an overloaded signal or slot must
-be casted to tell the compiler which instance to use.
+be cast to tell the compiler which instance to use.
For example, \l QLCDNumber has three versions of the \c display() slot:
\list 1
diff --git a/doc/src/wayland-and-qt.qdoc b/doc/src/wayland-and-qt.qdoc
index 3aa87103..9f774e6b 100644
--- a/doc/src/wayland-and-qt.qdoc
+++ b/doc/src/wayland-and-qt.qdoc
@@ -271,7 +271,7 @@
\section1 Why Use Wayland Instead of X11 or Custom Solutions
As described earlier, X11 is not an optimal match for typical system setups today.
- It is quite large and complex, and it lacks customizability. In fact, it is difficult
+ It is quite large and complex, and lacks ability in customization. In fact, it is difficult
to run a client fluidly with X11, and reach 60 fps without tearing. Wayland, in contrast,
is easier to implement, has better performance, and contains all the necessary parts to
run efficiently on modern graphics hardware. For embedded, multi-process systems on Linux,