diff options
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/doc/src/qtquick.qdoc | 2 | ||||
-rw-r--r-- | src/quick/doc/src/whatsnew.qdoc | 4 | ||||
-rw-r--r-- | src/quick/items/qquickitem.cpp | 2 | ||||
-rw-r--r-- | src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/doc/src/qtquick.qdoc b/src/quick/doc/src/qtquick.qdoc index 883b5c4a6c..5f7ff48bb2 100644 --- a/src/quick/doc/src/qtquick.qdoc +++ b/src/quick/doc/src/qtquick.qdoc @@ -57,7 +57,7 @@ and dynamic user interface. It enables user interfaces to be built around the behavior of user interface components and how they connect with one another, and it provides a visual canvas with its own coordinate system and rendering engine. Animation and transition effects are a first class concept in Qt Quick, -and visual effects can be supplemented through specialised components for +and visual effects can be supplemented through specialized components for particle and shader effects. \list diff --git a/src/quick/doc/src/whatsnew.qdoc b/src/quick/doc/src/whatsnew.qdoc index 16df2a6d0d..f50e80edf6 100644 --- a/src/quick/doc/src/whatsnew.qdoc +++ b/src/quick/doc/src/whatsnew.qdoc @@ -258,7 +258,7 @@ the window loses focus. \endlist \endlist -\section2 Specialised Containers +\section2 Specialized Containers \list \li Flickable: @@ -365,7 +365,7 @@ the window loses focus. \li \l Loader: \list \li New \l{Loader::}{asynchronous} property allows components to be instantiated with lower - chance of blocking. If source is used with \e {asynchonous: true} the component will be compiled in + chance of blocking. If source is used with \e {asynchronous: true} the component will be compiled in a background thread. \li New \l{Loader::}{active} property can delay instantiation of a \l Loader object's \l{Loader::}{item}. diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 3b63028a2e..7020f810ca 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -3342,7 +3342,7 @@ void QQuickItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeo \warning This function is called on the render thread. This means any QObjects or thread local storage that is created will have affinity to the render thread, so apply caution when doing anything other than rendering - in this function. Similarily for signals, these will be emitted on the render + in this function. Similarly for signals, these will be emitted on the render thread and will thus often be delivered via queued connections. \sa QSGMaterial, QSGSimpleMaterial, QSGGeometryNode, QSGGeometry, diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp index 30081093f2..46ff4750de 100644 --- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp +++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp @@ -1736,7 +1736,7 @@ void Renderer::uploadBatch(Batch *b) if (iCount == 0) iCount = eg->vertexCount(); // merged Triangle strips need to contain degenerate triangles at the beginning and end. - // One could save 2 ushorts here by ditching the the padding for the front of the + // One could save 2 ushorts here by ditching the padding for the front of the // first and the end of the last, but for simplicity, we simply don't care. if (g->drawingMode() == GL_TRIANGLE_STRIP) iCount += sizeof(quint16); |