summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergio Ahumada <sahumada@blackberry.com>2014-03-03 16:42:57 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-03 16:54:59 +0100
commit955df6445ada9a8b0302c88c828b1c19b6c962e5 (patch)
tree0902dac5dad4b70a8d918ee030c9531d1069e4bb
parenta0dccdd0ac7be39d8cdb8aa1f12c1771b11213ae (diff)
downloadqtquickcontrols-955df6445ada9a8b0302c88c828b1c19b6c962e5.tar.gz
Fix some typos
Change-Id: Ic2e2060b57b0d74e96d6aad0ceff4679d986a26c Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
-rw-r--r--examples/quick/controls/touch/content/ButtonPage.qml2
-rw-r--r--src/controls/StackView.qml2
-rw-r--r--tests/manual/testbench/content/PropertyLayouts.qml2
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/quick/controls/touch/content/ButtonPage.qml b/examples/quick/controls/touch/content/ButtonPage.qml
index 8cf1dad5..90a8a69c 100644
--- a/examples/quick/controls/touch/content/ButtonPage.qml
+++ b/examples/quick/controls/touch/content/ButtonPage.qml
@@ -83,7 +83,7 @@ Item {
Button {
anchors.margins: 20
style: touchStyle
- text: "Dont press me"
+ text: "Don't press me"
onClicked: if (stackView) stackView.pop()
}
diff --git a/src/controls/StackView.qml b/src/controls/StackView.qml
index 2397e5e4..11e2d182 100644
--- a/src/controls/StackView.qml
+++ b/src/controls/StackView.qml
@@ -819,7 +819,7 @@ Item {
/*! \internal */
function __resolveComponent(unknownObjectType, element)
{
- // We need this extra resolve function since we dont really
+ // We need this extra resolve function since we don't really
// know what kind of object the user pushed. So we try to
// figure it out by inspecting the object:
if (unknownObjectType.hasOwnProperty("createObject")) {
diff --git a/tests/manual/testbench/content/PropertyLayouts.qml b/tests/manual/testbench/content/PropertyLayouts.qml
index ef569757..2f7718af 100644
--- a/tests/manual/testbench/content/PropertyLayouts.qml
+++ b/tests/manual/testbench/content/PropertyLayouts.qml
@@ -91,7 +91,7 @@ QtObject {
onValueChanged: {
if (!ignoreUpdate) {
loader.item[name] = value
- if (name != "width" && name != "height") // We dont want to reset size when size changes
+ if (name != "width" && name != "height") // We don't want to reset size when size changes
propertyChanged()
}
}