diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-03-25 10:11:02 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-25 10:11:02 +0100 |
| commit | cc7c4ba902ae6ab3b5eba80d7075ad8d6183a7ec (patch) | |
| tree | 3533a1dee0103a35e1881fe2e9c7a73f6f2d95de /src/controls/StackView.qml | |
| parent | 76dd99c448ae69cb12a0465facc5dd743b94e624 (diff) | |
| parent | ff5d39f0a8f34cdb034df703e7b2a769c945e1ed (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/controls/StackView.qml')
| -rw-r--r-- | src/controls/StackView.qml | 2 |
1 files changed, 1 insertions, 1 deletions
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")) { |