diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-13 05:32:45 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-13 05:32:45 (GMT) |
| commit | a34993a9d8d1b9b3f3ad30604dbad3ad456bbdcd (patch) | |
| tree | 28c4fc3995172d8c885454839acdbd60b8a28ac0 /doc | |
| parent | 61c13dad7bf04642033f01cad81ea422ab89b122 (diff) | |
| parent | 7fba97dc74a27f836abfcf4941dac6e247379798 (diff) | |
| download | Qt-a34993a9d8d1b9b3f3ad30604dbad3ad456bbdcd.zip Qt-a34993a9d8d1b9b3f3ad30604dbad3ad456bbdcd.tar.gz Qt-a34993a9d8d1b9b3f3ad30604dbad3ad456bbdcd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/advtutorial.qdoc | 3 | ||||
| -rw-r--r-- | doc/src/platforms/emb-features.qdoc | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/declarative/advtutorial.qdoc b/doc/src/declarative/advtutorial.qdoc index 4807fd2..3a70eee 100644 --- a/doc/src/declarative/advtutorial.qdoc +++ b/doc/src/declarative/advtutorial.qdoc @@ -101,6 +101,9 @@ One item you may not recognize here is the \l SystemPalette item. This provides access to the Qt system palette and is used to give the button a more native look-and-feel. +Notice the anchors for the \c Item, \c Button and \c Text elements are set using +\l {Grouped Properties}{group notation} for readability. + \section2 Adding \c Button and \c Block components The \c Button item in the code above is defined in a separate file named \c Button.qml. diff --git a/doc/src/platforms/emb-features.qdoc b/doc/src/platforms/emb-features.qdoc index 1974a45..ab549d3 100644 --- a/doc/src/platforms/emb-features.qdoc +++ b/doc/src/platforms/emb-features.qdoc @@ -105,9 +105,6 @@ \note The \c qconfig tool is intended to be built against Qt on desktop platforms. - \bold{Windows CE:} The Qt for Windows CE package contains a \c qconfig - executable that you can run on a Windows desktop to configure the build. - \image qt-embedded-qconfigtool.png The \c qconfig tool's interface displays all of Qt's |