diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-03-01 23:26:13 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-03-01 23:26:13 (GMT) |
| commit | 95814418f9d6adeba365c795462e8afb00138211 (patch) | |
| tree | f7528ae97d136474ae300daa513acc0250f02d4e /src/declarative/graphicsitems/qdeclarativemousearea.cpp | |
| parent | 88253db8a7d7910e1393b1948fb3747117538c92 (diff) | |
| parent | 119a8ddcd7c8de0607309b37f9ef83439b607f17 (diff) | |
| download | Qt-95814418f9d6adeba365c795462e8afb00138211.zip Qt-95814418f9d6adeba365c795462e8afb00138211.tar.gz Qt-95814418f9d6adeba365c795462e8afb00138211.tar.bz2 | |
Merge branch '4.7' into qtquick11
Conflicts:
src/declarative/graphicsitems/qdeclarativelistview.cpp
Change-Id: Ic21311365c6139520ae337a379bdedb6ffe497db
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativemousearea.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativemousearea.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp index 1308e73..da11b00 100644 --- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp +++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp @@ -216,9 +216,9 @@ QDeclarativeMouseAreaPrivate::~QDeclarativeMouseAreaPrivate() \section1 Example Usage - \beginfloatright + \div {float-right} \inlineimage qml-mousearea-snippet.png - \endfloat + \enddiv The following example uses a MouseArea in a \l Rectangle that changes the \l Rectangle color to red when clicked: |