aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/doc/src/qmllanguageref
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 /src/qml/doc/src/qmllanguageref
parent5a06bc73822576cb9ffceb243f43f6b28fd6b4dc (diff)
Fix some typos
Change-Id: Iea540b768232ea423ea7f04e41655198931cf36d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/qml/doc/src/qmllanguageref')
-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
4 files changed, 5 insertions, 5 deletions
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