From 955df6445ada9a8b0302c88c828b1c19b6c962e5 Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sahumada@blackberry.com>
Date: Mon, 3 Mar 2014 16:42:57 +0100
Subject: [PATCH] Fix some typos
Change-Id: Ic2e2060b57b0d74e96d6aad0ceff4679d986a26c
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
---
examples/quick/controls/touch/content/ButtonPage.qml | 2 +-
src/controls/StackView.qml | 2 +-
tests/manual/testbench/content/PropertyLayouts.qml | 2 +-
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 8cf1dad5e..90a8a69c5 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 2397e5e40..11e2d1825 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 ef569757d..2f7718aff 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()
}
}
--
GitLab