aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Ahumada <sahumada@blackberry.com>2014-03-03 17:28:30 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-03 17:39:17 +0100
commite525b727f29adad1df3a6a81d6bba7c4617f78ba (patch)
treeb9bb46acffaaeae06e72de9dd7a5737c986a4190
parent5a06bc73822576cb9ffceb243f43f6b28fd6b4dc (diff)
Fix some typos
Change-Id: Iea540b768232ea423ea7f04e41655198931cf36d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
-rw-r--r--examples/quick/customitems/slideswitch/doc/src/example-slideswitch.qdoc2
-rw-r--r--examples/quick/particles/customparticle/doc/src/customparticle.qdoc2
-rw-r--r--examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc2
-rw-r--r--src/qml/compiler/qv4codegen.cpp2
-rw-r--r--src/qml/doc/src/cppintegration/definetypes.qdoc2
-rw-r--r--src/qml/doc/src/cppintegration/exposecppattributes.qdoc2
-rw-r--r--src/qml/doc/src/qmllanguageref/documents/networktransparency.qdoc4
-rw-r--r--src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc2
-rw-r--r--src/qml/doc/src/qmllanguageref/syntax/signals.qdoc2
-rw-r--r--src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc2
-rw-r--r--src/qml/jsruntime/qv4mm_p.h2
-rw-r--r--src/quick/doc/src/qtquick.qdoc2
-rw-r--r--src/quick/doc/src/whatsnew.qdoc4
-rw-r--r--src/quick/items/qquickitem.cpp2
-rw-r--r--src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp2
15 files changed, 17 insertions, 17 deletions
diff --git a/examples/quick/customitems/slideswitch/doc/src/example-slideswitch.qdoc b/examples/quick/customitems/slideswitch/doc/src/example-slideswitch.qdoc
index 13df390ef5..08785c71fc 100644
--- a/examples/quick/customitems/slideswitch/doc/src/example-slideswitch.qdoc
+++ b/examples/quick/customitems/slideswitch/doc/src/example-slideswitch.qdoc
@@ -56,7 +56,7 @@ The objects that compose the switch are:
\snippet customitems/slideswitch/content/Switch.qml 1
This property is the interface of the switch. By default, the switch is off and this property is \c false.
-It can be used to activate/disactivate the switch or to query its current state.
+It can be used to activate/deactivate the switch or to query its current state.
In this example:
diff --git a/examples/quick/particles/customparticle/doc/src/customparticle.qdoc b/examples/quick/particles/customparticle/doc/src/customparticle.qdoc
index fb53a67831..8d496b7d52 100644
--- a/examples/quick/particles/customparticle/doc/src/customparticle.qdoc
+++ b/examples/quick/particles/customparticle/doc/src/customparticle.qdoc
@@ -37,7 +37,7 @@
Blur Particles adds a blur effect to the particles, which increases over the particle's life time.
It uses a custom vertex shader:
\snippet particles/customparticle/content/blurparticles.qml vertex
- to propagate life time simulation to a custom fragement shader:
+ to propagate life time simulation to a custom fragment shader:
\snippet particles/customparticle/content/blurparticles.qml fragment
which has access to both the normal image sampler and a blurred sampler, the image plus a ShaderEffect.
diff --git a/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
index ea94a4bc39..5088fd7665 100644
--- a/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
+++ b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
@@ -56,7 +56,7 @@
\snippet particles/imageparticle/content/sharing.qml 1
Note that because it sets the color and alpha in this ImageParticle, it renders the particles in a different color.
Since it doesn't specify anything about the rotation, it shares the rotation with the other ImageParticle so that the flowers are rotated the same way in both.
- Note that you can undo rotation in another ImageParticle, you just need to explicity set rotationVariation to 0.
+ Note that you can undo rotation in another ImageParticle, you just need to explicitly set rotationVariation to 0.
Sprites demonstrates using an image particle to render animated sprites instead of static images for each particle.
*/
diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index f08ebaf6cd..504edfcd36 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -2562,7 +2562,7 @@ bool Codegen::visit(TryStatement *ast)
IR::BasicBlock *surroundingExceptionHandler = exceptionHandler();
// We always need a finally body to clean up the exception handler
- // exceptions thrown in finally get catched by the surrounding catch block
+ // exceptions thrown in finally get caught by the surrounding catch block
IR::BasicBlock *finallyBody = 0;
IR::BasicBlock *catchBody = 0;
IR::BasicBlock *catchExceptionHandler = 0;
diff --git a/src/qml/doc/src/cppintegration/definetypes.qdoc b/src/qml/doc/src/cppintegration/definetypes.qdoc
index 187e4fc7b4..ac1a303ab0 100644
--- a/src/qml/doc/src/cppintegration/definetypes.qdoc
+++ b/src/qml/doc/src/cppintegration/definetypes.qdoc
@@ -167,7 +167,7 @@ shared across all contexts in an engine. QObject singleton type instances
are constructed and owned by the QQmlEngine, and will be destroyed when
the engine is destroyed.
-A QObject singleton type can be interacted with in a manner simlar to any
+A QObject singleton type can be interacted with in a manner similar to any
other QObject or instantiated type, except that only one (engine constructed
and owned) instance will exist, and it must be referenced by type name rather
than id. Q_PROPERTYs of QObject singleton types may be bound to, and Q_INVOKABLE
diff --git a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc
index 5d70cb5174..86715e93f1 100644
--- a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc
+++ b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc
@@ -65,7 +65,7 @@ demonstrated in the \l{Writing QML Extensions with C++} tutorial.
\section1 Data Type Handling and Ownership
Any data that is transferred from C++ to QML, whether as a property value, a
-method paramter or return value, or a signal parameter value, must be of a
+method parameter or return value, or a signal parameter value, must be of a
type that is supported by the QML engine.
By default, the engine supports a number of Qt C++ types and can automatically
diff --git a/src/qml/doc/src/qmllanguageref/documents/networktransparency.qdoc b/src/qml/doc/src/qmllanguageref/documents/networktransparency.qdoc
index ea46b3381e..481e449a01 100644
--- a/src/qml/doc/src/qmllanguageref/documents/networktransparency.qdoc
+++ b/src/qml/doc/src/qmllanguageref/documents/networktransparency.qdoc
@@ -27,7 +27,7 @@
/*!
\page qtqml-documents-networktransparency.html
\title Resource Loading and Network Transparency
-\brief about loading files and resources accross a network
+\brief about loading files and resources across a network
QML supports network transparency by using URLs (rather than file names) for all
references from a QML document to other content. This means that anywhere a URL source is expected,
@@ -122,7 +122,7 @@ or programs written with runtimes such as Python and Perl. That trust is establi
of a number of mechanisms, including the availability of package signing on some platforms.
In order to preserve the trust of users, QML application developers should not load
-and execute arbitary JavaScript or QML resources. For example, consider the QML code below:
+and execute arbitrary JavaScript or QML resources. For example, consider the QML code below:
\qml
import QtQuick 2.0
diff --git a/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc b/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc
index 88c866baf3..78b16a0a0d 100644
--- a/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc
+++ b/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc
@@ -155,7 +155,7 @@ plugin <Name> [<Path>]
same as the file name of the plugin binary, which is platform
dependent; e.g. the library \c MyAppTypes would produce
\c libMyAppTypes.so on Linux and \c MyAppTypes.dll on Windows.
- \li \c <Path> (optional) specifes either:
+ \li \c <Path> (optional) specifies either:
\list
\li an absolute path to the directory containing the plugin
file, or
diff --git a/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc b/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc
index b9f391e4dc..4f2351d564 100644
--- a/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc
+++ b/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc
@@ -29,7 +29,7 @@
\page qtqml-syntax-signals.html
\title Signal and Handler Event System
-\brief the event sytem in QML
+\brief the event system in QML
Application and user interface components need to communicate with each other. For
example, a button needs to know that the user has clicked on it.
diff --git a/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc b/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc
index 1d24acc31a..c1c2c0f5db 100644
--- a/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc
+++ b/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc
@@ -598,7 +598,7 @@ property is only invoked when the property is reassigned to a different object v
Since it is not possible to individually add or remove items from a list or
object stored in a \c variant, the only way to modify its contents is to
- reassign a new value. However, this is not efficent, as it causes the value
+ reassign a new value. However, this is not efficient, as it causes the value
to be serialized and deserialized.
Additionally, since \c items and \c attributes are not QML objects, changing
diff --git a/src/qml/jsruntime/qv4mm_p.h b/src/qml/jsruntime/qv4mm_p.h
index a8fd585332..67fc87330b 100644
--- a/src/qml/jsruntime/qv4mm_p.h
+++ b/src/qml/jsruntime/qv4mm_p.h
@@ -92,7 +92,7 @@ public:
~MemoryManager();
// TODO: this is only for 64bit (and x86 with SSE/AVX), so exend it for other architectures to be slightly more efficient (meaning, align on 8-byte boundaries).
- // Note: all occurances of "16" in alloc/dealloc are also due to the alignment.
+ // Note: all occurrences of "16" in alloc/dealloc are also due to the alignment.
static inline std::size_t align(std::size_t size)
{ return (size + 15) & ~0xf; }
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);