summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative/advtutorial1.qdoc
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-02-18 23:47:04 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-02-18 23:47:04 (GMT)
commit83a342b140eeff72c6f46b65dd31e91048ad81d4 (patch)
tree333704265d2950ad89cb7282c42a754e12af8f20 /doc/src/declarative/advtutorial1.qdoc
parentefe3909d4ebfc08384a3762635b4217f18eeaf69 (diff)
parent2eb7c3770307fc42f83ba2526270b7acb51802bf (diff)
downloadQt-83a342b140eeff72c6f46b65dd31e91048ad81d4.zip
Qt-83a342b140eeff72c6f46b65dd31e91048ad81d4.tar.gz
Qt-83a342b140eeff72c6f46b65dd31e91048ad81d4.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'doc/src/declarative/advtutorial1.qdoc')
-rw-r--r--doc/src/declarative/advtutorial1.qdoc5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/src/declarative/advtutorial1.qdoc b/doc/src/declarative/advtutorial1.qdoc
index 86d14ad..09645fd 100644
--- a/doc/src/declarative/advtutorial1.qdoc
+++ b/doc/src/declarative/advtutorial1.qdoc
@@ -55,8 +55,9 @@ This gives you a basic game window, with room for the game canvas. A new game
button and room to display the score. The one thing you may not recognize here
is the \l SystemPalette item. This item provides access to the Qt system palette
and is used to make the button look more like a system button (for exact native
-feel you would use a \l QPushButton). Since we want a fully QML button, and QML does
-not include a button, we had to write our own. Below is the code which we wrote to do this:
+feel you would use a \l QPushButton). Since we want a fully functional button,
+we use the QML elements Text and MouseRegion inside a Rectangle to assemble a
+button. Below is the code which we wrote to do this:
\snippet declarative/tutorials/samegame/samegame1/Button.qml 0