From f4be00df17b02bab2bd91d68ec7315a717a5a7e8 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Thu, 6 Sep 2012 22:53:50 +0200 Subject: [PATCH] doc: fix some typos in .qml files Change-Id: Ice5d60b06ec9ab81fbd98fd1679c8834f3018938 Reviewed-by: Robin Burchell --- examples/particles/customparticle/customparticle.qml | 2 +- examples/particles/imageparticle/content/sharing.qml | 2 +- examples/particles/system/system.qml | 2 +- examples/quick/modelviews/listview/highlight.qml | 2 +- examples/quick/text/text.qml | 2 +- src/imports/testlib/TestCase.qml | 2 +- tests/auto/qml/qqmlconsole/data/logging.qml | 2 +- tests/auto/qml/qqmlecmascript/data/scarceResourceTestMultiple.var.qml | 2 +- .../auto/qml/qqmlecmascript/data/scarceResourceTestMultiple.variant.qml | 2 +- tests/auto/qml/qqmlecmascript/data/scarceResourceTestPreserve.var.qml | 2 +- .../auto/qml/qqmlecmascript/data/scarceResourceTestPreserve.variant.qml | 2 +- tests/auto/qml/qqmlqt/data/darker.qml | 2 +- tests/auto/qml/qqmlqt/data/lighter.qml | 2 +- tests/auto/quick/qquickcanvasitem/data/tst_composite.qml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/examples/particles/customparticle/customparticle.qml b/examples/particles/customparticle/customparticle.qml index cb2972b..eb4f772 100644 --- a/examples/particles/customparticle/customparticle.qml +++ b/examples/particles/customparticle/customparticle.qml @@ -53,7 +53,7 @@ import "../../shared" as Examples Blur Particles adds a blur effect to the particles, which increases over the particle's life time. It uses a custom vertex shader: \snippet examples/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 examples/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/particles/imageparticle/content/sharing.qml b/examples/particles/imageparticle/content/sharing.qml index 3fe50c8..19d3790 100644 --- a/examples/particles/imageparticle/content/sharing.qml +++ b/examples/particles/imageparticle/content/sharing.qml @@ -78,7 +78,7 @@ Rectangle { } } - // Define a highlight with customised movement between items. + // Define a highlight with customized movement between items. Component { id: highlightBar Rectangle { diff --git a/examples/particles/system/system.qml b/examples/particles/system/system.qml index acc9870..2177f60 100644 --- a/examples/particles/system/system.qml +++ b/examples/particles/system/system.qml @@ -56,7 +56,7 @@ import "../../shared" as Examples Start and Stop simply sets the running and paused states of a ParticleSystem. While the system does not perform any simulation when stopped or paused, a restart restarts the simulation from the beginning, while unpausing resumes the simulation from where it was. - Timed group changes is an example that highlights the ParticleGroup element. While normally referring to groups with a string name is sufficent, additional effects can be + Timed group changes is an example that highlights the ParticleGroup element. While normally referring to groups with a string name is sufficient, additional effects can be done by setting properties on groups. The first group has a variable duration on it, but always transitions to the second group. \snippet examples/particles/system/content/timedgroupchanges.qml 0 diff --git a/examples/quick/modelviews/listview/highlight.qml b/examples/quick/modelviews/listview/highlight.qml index 3f2a3dc..452d6c9 100644 --- a/examples/quick/modelviews/listview/highlight.qml +++ b/examples/quick/modelviews/listview/highlight.qml @@ -77,7 +77,7 @@ Rectangle { } //! [0] - // Define a highlight with customised movement between items. + // Define a highlight with customized movement between items. Component { id: highlightBar Rectangle { diff --git a/examples/quick/text/text.qml b/examples/quick/text/text.qml index 06d10e6..4b11b93 100644 --- a/examples/quick/text/text.qml +++ b/examples/quick/text/text.qml @@ -79,7 +79,7 @@ import "../../shared" the tag. 'Text Layout' shows how to create a more complex layout for a text element. - This example lays out the text in two colums using the onLineLaidOut handler + This example lays out the text in two columns using the onLineLaidOut handler that allows you to position and resize each line: \snippet examples/quick/text/styledtext-layout.qml layout */ diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml index 79c68a7..9d6bdba 100644 --- a/src/imports/testlib/TestCase.qml +++ b/src/imports/testlib/TestCase.qml @@ -427,7 +427,7 @@ Item { delay = -1 mousePress(item, x, y, button, modifiers, delay) - //trigger draging + //trigger dragging mouseMove(item, x + util.dragThreshold + 1, y + util.dragThreshold + 1, delay, button) mouseMove(item, x + dx, y + dy, delay, button) } diff --git a/tests/auto/qml/qqmlconsole/data/logging.qml b/tests/auto/qml/qqmlconsole/data/logging.qml index 11f11f4..0c3954d 100644 --- a/tests/auto/qml/qqmlconsole/data/logging.qml +++ b/tests/auto/qml/qqmlconsole/data/logging.qml @@ -46,7 +46,7 @@ QtObject { id:root function consoleCount() { - console.count("console.count", "Ignore additonal argument"); + console.count("console.count", "Ignore additional argument"); console.count(); } diff --git a/tests/auto/qml/qqmlecmascript/data/scarceResourceTestMultiple.var.qml b/tests/auto/qml/qqmlecmascript/data/scarceResourceTestMultiple.var.qml index 5e6c2d9..7b30b84 100644 --- a/tests/auto/qml/qqmlecmascript/data/scarceResourceTestMultiple.var.qml +++ b/tests/auto/qml/qqmlecmascript/data/scarceResourceTestMultiple.var.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 import Qt.test 1.0 import "scarceResourceTest.var.js" as ScarceResourceProviderJs -// In this case, multiple scarce resource are explicity preserved +// In this case, multiple scarce resource are explicitly preserved // and then explicitly destroyed, while others are automatically // managed. Since none are manually preserved without subsequently // being destroyed, after the evaluation of the binding the diff --git a/tests/auto/qml/qqmlecmascript/data/scarceResourceTestMultiple.variant.qml b/tests/auto/qml/qqmlecmascript/data/scarceResourceTestMultiple.variant.qml index 2970bcb..4b9ff84 100644 --- a/tests/auto/qml/qqmlecmascript/data/scarceResourceTestMultiple.variant.qml +++ b/tests/auto/qml/qqmlecmascript/data/scarceResourceTestMultiple.variant.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 import Qt.test 1.0 import "scarceResourceTest.variant.js" as ScarceResourceProviderJs -// In this case, multiple scarce resource are explicity preserved +// In this case, multiple scarce resource are explicitly preserved // and then explicitly destroyed, while others are automatically // managed. Since none are manually preserved without subsequently // being destroyed, after the evaluation of the binding the diff --git a/tests/auto/qml/qqmlecmascript/data/scarceResourceTestPreserve.var.qml b/tests/auto/qml/qqmlecmascript/data/scarceResourceTestPreserve.var.qml index 9e9495c..786f38e 100644 --- a/tests/auto/qml/qqmlecmascript/data/scarceResourceTestPreserve.var.qml +++ b/tests/auto/qml/qqmlecmascript/data/scarceResourceTestPreserve.var.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 import Qt.test 1.0 import "scarceResourceTest.var.js" as ScarceResourceProviderJs -// In this case, the scarce resource is explicity preserved. +// In this case, the scarce resource is explicitly preserved. // It should not be automatically released after the evaluation // of the binding is complete, but instead will be kept in // memory until the JS garbage collector runs. diff --git a/tests/auto/qml/qqmlecmascript/data/scarceResourceTestPreserve.variant.qml b/tests/auto/qml/qqmlecmascript/data/scarceResourceTestPreserve.variant.qml index 022067b..a27dab3 100644 --- a/tests/auto/qml/qqmlecmascript/data/scarceResourceTestPreserve.variant.qml +++ b/tests/auto/qml/qqmlecmascript/data/scarceResourceTestPreserve.variant.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 import Qt.test 1.0 import "scarceResourceTest.variant.js" as ScarceResourceProviderJs -// In this case, the scarce resource is explicity preserved. +// In this case, the scarce resource is explicitly preserved. // It should not be automatically released after the evaluation // of the binding is complete, but instead will be kept in // memory until the JS garbage collector runs. diff --git a/tests/auto/qml/qqmlqt/data/darker.qml b/tests/auto/qml/qqmlqt/data/darker.qml index ce6c705..ce6dea0 100644 --- a/tests/auto/qml/qqmlqt/data/darker.qml +++ b/tests/auto/qml/qqmlqt/data/darker.qml @@ -5,7 +5,7 @@ QtObject { property variant test2: Qt.darker() property variant test3: Qt.darker(Qt.rgba(1, 0.8, 0.3), 2.8) property variant test4: Qt.darker("red"); - property variant test5: Qt.darker("perfectred"); // Non-existant color + property variant test5: Qt.darker("perfectred"); // Non-existent color property variant test6: Qt.darker(10); property variant test7: Qt.darker(Qt.rgba(1, 0.8, 0.3), 2.8, 10) } diff --git a/tests/auto/qml/qqmlqt/data/lighter.qml b/tests/auto/qml/qqmlqt/data/lighter.qml index 7db5e1e..bf57e08 100644 --- a/tests/auto/qml/qqmlqt/data/lighter.qml +++ b/tests/auto/qml/qqmlqt/data/lighter.qml @@ -5,7 +5,7 @@ QtObject { property variant test2: Qt.lighter() property variant test3: Qt.lighter(Qt.rgba(1, 0.8, 0.3), 1.8) property variant test4: Qt.lighter("red"); - property variant test5: Qt.lighter("perfectred"); // Non-existant color + property variant test5: Qt.lighter("perfectred"); // Non-existent color property variant test6: Qt.lighter(10); property variant test7: Qt.lighter(Qt.rgba(1, 0.8, 0.3), 1.8, 5) } diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_composite.qml b/tests/auto/quick/qquickcanvasitem/data/tst_composite.qml index 3e41efd..8a5a52c 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_composite.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_composite.qml @@ -53,7 +53,7 @@ CanvasTestCase { ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); - ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations + ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimizations ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); //comparePixel(ctx, 50,25, 2,253,0,255, 2); -- 2.7.4