summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qml-4.7Rohan McGovern2010-06-223-5/+2
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-06-221-1/+1
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-221-1/+1
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-221-1/+1
| | | |\
| | | | * Update qmlchanges from import org.webkit to QtWebKitAlexis Menard2010-06-181-1/+1
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-221-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-211-1/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | doc: Fixed type of Package::nameThorbjørn Lindeijer2010-06-181-1/+1
| | | |/
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-221-3/+0
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-211-3/+0
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Compiler warnings (unused variables).Bjørn Erik Nilsen2010-06-211-3/+0
| | | |/
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-221-1/+24
|\ \ \ \
| * | | | DocAaron Kennedy2010-06-221-1/+24
* | | | | Handle TextInput inputMethodEvent() properlyMartin Jones2010-06-222-2/+18
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-221-1/+1
|\ \ \ \ | |/ / /
| * | | Rename example image fileBea Lam2010-06-221-1/+1
| |/ /
* | | Allow QT_TR_NOOP (as a no-op) in ListModel values.Warwick Allison2010-06-221-4/+9
|/ /
* | ListView doc improvements and examples clean upBea Lam2010-06-181-12/+25
* | Doc fixesBea Lam2010-06-182-23/+13
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-177-48/+83
|\ \ | |/ |/|
| * Fix event forwarding in QDeclarativeFlickable.Alexis Menard2010-06-171-3/+18
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-173-1/+16
| |\
| | * BorderImage is not updated when border values changeYann Bodson2010-06-173-1/+16
| * | doc: improve Repeater model docs.Martin Jones2010-06-171-10/+3
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-171-4/+5
| |\
| | * Properly update childrenRect for position changes and shrinking.Michael Brasser2010-06-171-4/+5
| * | XmlListModel: Don't lock while doing the slow bit.Martin Jones2010-06-171-30/+41
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-171-1/+1
|\ \ | |/ |/|
| * Work around ICE in Intel C++ Compiler 11.1.072Thiago Macieira2010-06-161-1/+1
* | doc: add note that items with width or height of 0 are not positioned.Martin Jones2010-06-171-0/+8
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-168-16/+68
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-06-161-0/+1
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-161-1/+5
| | |\ \ | | | |/
| | * | Stopping a flick resulted in the next click being consumed.Martin Jones2010-06-161-0/+1
| * | | Move knowledge of QGraphicsObject out of qml engineAaron Kennedy2010-06-166-15/+62
| | |/ | |/|
| * | Document section.delegateBea Lam2010-06-161-1/+5
| |/
* | Write TextInput.positionToRectangle docs.Alan Alpert2010-06-162-4/+10
* | Fix autoScroll implementationAlan Alpert2010-06-162-35/+54
|/
* Remove duplicated code.Michael Brasser2010-06-152-14/+2
* Fix bug with childrenRect resizing on startup.Michael Brasser2010-06-152-19/+16
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-1254-579/+939
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-111-0/+2
| |\
| | * Move listview/itemlist.qml to a separate visualitemmodel exampleBea Lam2010-06-111-0/+2
| * | ListView.onRemove animation is not played when the list has only one item.Martin Jones2010-06-112-2/+2
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-1117-122/+211
| |\
| | * Minor doc fixesBea Lam2010-06-117-8/+11
| | * Doc improvements, including snippet fixes, linking to examples, makingBea Lam2010-06-1113-114/+200
| * | Make snapping work properly for highlight ranges > item sizeMartin Jones2010-06-112-28/+84
| |/
| * Avoid recursive refill() in List/GridViewMartin Jones2010-06-112-20/+12
| * Update on color change.Warwick Allison2010-06-101-0/+1