diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-09-08 17:39:02 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-10 12:26:28 +0200 |
| commit | 5b4c2f5910052159443f707de2071f63e83b5a5d (patch) | |
| tree | fc561f8bdebea3c941610b9addcfb9d3666c64ae /src/quick | |
| parent | 4ec2d5a489b922beb16fcd1cdf8199a862244ebb (diff) | |
doc: fix some more typos
Change-Id: I7fa055049b9e5900d597754c6004febb153de12b
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 2 | ||||
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgmaterial.cpp | 2 | ||||
| -rw-r--r-- | src/quick/util/qquicklistcompositor.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 88aff07f9d..3b97750899 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -1468,7 +1468,7 @@ void QQuickWindow::wheelEvent(QWheelEvent *event) qWarning() << "QQuickWindow::wheelEvent()" << event->pixelDelta() << event->angleDelta(); #endif - //if the actual wheel event was accepted, accept the compatability wheel event and return early + //if the actual wheel event was accepted, accept the compatibility wheel event and return early if (d->lastWheelEventAccepted && event->angleDelta().isNull()) return; diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.cpp b/src/quick/scenegraph/coreapi/qsgmaterial.cpp index 8d37992928..78c9c80ce1 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterial.cpp +++ b/src/quick/scenegraph/coreapi/qsgmaterial.cpp @@ -85,7 +85,7 @@ QT_BEGIN_NAMESPACE The attributeNames() returns the name of the attributes used in the vertexShader(). These are used in the default implementation of - activate() and deactive() to decide whice vertex registers are enabled. + activate() and deactivate() to decide whice vertex registers are enabled. The initialize() function is called during program creation to allow subclasses to prepare for use, such as resolve uniform names in the diff --git a/src/quick/util/qquicklistcompositor.cpp b/src/quick/util/qquicklistcompositor.cpp index b728874270..4266ddd6e0 100644 --- a/src/quick/util/qquicklistcompositor.cpp +++ b/src/quick/util/qquicklistcompositor.cpp @@ -75,7 +75,7 @@ QT_BEGIN_NAMESPACE membership can be changed with the setFlags() and clearFlags() functions, and the position of items in the compositor can be changed with the move() function. Each of these functions optionally returns a list of the changes made to indexes within each group which can then - be propogated to view so that it can correctly refresh its contents; e.g. 3 items + be propagated to view so that it can correctly refresh its contents; e.g. 3 items removed at index 6, and 5 items inserted at index 1. The notification changes are always ordered from the start of the list to the end and accumulate, so if 5 items are removed at index 4, one is skipped and then 3 move are removed, the changes returned are 5 items removed |