diff options
| -rw-r--r-- | examples/widgets/doc/src/diagramscene.qdoc | 4 | ||||
| -rw-r--r-- | src/corelib/tools/qalgorithms.qdoc | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qtimezone.cpp | 4 | ||||
| -rw-r--r-- | src/gui/image/qimage.cpp | 2 | ||||
| -rw-r--r-- | src/gui/image/qpixmap.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/doc/src/modelview.qdoc | 4 | ||||
| -rw-r--r-- | src/widgets/graphicsview/qgraphicssceneevent.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/styles/qstyleoption.cpp | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/examples/widgets/doc/src/diagramscene.qdoc b/examples/widgets/doc/src/diagramscene.qdoc index 92048cdcaf..32168f59ee 100644 --- a/examples/widgets/doc/src/diagramscene.qdoc +++ b/examples/widgets/doc/src/diagramscene.qdoc @@ -507,7 +507,7 @@ \snippet graphicsview/diagramscene/diagramscene.cpp 5 - \c DiagramTextItems emit a signal when they loose focus, which is + \c DiagramTextItems emit a signal when they lose focus, which is connected to this slot. We remove the item if it has no text. If not, we would leak memory and confuse the user as the items will be edited when pressed on by the mouse. @@ -715,7 +715,7 @@ \snippet graphicsview/diagramscene/diagramtextitem.cpp 2 - \c DiagramScene uses the signal emitted when the text item looses + \c DiagramScene uses the signal emitted when the text item loses focus to remove the item if it is empty, i.e., it contains no text. diff --git a/src/corelib/tools/qalgorithms.qdoc b/src/corelib/tools/qalgorithms.qdoc index 412b9cf3b2..40eb2ed41d 100644 --- a/src/corelib/tools/qalgorithms.qdoc +++ b/src/corelib/tools/qalgorithms.qdoc @@ -534,7 +534,7 @@ Use std::lower_bound instead. Performs a binary search of the range [\a begin, \a end) and - returns the position of the first ocurrence of \a value. If no + returns the position of the first occurrence of \a value. If no such item is found, returns the position where it should be inserted. diff --git a/src/corelib/tools/qtimezone.cpp b/src/corelib/tools/qtimezone.cpp index 5fec06b30a..a8ed8739c3 100644 --- a/src/corelib/tools/qtimezone.cpp +++ b/src/corelib/tools/qtimezone.cpp @@ -185,7 +185,7 @@ Q_GLOBAL_STATIC(QTimeZoneSingleton, global_tz); The method systemTimeZoneId() returns the current system IANA time zone ID which on OSX and Linux will always be correct. On Windows this ID is - translated from the the Windows system ID using an internal translation + translated from the Windows system ID using an internal translation table and the user's selected country. As a consequence there is a small chance any Windows install may have IDs not known by Qt, in which case "UTC" will be returned. @@ -771,7 +771,7 @@ QTimeZone::OffsetDataList QTimeZone::transitions(const QDateTime &fromDateTime, /*! Returns the current system time zone IANA ID. - On Windows this ID is translated from the the Windows ID using an internal + On Windows this ID is translated from the Windows ID using an internal translation table and the user's selected country. As a consequence there is a small chance any Windows install may have IDs not known by Qt, in which case "UTC" will be returned. diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 0916826529..12ab5eaffa 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -1426,7 +1426,7 @@ qreal QImage::devicePixelRatio() const } /*! - Sets the the device pixel ratio for the image. This is the + Sets the device pixel ratio for the image. This is the ratio between image pixels and device-independent pixels. The default \a scaleFactor is 1.0. Setting it to something else has diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index a620d34553..6dced54d20 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -665,7 +665,7 @@ qreal QPixmap::devicePixelRatio() const } /*! - Sets the the device pixel ratio for the pixmap. This is the + Sets the device pixel ratio for the pixmap. This is the ratio between image pixels and device-independent pixels. The default \a scaleFactor is 1.0. Setting it to something else has diff --git a/src/widgets/doc/src/modelview.qdoc b/src/widgets/doc/src/modelview.qdoc index b2f9da9563..f094a58a91 100644 --- a/src/widgets/doc/src/modelview.qdoc +++ b/src/widgets/doc/src/modelview.qdoc @@ -463,7 +463,7 @@ We get the model index that corresponds to the selection by calling \l{QItemSelectionModel::currentIndex()}{treeView->selectionModel()->currentIndex()} - and we get the the field's string by using the model index. Then we just + and we get the field's string by using the model index. Then we just calculate the item's \c hierarchyLevel. Top level items do not have parents and the \l{QAbstractItemModel::}{parent()} method will return a default constructed \l{QModelIndex}{QModelIndex()}. This is why we use the @@ -548,7 +548,7 @@ the underlying data. The data can be looked up by calling \l{QModelIndex::data()}{index.data()}. The delegate's \l{QAbstractItemDelegate::}{sizeHint()} method is used to obtain each - star's dimensions, so the the cell will provide enough height and width to + star's dimensions, so the cell will provide enough height and width to accommodate the stars. Writing custom delegates is the right choice if you want to show your data diff --git a/src/widgets/graphicsview/qgraphicssceneevent.cpp b/src/widgets/graphicsview/qgraphicssceneevent.cpp index 8eb1395a45..631aa7bf19 100644 --- a/src/widgets/graphicsview/qgraphicssceneevent.cpp +++ b/src/widgets/graphicsview/qgraphicssceneevent.cpp @@ -874,7 +874,7 @@ void QGraphicsSceneContextMenuEvent::setPos(const QPointF &pos) /*! Returns the position of the mouse cursor in scene coordinates at the moment the - the context menu was requested. + context menu was requested. \sa pos(), screenPos() */ @@ -899,7 +899,7 @@ void QGraphicsSceneContextMenuEvent::setScenePos(const QPointF &pos) /*! Returns the position of the mouse cursor in screen coordinates at the moment the - the context menu was requested. + context menu was requested. \sa pos(), scenePos() */ diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp index 5fe071087e..5913b2f261 100644 --- a/src/widgets/styles/qstyleoption.cpp +++ b/src/widgets/styles/qstyleoption.cpp @@ -1116,7 +1116,7 @@ QStyleOptionToolBar::QStyleOptionToolBar(int version) The order of the positions within a line starts at the top of a vertical line, and from the left within a horizontal line. The - order of the positions for the lines is always from the the + order of the positions for the lines is always from the parent widget's boundary edges. \value Beginning The toolbar is located at the beginning of the line, |