diff options
author | Andreas Eliasson <andreas.eliasson@qt.io> | 2023-02-10 19:20:34 +0100 |
---|---|---|
committer | Andreas Eliasson <andreas.eliasson@qt.io> | 2023-03-07 09:24:50 +0000 |
commit | e09d1a5694fa48332831521ec3851e5bffcf8ffe (patch) | |
tree | 752cc6076db0c11014a5dab74d759f3e1c6c28f6 | |
parent | 26446d3b7e2e85a3ee3f19078b32f50c4efaf822 (diff) |
Doc: Remove duplicate words (typos)
Pick-to: 6.5 6.4 6.2
Change-Id: Ibd29739b894598e5d7837ed5f9150e08ca07fa35
Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
-rw-r--r-- | src/qml/doc/src/qt6-changes.qdoc | 2 | ||||
-rw-r--r-- | src/qml/jsapi/qjsengine.cpp | 4 | ||||
-rw-r--r-- | src/qml/qml/qqmlloggingcategory.cpp | 2 | ||||
-rw-r--r-- | src/qml/qmldirparser/qqmldirparser.cpp | 2 | ||||
-rw-r--r-- | src/quick/handlers/qquickpointerhandler.cpp | 2 | ||||
-rw-r--r-- | src/quick/handlers/qquickwheelhandler.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquickrendercontrol.cpp | 4 | ||||
-rw-r--r-- | src/quick/items/qquickwindow.cpp | 4 | ||||
-rw-r--r-- | src/quicktemplates/qquickselectionrectangle.cpp | 4 | ||||
-rw-r--r-- | src/quicktemplates/qquicktreeviewdelegate.cpp | 2 |
10 files changed, 14 insertions, 14 deletions
diff --git a/src/qml/doc/src/qt6-changes.qdoc b/src/qml/doc/src/qt6-changes.qdoc index 1dfee995f9..4f95103a4f 100644 --- a/src/qml/doc/src/qt6-changes.qdoc +++ b/src/qml/doc/src/qt6-changes.qdoc @@ -68,7 +68,7 @@ Implicit conversions were done for strings that could be parsed as \list - \li color (use Qt.color instead instead), + \li color (use Qt.color instead), \li date (use the Date object instead), \li rect (use Qt.rect instead) and \li size (use Qt.size instead) diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp index 86901c7955..c581a469fb 100644 --- a/src/qml/jsapi/qjsengine.cpp +++ b/src/qml/jsapi/qjsengine.cpp @@ -243,7 +243,7 @@ Q_DECLARE_METATYPE(QList<int>) \section1 Extensions QJSEngine provides a compliant ECMAScript implementation. By default, - familiar utilities like logging are not available, but they can can be + familiar utilities like logging are not available, but they can be installed via the \l installExtensions() function. \sa QJSValue, {Making Applications Scriptable}, @@ -1037,7 +1037,7 @@ QDate QJSEngine::convertDateTimeToDate(const QDateTime &dateTime) JavaScript function through QJSEngine. When returning from C++, the engine will interrupt the normal flow of - execution and call the the next pre-registered exception handler with + execution and call the next pre-registered exception handler with an error object that contains the given \a message. The error object will point to the location of the top-most context on the JavaScript caller stack; specifically, it will have properties \c lineNumber, diff --git a/src/qml/qml/qqmlloggingcategory.cpp b/src/qml/qml/qqmlloggingcategory.cpp index d735ecd716..660d7cb9cf 100644 --- a/src/qml/qml/qqmlloggingcategory.cpp +++ b/src/qml/qml/qqmlloggingcategory.cpp @@ -15,7 +15,7 @@ \since 5.8 A logging category can be passed to console.log() and friends as the first argument. - If supplied to to the logger the LoggingCategory's name will be used as Logging Category + If supplied to the logger the LoggingCategory's name will be used as Logging Category otherwise the default logging category will be used. \qml diff --git a/src/qml/qmldirparser/qqmldirparser.cpp b/src/qml/qmldirparser/qqmldirparser.cpp index 9a34c9fe49..a2983995cc 100644 --- a/src/qml/qmldirparser/qqmldirparser.cpp +++ b/src/qml/qmldirparser/qqmldirparser.cpp @@ -218,7 +218,7 @@ bool QQmlDirParser::parse(const QString &source) continue; } else { reportError(lineNumber, 0, - QStringLiteral("only optional imports can have a a defaultl, " + QStringLiteral("only optional imports can have a default, " "not %1.") .arg(sections[1])); } diff --git a/src/quick/handlers/qquickpointerhandler.cpp b/src/quick/handlers/qquickpointerhandler.cpp index 81bf7de8b0..1de0a02055 100644 --- a/src/quick/handlers/qquickpointerhandler.cpp +++ b/src/quick/handlers/qquickpointerhandler.cpp @@ -414,7 +414,7 @@ bool QQuickPointerHandler::approveGrabTransition(QPointerEvent *event, const QEv \value PointerHandler.ApprovesCancellation This handler will allow its grab to be set to null. \value PointerHandler.ApprovesTakeOverByAnything - This handler gives permission for any any type of Item or Handler to take the grab. + This handler gives permission for any type of Item or Handler to take the grab. The default is \c {PointerHandler.CanTakeOverFromItems | PointerHandler.CanTakeOverFromHandlersOfDifferentType | PointerHandler.ApprovesTakeOverByAnything} diff --git a/src/quick/handlers/qquickwheelhandler.cpp b/src/quick/handlers/qquickwheelhandler.cpp index 4cc9766fd1..925e481244 100644 --- a/src/quick/handlers/qquickwheelhandler.cpp +++ b/src/quick/handlers/qquickwheelhandler.cpp @@ -524,7 +524,7 @@ QMetaProperty &QQuickWheelHandlerPrivate::targetMetaProperty() const By default, this property is set to \l{QInputDevice::DeviceType}{PointerDevice.Mouse}, so as to react only to - events events from an actual mouse wheel. + events from an actual mouse wheel. WheelHandler can be made to respond to both mouse wheel and touchpad scrolling by setting acceptedDevices to diff --git a/src/quick/items/qquickrendercontrol.cpp b/src/quick/items/qquickrendercontrol.cpp index 0575c5e5eb..5956babaf0 100644 --- a/src/quick/items/qquickrendercontrol.cpp +++ b/src/quick/items/qquickrendercontrol.cpp @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE Management of the graphics devices, contexts, image and texture objects is up to the application. The device or context that will be used by Qt Quick must - be created before calling initialize(). The creation of the the texture object + be created before calling initialize(). The creation of the texture object can be deferred, see below. Qt 5.4 introduces the ability for QOpenGLContext to adopt existing native contexts. Together with QQuickRenderControl this makes it possible to create a QOpenGLContext that shares with an external @@ -574,7 +574,7 @@ QQuickWindow *QQuickRenderControl::window() const to the user of QQuickRenderControl to specify these points. A typical update step, including initialization of rendering into an - existing texture, could like like the following. The example snippet + existing texture, could look like the following. The example snippet assumes Direct3D 11 but the same concepts apply other graphics APIs as well. diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 360d51a5bc..3ebfa9d971 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -3136,7 +3136,7 @@ void QQuickWindow::setDefaultAlphaBuffer(bool useAlpha) buffering of resources, such as buffers, is up to the graphics API client to manage. Most commonly, a uniform buffer where the data changes between frames cannot simply change its contents when submitting a frame, given - that that frame may still be active ("in flight") when starting to record + that the frame may still be active ("in flight") when starting to record the next frame. To avoid stalling the pipeline, one way is to have multiple buffers (and memory allocations) under the hood, thus realizing at least a double buffered scheme for such resources. @@ -3493,7 +3493,7 @@ void QQuickWindow::endExternalCommands() However if you set this property, then Qt Quick will no longer wait until the \c transientParent window is shown before showing this window. If you - want to to be able to show a transient window independently of the "parent" + want to be able to show a transient window independently of the "parent" Item or Window within which it was declared, you can remove that relationship by setting \c transientParent to \c null: diff --git a/src/quicktemplates/qquickselectionrectangle.cpp b/src/quicktemplates/qquickselectionrectangle.cpp index a2adc43dcd..d5ebd9fc43 100644 --- a/src/quicktemplates/qquickselectionrectangle.cpp +++ b/src/quicktemplates/qquickselectionrectangle.cpp @@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE The handle is not hidden by default when a selection is removed. Instead, this is the responsibility of the delegate, to open up for custom fade-out animations. The easiest way to ensure that the handle - ends up hidden, is to simply bind \l visible to the the \l active + ends up hidden, is to simply bind \l visible to the \l active state of the SelectionRectangle: \qml @@ -109,7 +109,7 @@ QT_BEGIN_NAMESPACE The handle is not hidden by default when a selection is removed. Instead, this is the responsibility of the delegate, to open up for custom fade-out animations. The easiest way to ensure that the handle - ends up hidden, is to simply bind \l visible to the the \l active + ends up hidden, is to simply bind \l visible to the \l active state of the SelectionRectangle: \qml diff --git a/src/quicktemplates/qquicktreeviewdelegate.cpp b/src/quicktemplates/qquicktreeviewdelegate.cpp index ba1a26cb34..5b02366476 100644 --- a/src/quicktemplates/qquicktreeviewdelegate.cpp +++ b/src/quicktemplates/qquicktreeviewdelegate.cpp @@ -138,7 +138,7 @@ QT_BEGIN_NAMESPACE \qmlproperty bool QtQuick.Controls::TreeViewDelegate::isTreeNode This property is \c true if the delegate item draws a node in the tree. - Only one column in the view will be used to to draw the tree, and + Only one column in the view will be used to draw the tree, and therefore, only delegate items in that column will have this property set to \c true. |