diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-07 14:45:09 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-07 14:45:09 (GMT) |
| commit | d7a91cfe8683309883694fbbf508e5fc42d44165 (patch) | |
| tree | 95e248d34d10015778f7a00477c59e265501d443 /doc/src/declarative/propertybinding.qdoc | |
| parent | b7aa20e56b3ed45cf00d8a57696e6d8ac803f9b4 (diff) | |
| parent | c39b3d42dda26b1f9576906cd001236c9d96e06a (diff) | |
| download | Qt-d7a91cfe8683309883694fbbf508e5fc42d44165.zip Qt-d7a91cfe8683309883694fbbf508e5fc42d44165.tar.gz Qt-d7a91cfe8683309883694fbbf508e5fc42d44165.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Conflicts:
doc/src/declarative/propertybinding.qdoc
src/declarative/util/qdeclarativeview.cpp
Diffstat (limited to 'doc/src/declarative/propertybinding.qdoc')
| -rw-r--r-- | doc/src/declarative/propertybinding.qdoc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/src/declarative/propertybinding.qdoc b/doc/src/declarative/propertybinding.qdoc index a93c830..27653bd 100644 --- a/doc/src/declarative/propertybinding.qdoc +++ b/doc/src/declarative/propertybinding.qdoc @@ -229,6 +229,7 @@ Accessing the aliasing property is similar to accessing a regular property. In addition, the optional \c default keyword indicates that the aliasing property is a \l{Default Properties}{default property}. +<<<<<<< HEAD \snippet doc/src/snippets/declarative/Button.qml property alias When importing the component as a \c Button, the \c buttonlabel is directly accessible through the \c label property. |