summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-259-26/+70
|\
| * Flickable and MouseArea were too eager to take/keep mouse grab.Martin Jones2010-11-242-19/+34
| * Allow javascript date and regexp objects in WorkerScript messagesBea Lam2010-11-241-0/+13
| * Avoid lockup in ListView when animating delegates.Martin Jones2010-11-241-0/+8
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-195-7/+12
| |\
| | * Don't leak QML compiled data objectsAaron Kennedy2010-11-193-7/+3
| | * Doc: clarify Flickable children vs. contentItem children.Martin Jones2010-11-191-0/+7
| | * Fix parent bug for QDeclarativeOpenMetaObjectMarco Bubke2010-11-181-0/+2
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-192-1/+5
| |\ \ | | |/
| * | Doc: Documented that border width does not affect rectangle geometry.David Boddie2010-11-191-0/+3
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-198-59/+106
|\ \ \ | | |/ | |/|
| * | Fix regression due to 6cf397f7ac35a058096528a7ad8bfaf623b30747Martin Jones2010-11-162-0/+3
| * | VisualDataModel::count should be 0 until a valid delegate is set.Martin Jones2010-11-161-0/+2
| * | Doc: Remove default from PathView path propertyMartin Jones2010-11-161-1/+0
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-153-4/+4
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-153-4/+4
| | |\
| | | * Fix compilation by s/intptr_t/quintptr/Thiago Macieira2010-11-113-4/+4
| * | | ListView: items with size < 1.0 were layed out incorrectly.Martin Jones2010-11-151-3/+3
| * | | ListView.SnapToItem with ListView.StrictlyEnforceRange is broken.Martin Jones2010-11-151-34/+20
| |/ /
| * | Fix PathView key navigation docs.Martin Jones2010-11-121-1/+15
| * | Ensure increment/decrementCurrentIndex always move items in the correct direc...Martin Jones2010-11-122-10/+24
| * | Ensure loaded item's parent is set before component completion.Martin Jones2010-11-121-6/+35
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-1230-142/+320
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-112-1/+16
| |\
| | * QDeclarativeDebug: Keep source information when changing an expressionChristiaan Janssen2010-11-101-1/+2
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-11-104-19/+33
| | |\
| | * | Flickable does not reposition its content when it is resized.Martin Jones2010-11-101-0/+14
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-102-3/+3
| |\ \ \ | | |_|/ | |/| |
| | * | Doc: Fixing typoSergio Ahumada2010-11-091-1/+1
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-081-2/+2
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-051-2/+2
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-031-2/+2
| | | | |\ \
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-011-2/+2
| | | | | |\ \
| | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-011-2/+2
| | | | | | |\ \
| | | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-291-2/+2
| | | | | | | |\ \
| | | | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-291-2/+2
| | | | | | | | |\ \
| | | | | | | | | * | Fix possible crash in QStaticText and QDeclarativeTextLayoutEskil Abrahamsen Blomfeldt2010-10-291-2/+2
| * | | | | | | | | | Document that Transitions are exclusive.Michael Brasser2010-11-101-1/+5
| * | | | | | | | | | Document TextInput::select(start,end)Michael Brasser2010-11-091-6/+17
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-0926-120/+269
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Fix Text::elide docs.Bea Lam2010-11-091-1/+1
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Fix Rectangle painting at small sizes.Martin Jones2010-11-091-1/+2
| | * | | | | | | | Export QDeclarativeDebugHelper on Symbian for QTBUG-13762Joona Petrell2010-11-081-1/+1
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-11-084-15/+73
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Text alignment is broken with multi-line text and implicit size.Yann Bodson2010-11-081-12/+46
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-0523-108/+229
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | Image bounding rect should always include the area being paintedJoona Petrell2010-11-052-3/+25
| | * | | | | | | | | Don't use stdint.h in our headers since it is a C99 header.Martin Jones2010-11-082-12/+5
| | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Add documentation about script evaluation context and allowed typesBea Lam2010-11-041-2/+28
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-0421-103/+176
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |