diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-23 01:36:05 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-23 01:36:05 (GMT) |
| commit | 27f35a9cb588ad1dd595fafedc27e5a216bebf48 (patch) | |
| tree | 26aeebf20b725a340ad58b3411257fed7b626423 /doc/src/snippets | |
| parent | d7c472e23b678b2898d34a37166e61402818e271 (diff) | |
| parent | 14447cbbf7ee93e03286112b5b27d20961fd9551 (diff) | |
| download | Qt-27f35a9cb588ad1dd595fafedc27e5a216bebf48.zip Qt-27f35a9cb588ad1dd595fafedc27e5a216bebf48.tar.gz Qt-27f35a9cb588ad1dd595fafedc27e5a216bebf48.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'doc/src/snippets')
| -rw-r--r-- | doc/src/snippets/audio/main.cpp | 2 | ||||
| -rw-r--r-- | doc/src/snippets/code/src_corelib_statemachine_qstatemachine.cpp | 2 | ||||
| -rw-r--r-- | doc/src/snippets/declarative/drag.qml | 2 | ||||
| -rw-r--r-- | doc/src/snippets/declarative/mouseregion.qml | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/snippets/audio/main.cpp b/doc/src/snippets/audio/main.cpp index 019f208..e21bf75 100644 --- a/doc/src/snippets/audio/main.cpp +++ b/doc/src/snippets/audio/main.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the test suite of the Qt Toolkit. +** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/doc/src/snippets/code/src_corelib_statemachine_qstatemachine.cpp b/doc/src/snippets/code/src_corelib_statemachine_qstatemachine.cpp index a18971d..1b1abea 100644 --- a/doc/src/snippets/code/src_corelib_statemachine_qstatemachine.cpp +++ b/doc/src/snippets/code/src_corelib_statemachine_qstatemachine.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the test suite of the Qt Toolkit. +** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/doc/src/snippets/declarative/drag.qml b/doc/src/snippets/declarative/drag.qml index 8735d0c..8e5b599 100644 --- a/doc/src/snippets/declarative/drag.qml +++ b/doc/src/snippets/declarative/drag.qml @@ -6,7 +6,7 @@ Rectangle { Image { id: pic; source: "qtlogo-64.png"; anchors.verticalCenter: parent.verticalCenter opacity: (600.0-pic.x) / 600; - MouseRegion { + MouseArea { anchors.fill: parent drag.target: pic drag.axis: "XAxis" diff --git a/doc/src/snippets/declarative/mouseregion.qml b/doc/src/snippets/declarative/mouseregion.qml index 67857f5..79f8f8f 100644 --- a/doc/src/snippets/declarative/mouseregion.qml +++ b/doc/src/snippets/declarative/mouseregion.qml @@ -4,13 +4,13 @@ Rectangle { width: 200; height: 100 HorizontalLayout { //! [0] Rectangle { width: 100; height: 100; color: "green" - MouseRegion { anchors.fill: parent; onClicked: { parent.color = 'red' } } + MouseArea { anchors.fill: parent; onClicked: { parent.color = 'red' } } } //! [0] //! [1] Rectangle { width: 100; height: 100; color: "green" - MouseRegion { + MouseArea { anchors.fill: parent acceptedButtons: Qt.LeftButton | Qt.RightButton onClicked: { |