diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/src/development/moc.qdoc | 2 | ||||
-rw-r--r-- | doc/src/frameworks-technologies/accessible.qdoc | 4 | ||||
-rw-r--r-- | doc/src/howtos/scalabilityintro.qdoc | 2 | ||||
-rw-r--r-- | doc/src/legal/fdl.qdoc | 2 | ||||
-rw-r--r-- | doc/src/platforms/android/android-3rdparty-libs.qdoc | 2 | ||||
-rw-r--r-- | doc/src/platforms/wasm.qdoc | 4 | ||||
-rw-r--r-- | doc/src/whatsnew/whatsnew62.qdoc | 2 | ||||
-rw-r--r-- | doc/src/whatsnew/whatsnew64.qdoc | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/doc/src/development/moc.qdoc b/doc/src/development/moc.qdoc index 6be150ba..92f8bdf4 100644 --- a/doc/src/development/moc.qdoc +++ b/doc/src/development/moc.qdoc @@ -156,7 +156,7 @@ \row \li \c -i \li Do not generate an \c #include statement in the output. - This may be used to run the moc on on a C++ file containing one or + This may be used to run the moc on a C++ file containing one or more class declarations. You should then \c #include the meta-object code in the \c .cpp file. diff --git a/doc/src/frameworks-technologies/accessible.qdoc b/doc/src/frameworks-technologies/accessible.qdoc index da212460..28cc0196 100644 --- a/doc/src/frameworks-technologies/accessible.qdoc +++ b/doc/src/frameworks-technologies/accessible.qdoc @@ -554,7 +554,7 @@ \list \li A root object. This is the root in the accessible object tree and is of type QAccessibleInterface. - \li Receive events from from accessible objects. + \li Receive events from accessible objects. \endlist The root object is set with the @@ -651,7 +651,7 @@ Accessibility.name: myMathEquation.text Accessibility.description: qsTr("Linear equation") Accessible.onPressAction: { - // Highlight the the x variable + // Highlight the x variable ... } } diff --git a/doc/src/howtos/scalabilityintro.qdoc b/doc/src/howtos/scalabilityintro.qdoc index b82a747d..537d6237 100644 --- a/doc/src/howtos/scalabilityintro.qdoc +++ b/doc/src/howtos/scalabilityintro.qdoc @@ -276,7 +276,7 @@ that is used to scale graphics output: allocate larger buffers and set a scaling transform. - The advantage of this approach is that that vector graphics and fonts scale + The advantage of this approach is that vector graphics and fonts scale automatically and existing applications tend to work unmodified. For raster content, high-resolution alternative resources are needed, however. diff --git a/doc/src/legal/fdl.qdoc b/doc/src/legal/fdl.qdoc index 421c14f6..06a1ec0f 100644 --- a/doc/src/legal/fdl.qdoc +++ b/doc/src/legal/fdl.qdoc @@ -7,7 +7,7 @@ \brief About the GPL license used for Qt documentation Qt documentation is available under commercial licenses from The Qt Company. - In addition, is is available under the terms of the GNU Free Documentation + In addition, it is available under the terms of the GNU Free Documentation License version 1.3, as published by the Free Software Foundation. Example code embedded in the Qt documentation is also diff --git a/doc/src/platforms/android/android-3rdparty-libs.qdoc b/doc/src/platforms/android/android-3rdparty-libs.qdoc index 348cb5da..9272d97f 100644 --- a/doc/src/platforms/android/android-3rdparty-libs.qdoc +++ b/doc/src/platforms/android/android-3rdparty-libs.qdoc @@ -19,7 +19,7 @@ the deployment package. When using Qt Creator for building and deploying, androiddeployqt is used behind the scenes, so this also applies to development with Qt Creator. Explaining how to access the Java APIs after - being included in the the project is not in the scope of this guide. For + being included in the project is not in the scope of this guide. For more information, see \l{Customizing the Package Templates}. \section1 Including a Library to an Android Project diff --git a/doc/src/platforms/wasm.qdoc b/doc/src/platforms/wasm.qdoc index 01264e0d..1dfa968a 100644 --- a/doc/src/platforms/wasm.qdoc +++ b/doc/src/platforms/wasm.qdoc @@ -224,7 +224,7 @@ the application name in the following table). \li app binary \endtable -You can deploy \e {app.html} as-is, or discard it in favor favor of a custom html +You can deploy \e {app.html} as-is, or discard it in favor of a custom html file. Smaller adjustments, such as changing the splash screen image from the Qt logo to the app logo, is also possible. In both cases, \e {qtloader.js} provides a JavaScript API for loading the application. @@ -288,7 +288,7 @@ modules are listed below, other modules may or may not work. \li \l {Qt WebSockets} \endlist -In all cases, module support may not be complete and and there may be +In all cases, module support may not be complete and there may be additional limitations, either due to the browser sandbox or due to incompleteness of the Qt platform port. See \l {Developing with Qt for WebAssembly} for further info. diff --git a/doc/src/whatsnew/whatsnew62.qdoc b/doc/src/whatsnew/whatsnew62.qdoc index 79083528..9ae13fc8 100644 --- a/doc/src/whatsnew/whatsnew62.qdoc +++ b/doc/src/whatsnew/whatsnew62.qdoc @@ -92,7 +92,7 @@ \li \l {Qt Sensors} \list \li Most QML facing properties are now bindable. - \li Sensor::type and and QSensor::type properties are now marked as + \li Sensor::type and QSensor::type properties are now marked as constant. \li Added parameter to QSensorBackend::sensorBusy() to be able to also clear the busy state. diff --git a/doc/src/whatsnew/whatsnew64.qdoc b/doc/src/whatsnew/whatsnew64.qdoc index dac1f452..4149c1ef 100644 --- a/doc/src/whatsnew/whatsnew64.qdoc +++ b/doc/src/whatsnew/whatsnew64.qdoc @@ -168,7 +168,7 @@ \li QKeySequenceEdit has a new \l{QKeySequenceEdit::}{clearButtonEnabled} property. Use it to control whether the widget shows a clear button that allows the user to clear the edit. \li QWizard has a new slot, \l{QWizard::}{setCurrentId}, that allows applications to move to a - page without without visiting the pages between the current page and the target. + page without visiting the pages between the current page and the target. \endlist \section2 Qt Network Module |