diff options
Diffstat (limited to 'src/quick/items')
| -rw-r--r-- | src/quick/items/context2d/qquickcanvasitem.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickanimatedsprite.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickitemviewtransition.cpp | 4 | ||||
| -rw-r--r-- | src/quick/items/qquicksprite.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickspriteengine.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickthreadedwindowmanager.cpp | 4 | ||||
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp index 5a29928c2b..9b81f9221a 100644 --- a/src/quick/items/context2d/qquickcanvasitem.cpp +++ b/src/quick/items/context2d/qquickcanvasitem.cpp @@ -951,7 +951,7 @@ bool QQuickCanvasItem::isImageLoading(const QUrl& url) const } /*! \qmlmethod QtQuick2::Canvas::isImageLoaded(url image) - Returns true if the \a image is sucessfully loaded and ready to use. + Returns true if the \a image is successfully loaded and ready to use. \sa loadImage() */ diff --git a/src/quick/items/qquickanimatedsprite.cpp b/src/quick/items/qquickanimatedsprite.cpp index 0b82e66dc2..a7d07589a9 100644 --- a/src/quick/items/qquickanimatedsprite.cpp +++ b/src/quick/items/qquickanimatedsprite.cpp @@ -319,7 +319,7 @@ struct AnimatedSpriteVertices { \qmlproperty bool QtQuick2::AnimatedSprite::frameSync If true, then the animation will have no duration. Instead, the animation will advance - one frame each time a frame is rendered to the screen. This syncronizes it with the painting + one frame each time a frame is rendered to the screen. This synchronizes it with the painting rate as opposed to elapsed time. If frameSync is set to true, it overrides both frameRate and frameDuration. diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 12474fd53e..d955d09bee 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -401,7 +401,7 @@ void QQuickItemKeyFilter::componentComplete() KeyNavigation will implicitly set the other direction to return focus to this item. So if you set \l left to another item, \l right will be set on that item's KeyNavigation to set focus back to this item. However, if that item's KeyNavigation has had right explicitly set then no change will occur. - This means that the above example could have been written, with the same behaviour, without specifing + This means that the above example could have been written, with the same behaviour, without specifying KeyNavigation.right or KeyNavigation.down for any of the items. \sa {Keys}{Keys attached property} diff --git a/src/quick/items/qquickitemviewtransition.cpp b/src/quick/items/qquickitemviewtransition.cpp index 6fd5404cd9..a5359cb49d 100644 --- a/src/quick/items/qquickitemviewtransition.cpp +++ b/src/quick/items/qquickitemviewtransition.cpp @@ -606,7 +606,7 @@ QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent) View transitions have access to a ViewTransition attached property that provides details of the items that are under transition and the operation that triggered the - transition. Since view transitions are run once per item, these details can be used to customise + transition. Since view transitions are run once per item, these details can be used to customize each transition for each individual item. The ViewTransition attached property provides the following properties specific to the item to @@ -663,7 +663,7 @@ QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent) At its simplest, a view transition may just animate an item to its new position following a view operation, just as the \c displaced transition does above, or animate some item properties, as in the \c add transition above. Additionally, a view transition may make use of the - ViewTransition attached property to customise animation behavior for different items. Following + ViewTransition attached property to customize animation behavior for different items. Following are some examples of how this can be achieved. diff --git a/src/quick/items/qquicksprite.cpp b/src/quick/items/qquicksprite.cpp index d86b810d4a..b171b855ae 100644 --- a/src/quick/items/qquicksprite.cpp +++ b/src/quick/items/qquicksprite.cpp @@ -197,7 +197,7 @@ QT_BEGIN_NAMESPACE \qmlproperty bool QtQuick2::Sprite::frameSync If true, then the animation will have no duration. Instead, the animation will advance - one frame each time a frame is rendered to the screen. This syncronizes it with the painting + one frame each time a frame is rendered to the screen. This synchronizes it with the painting rate as opposed to elapsed time. If frameSync is set to true, it overrides all of duration, frameRate and frameDuration. diff --git a/src/quick/items/qquickspriteengine.cpp b/src/quick/items/qquickspriteengine.cpp index 724d1343f0..1a6c9e5f3f 100644 --- a/src/quick/items/qquickspriteengine.cpp +++ b/src/quick/items/qquickspriteengine.cpp @@ -676,7 +676,7 @@ int QQuickStochasticEngine::goalSeek(int curIdx, int spriteIdx, int dist) goalName = m_globalGoal; if (goalName.isEmpty()) return -1; - //TODO: caching instead of excessively redoing iterative deepening (which was chosen arbitarily anyways) + //TODO: caching instead of excessively redoing iterative deepening (which was chosen arbitrarily anyways) // Paraphrased - implement in an *efficient* manner for (int i=0; i<m_states.count(); i++) if (m_states[curIdx]->name() == goalName) diff --git a/src/quick/items/qquickthreadedwindowmanager.cpp b/src/quick/items/qquickthreadedwindowmanager.cpp index d654e3ac77..3bc7211396 100644 --- a/src/quick/items/qquickthreadedwindowmanager.cpp +++ b/src/quick/items/qquickthreadedwindowmanager.cpp @@ -358,7 +358,7 @@ void QQuickRenderThreadSingleContextWindowManager::run() isPostingSyncEvent = true; #ifdef THREAD_DEBUG - printf(" RenderThread: aquired sync lock...\n"); + printf(" RenderThread: acquired sync lock...\n"); #endif QCoreApplication::postEvent(this, new QEvent(QEvent_Sync)); @@ -641,7 +641,7 @@ void QQuickRenderThreadSingleContextWindowManager::lockInGui() lock(); #ifdef THREAD_DEBUG - printf("GUI: aquired lock... level=%d\n", isGuiLocked); + printf("GUI: acquired lock... level=%d\n", isGuiLocked); #endif } diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index c761b38d23..88aff07f9d 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -2699,7 +2699,7 @@ bool QQuickWindow::clearBeforeRendering() const initialized. \warning The returned texture is not memory managed by the scene graph and - must be explicitely deleted by the caller on the rendering thread. + must be explicitly deleted by the caller on the rendering thread. This is acheived by deleting the texture from a QSGNode destructor or by using deleteLater() in the case where the texture already has affinity to the rendering thread. |