diff --git a/doc/global/qt-html-templates-offline-simple.qdocconf b/doc/global/qt-html-templates-offline-simple.qdocconf index 02a32285198..392b03b5e50 100644 --- a/doc/global/qt-html-templates-offline-simple.qdocconf +++ b/doc/global/qt-html-templates-offline-simple.qdocconf @@ -23,7 +23,7 @@ HTML.navigationseparator = \ " ◦ \n" # Add some padding around code snippets, as we cannot -# currectly style them for QTextBrowser using only CSS. +# correctly style them for QTextBrowser using only CSS. codeindent = 1 codeprefix = "\n" codesuffix = "\n" diff --git a/examples/corelib/bindableproperties/doc/src/bindableproperties.qdoc b/examples/corelib/bindableproperties/doc/src/bindableproperties.qdoc index 6e373dbc3c9..644693acb8a 100644 --- a/examples/corelib/bindableproperties/doc/src/bindableproperties.qdoc +++ b/examples/corelib/bindableproperties/doc/src/bindableproperties.qdoc @@ -125,7 +125,7 @@ \snippet bindableproperties/bindablesubscription/bindableuser.h bindable-user-class - The second differenece is in the implementation of these calsses. First of + The second difference is in the implementation of these classes. First of all, the dependencies between \c subscription and \c user are now tracked via binding expressions: diff --git a/examples/corelib/threads/doc/src/mandelbrot.qdoc b/examples/corelib/threads/doc/src/mandelbrot.qdoc index e0f703bf3cd..aaa6356a2c0 100644 --- a/examples/corelib/threads/doc/src/mandelbrot.qdoc +++ b/examples/corelib/threads/doc/src/mandelbrot.qdoc @@ -146,7 +146,7 @@ rendering parameters in local variables. As usual, we protect accesses to the member variables using the class's mutex. Storing the member variables in local variables allows us to minimize the - amout of code that needs to be protected by a mutex. This ensures + amount of code that needs to be protected by a mutex. This ensures that the main thread will never have to block for too long when it needs to access \c{RenderThread}'s member variables (e.g., in \c render()). diff --git a/examples/corelib/threads/doc/src/semaphores.qdoc b/examples/corelib/threads/doc/src/semaphores.qdoc index c1d8600c173..b8e1ab1b521 100644 --- a/examples/corelib/threads/doc/src/semaphores.qdoc +++ b/examples/corelib/threads/doc/src/semaphores.qdoc @@ -39,7 +39,7 @@ \snippet threads/semaphores/semaphores.cpp 0 - \c DataSize is the amout of data that the producer will generate. + \c DataSize is the amount of data that the producer will generate. To keep the example as simple as possible, we make it a constant. \c BufferSize is the size of the circular buffer. It is less than \c DataSize, meaning that at some point the producer will reach diff --git a/examples/corelib/tools/doc/src/contiguouscache.qdoc b/examples/corelib/tools/doc/src/contiguouscache.qdoc index 95753828b33..bb8616818fa 100644 --- a/examples/corelib/tools/doc/src/contiguouscache.qdoc +++ b/examples/corelib/tools/doc/src/contiguouscache.qdoc @@ -44,7 +44,7 @@ allow for gaps. If your cache needs to quickly jump back and forth between rows with significant gaps between them consider using QCache instead. - And thats it. A perfectly reasonable cache, using minimal memory for a very large + And that's it. A perfectly reasonable cache, using minimal memory for a very large list. In this case the accessor for getting the words into the cache generates random information rather than fixed information. This allows you to see how the cache range is kept for a local number of rows when running the diff --git a/examples/network/doc/src/blockingfortuneclient.qdoc b/examples/network/doc/src/blockingfortuneclient.qdoc index 18a4855b1ee..931391567d7 100644 --- a/examples/network/doc/src/blockingfortuneclient.qdoc +++ b/examples/network/doc/src/blockingfortuneclient.qdoc @@ -160,7 +160,7 @@ \snippet blockingfortuneclient/blockingclient.cpp 1 The requestNewFortune() slot calls FortuneThread::requestNewFortune(), - which \e shedules the request. When the thread has received a new fortune + which \e schedules the request. When the thread has received a new fortune and emits newFortune(), our showFortune() slot is called: \snippet blockingfortuneclient/blockingclient.cpp 2 diff --git a/examples/opengl/doc/src/cube.qdoc b/examples/opengl/doc/src/cube.qdoc index f929ebccc1d..e0a18706064 100644 --- a/examples/opengl/doc/src/cube.qdoc +++ b/examples/opengl/doc/src/cube.qdoc @@ -6,7 +6,7 @@ \ingroup examples-widgets-opengl \title Cube OpenGL ES 2.0 example - \brief The Cube OpenGL ES 2.0 example shows how to write mouse rotateable + \brief The Cube OpenGL ES 2.0 example shows how to write mouse rotatable textured 3D cube using OpenGL ES 2.0 with Qt. It shows how to handle polygon geometries efficiently and how to write simple vertex and fragment shader for programmable graphics pipeline. In addition it diff --git a/examples/sql/doc/src/cachedtable.qdoc b/examples/sql/doc/src/cachedtable.qdoc index ff04fb114aa..35b8fdd440e 100644 --- a/examples/sql/doc/src/cachedtable.qdoc +++ b/examples/sql/doc/src/cachedtable.qdoc @@ -14,7 +14,7 @@ The example consists of a single class, \c TableEditor, which is a custom dialog widget that allows the user to modify data stored in - a database. We will first review the class definiton and how to + a database. We will first review the class definition and how to use the class, then we will take a look at the implementation. \section1 TableEditor Class Definition @@ -40,7 +40,7 @@ We are also going to show how a table view can be used to cache any changes to the data until the user explicitly requests to submit them. For that reason we need to declare a \c submit() slot - in additon to the model and the editor's buttons. + in addition to the model and the editor's buttons. \table 100% \header \li Connecting to a Database diff --git a/examples/sql/doc/src/drilldown.qdoc b/examples/sql/doc/src/drilldown.qdoc index d7f7bdc858c..4e432b7016b 100644 --- a/examples/sql/doc/src/drilldown.qdoc +++ b/examples/sql/doc/src/drilldown.qdoc @@ -283,7 +283,7 @@ The \c findWindow() function, on the other hand, is frequently used. It is called from the \c showInformation() function to - detemine whether a window is already created for the given + determine whether a window is already created for the given item (whenever we create an \c InformationWindow object, we store a reference to it in the \c informationWindows list). The latter function is in turn called from our custom \c diff --git a/examples/widgets/doc/src/addressbook-tutorial.qdoc b/examples/widgets/doc/src/addressbook-tutorial.qdoc index 2a6358362a5..2f7884bee8f 100644 --- a/examples/widgets/doc/src/addressbook-tutorial.qdoc +++ b/examples/widgets/doc/src/addressbook-tutorial.qdoc @@ -200,7 +200,7 @@ is started. We start the event loop by calling the application's \l{QApplication::}{exec()} function; the result returned by this function is used as the return value from the \c main() function. At this point, - it becomes apparent why we instanciated \c AddressBook on the stack: It + it becomes apparent why we instantiated \c AddressBook on the stack: It will now go out of scope. Therefore, \c AddressBook and all its child widgets will be deleted, thus preventing memory leaks. */ diff --git a/examples/widgets/doc/src/charactermap.qdoc b/examples/widgets/doc/src/charactermap.qdoc index 639640cad92..ee6162302f8 100644 --- a/examples/widgets/doc/src/charactermap.qdoc +++ b/examples/widgets/doc/src/charactermap.qdoc @@ -171,7 +171,7 @@ QScrollArea provides a viewport onto the \c CharacterWidget when we set its widget and handles much of the work needed to provide a scrolling viewport. -The font combo box is automatically popuplated with a list of available +The font combo box is automatically populated with a list of available fonts. We list the available styles for the current font in the style combobox using the following function: diff --git a/examples/widgets/doc/src/collidingmice-example.qdoc b/examples/widgets/doc/src/collidingmice-example.qdoc index 1d0edd1cebd..4f6859406ea 100644 --- a/examples/widgets/doc/src/collidingmice-example.qdoc +++ b/examples/widgets/doc/src/collidingmice-example.qdoc @@ -137,7 +137,7 @@ Because the complexity of arbitrary shape-shape intersection grows with an order of magnitude when the shapes are complex, this - operation can be noticably time consuming. An alternative approach + operation can be noticeably time consuming. An alternative approach is to reimplement the \l {QGraphicsItem::collidesWithItem()}{collidesWithItem()} function to provide your own custom item and shape collision algorithm. diff --git a/examples/widgets/doc/src/dragdroprobot.qdoc b/examples/widgets/doc/src/dragdroprobot.qdoc index 60977803fea..ca62bf73dfd 100644 --- a/examples/widgets/doc/src/dragdroprobot.qdoc +++ b/examples/widgets/doc/src/dragdroprobot.qdoc @@ -295,7 +295,7 @@ This snippet has a somewhat random outcome: once in a while, a special image is assigned to the drag object's mime data. The pixmap is also - assiged as the drag object's pixmap. This will ensure that you can see the + assigned as the drag object's pixmap. This will ensure that you can see the image that is being dragged as a pixmap under the mouse cursor. \snippet graphicsview/dragdroprobot/coloritem.cpp 7 diff --git a/examples/widgets/doc/src/editabletreemodel.qdoc b/examples/widgets/doc/src/editabletreemodel.qdoc index 347fec5db7d..9616610758d 100644 --- a/examples/widgets/doc/src/editabletreemodel.qdoc +++ b/examples/widgets/doc/src/editabletreemodel.qdoc @@ -84,7 +84,7 @@ \l{TreeItem::data}{data()} function to read entries in the \c itemData list and a \l{TreeItem::setData}{setData()} function to allow them to be modified. - As with other functions in the item, this simplifies the implemention + As with other functions in the item, this simplifies the implementation of the model's \l{QAbstractItemModel::}{data()} and \l{QAbstractItemModel::}{setData()} functions. diff --git a/examples/widgets/doc/src/elasticnodes.qdoc b/examples/widgets/doc/src/elasticnodes.qdoc index fd01e36c20f..fbe506468a4 100644 --- a/examples/widgets/doc/src/elasticnodes.qdoc +++ b/examples/widgets/doc/src/elasticnodes.qdoc @@ -331,7 +331,7 @@ collection of small items that all move around, it's unnecessary for Graphics View to waste time finding accurate update regions, so we set the QGraphicsView::BoundingRectViewportUpdate viewport update mode. The default - would work fine, but this mode is noticably faster for this example. + would work fine, but this mode is noticeably faster for this example. To improve rendering quality, we set QPainter::Antialiasing. diff --git a/examples/widgets/doc/src/findfiles.qdoc b/examples/widgets/doc/src/findfiles.qdoc index bb69c4d5656..bed831d14d0 100644 --- a/examples/widgets/doc/src/findfiles.qdoc +++ b/examples/widgets/doc/src/findfiles.qdoc @@ -218,7 +218,7 @@ \snippet dialogs/findfiles/window.cpp 10 The private \c createComboBox() function is also called from the - contructor. We create a QComboBox with the given text, and make it + constructor. We create a QComboBox with the given text, and make it editable. When the user enters a new string in an editable combobox, the diff --git a/examples/widgets/doc/src/fridgemagnets.qdoc b/examples/widgets/doc/src/fridgemagnets.qdoc index c3588e812f9..fccadd3b717 100644 --- a/examples/widgets/doc/src/fridgemagnets.qdoc +++ b/examples/widgets/doc/src/fridgemagnets.qdoc @@ -67,7 +67,7 @@ constructor, or by using the \l{QPainter::}{begin()} method as we do in this example. The \l{QPainter::}{end()} method deactivates it. Note that the latter function is called automatically upon - destruction when the painter is actived by its constructor. The + destruction when the painter is activated by its constructor. The QPainter::Antialiasing render hint ensures that the paint engine will antialias the edges of primitives if possible. diff --git a/examples/widgets/doc/src/frozencolumn.qdoc b/examples/widgets/doc/src/frozencolumn.qdoc index f7796fac7cd..54040bc9e1c 100644 --- a/examples/widgets/doc/src/frozencolumn.qdoc +++ b/examples/widgets/doc/src/frozencolumn.qdoc @@ -10,7 +10,7 @@ \image frozencolumn-example.png "Screenshot of the example" We use Qt's model/view framework to implement a table with its first - column frozen. This technique can be aplied to several columns or rows, + column frozen. This technique can be applied to several columns or rows, as long as they are on the edge of the table. The model/view framework allows for one model to be displayed in different diff --git a/examples/widgets/doc/src/tablet.qdoc b/examples/widgets/doc/src/tablet.qdoc index 0ec62f2eebc..efbb769e647 100644 --- a/examples/widgets/doc/src/tablet.qdoc +++ b/examples/widgets/doc/src/tablet.qdoc @@ -305,7 +305,7 @@ receive tablet proximity events and forward them to \c TabletCanvas. The \c TabletEnterProximity and \c TabletLeaveProximity events are sent to the QApplication object, while other tablet events are sent to the QWidget's - \c event() hander, which sends them on to \l{QWidget::}{tabletEvent()}. + \c event() handler, which sends them on to \l{QWidget::}{tabletEvent()}. \section1 TabletApplication Class Implementation diff --git a/examples/widgets/doc/src/tooltips.qdoc b/examples/widgets/doc/src/tooltips.qdoc index e0b17d2fd9a..4712c808516 100644 --- a/examples/widgets/doc/src/tooltips.qdoc +++ b/examples/widgets/doc/src/tooltips.qdoc @@ -178,7 +178,7 @@ making each shape item appear at its defined position. But remember to translate the coordinate system back when the item is drawn, otherwise the next shape item will appear at a position - relative to the item we drawed last. + relative to the item drawn last. \snippet widgets/tooltips/sortingbox.cpp 10 diff --git a/examples/widgets/doc/src/transformations.qdoc b/examples/widgets/doc/src/transformations.qdoc index 3d085efbd21..aabb672b86a 100644 --- a/examples/widgets/doc/src/transformations.qdoc +++ b/examples/widgets/doc/src/transformations.qdoc @@ -48,8 +48,8 @@ coordinate system around the origin (called shearing) using the QPainter::shear() function. - All the tranformation operations operate on QPainter's - tranformation matrix that you can retrieve using the + All the transformation operations operate on QPainter's + transformation matrix that you can retrieve using the QPainter::worldTransform() function. A matrix transforms a point in the plane to another point. For more information about the transformation matrix, see the \l {Coordinate System} and @@ -265,11 +265,11 @@ \snippet painting/transformations/window.cpp 1 Then we create the \c RenderArea widgets that will render their - shapes with coordinate tranformations. By default the applied + shapes with coordinate transformations. By default the applied operation is \uicontrol {No Transformation}, i.e. the shapes are rendered within the default coordinate system. We create and initialize the associated \l {QComboBox}es with items - corresponding to the various transformation operations decribed by + corresponding to the various transformation operations described by the global \c Operation enum. We also connect the \l {QComboBox}es' \l @@ -335,10 +335,10 @@ also has good support for coordinate transformations. With the Transformations application you can scale, rotate and translate QPainter's coordinate system. The order in which these - tranformations are applied is essential for the result. + transformations are applied is essential for the result. - All the tranformation operations operate on QPainter's - tranformation matrix. For more information about the + All the transformation operations operate on QPainter's + transformation matrix. For more information about the transformation matrix, see the \l {Coordinate System} and QTransform documentation. diff --git a/examples/widgets/richtext/textedit/example.html b/examples/widgets/richtext/textedit/example.html index ca3dce23cc6..ebae3362e90 100644 --- a/examples/widgets/richtext/textedit/example.html +++ b/examples/widgets/richtext/textedit/example.html @@ -78,7 +78,7 @@ hr { height: 1px; border-width: 0; }
Try adding text to the cells in the table and experiment with the alignment of the paragraphs.
QTextEdit is designed to support hyperlinks between documents, and this feature is used extensively in Qt Assistant. Hyperlinks are automatically created when an HTML file is imported into an editor. Since the rich text framework supports hyperlinks natively, they can also be created programatically.
+QTextEdit is designed to support hyperlinks between documents, and this feature is used extensively in Qt Assistant. Hyperlinks are automatically created when an HTML file is imported into an editor. Since the rich text framework supports hyperlinks natively, they can also be created programmatically.
Full support for undo and redo operations is built into QTextEdit and the underlying rich text framework. Operations on a document can be packaged together to make editing a more comfortable experience for the user.
Try making changes to this document and press Ctrl+Z to undo them. You can always recover the original contents of the document.