summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-0364-939/+1175
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-06-031-0/+1
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-039-250/+259
| | |\
| | * | Ensure PathView mappedRange is updated when pathItemCount changes.Martin Jones2010-06-031-0/+1
| * | | Add Q_AUTOTEST_EXPORTAaron Kennedy2010-06-031-1/+1
| | |/ | |/|
| * | DocAaron Kennedy2010-06-031-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-06-033-240/+253
| |\ \
| | * | Fix basic types docs indentationBea Lam2010-06-031-242/+242
| | * | Improve basic types documentation. Don't imply that Item hasBea Lam2010-06-031-30/+44
| | * | Remove Media elements from Elements indexBea Lam2010-06-031-8/+3
| | |/
| | * Keep ListView highlight in sync when currentItem changes geometry.Martin Jones2010-06-031-1/+5
| * | Add some Q_AUTOTEST_EXPORTsAaron Kennedy2010-06-037-10/+10
| |/
| * QDeclarativeImage::updatePaintedGeometry() does not need to be a slotMartin Jones2010-06-031-2/+0
| * QML viewer now supports TopUp, TopDown, RightUp and LeftUp orientationsBea Lam2010-06-027-56/+79
| * Text should update when the alignment changes.Michael Brasser2010-06-021-0/+2
| * Add qml import plugins to qt.iby and qt.sisJoona Petrell2010-06-022-0/+36
| * Take into account platform differences in input panel supportJoona Petrell2010-06-029-141/+285
| * More autoScroll fixesWarwick Allison2010-06-022-2/+18
| * Doc fixes and improvements - fix some example code, link toBea Lam2010-06-0235-486/+488
| * Add Vector3dAnimation to list of QML elementsBea Lam2010-06-021-0/+1
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-014-10/+94
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-014-10/+94
| |\
| | * Introduced getter and setter for the visual X cursor position.Roberto Raggi2010-06-012-0/+38
| | * Defines whether the cursor should keep its current position.Roberto Raggi2010-06-014-10/+56
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-017-51/+65
|\ \ \ | |/ / |/| |
| * | Don't remove the pixmap from cache when not modifying it.Andreas Aardal Hanssen2010-06-011-2/+4
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-06-0149-290/+716
| |\ \ | |/ / |/| |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-017-78/+148
|\ \ \
| * | | Doc: Fixed a typoGeir Vattekar2010-06-011-1/+1
| * | | Doc: QAbstractItemModel: note unexpected behavior with beginMoveRowsJohn Brooks2010-06-011-40/+52
| * | | Added environment variable graphicssystem switch.Andreas Hartmetz2010-06-011-3/+14
| * | | Fixed a problem where QPixmaps where re-bound in non-sharing contexts.Trond Kjernåsen2010-06-012-20/+67
| * | | Fix bug in QGraphicsItem::scroll() when called with no QRectF argument.Andreas Aardal Hanssen2010-06-011-13/+6
| * | | Make sure we don't pull inn /usr/X11 stuff in the qws mkspek confJørgen Lind2010-06-011-0/+4
| * | | Avoid unnecessary detach / deep copy in QGraphicsItem::scroll().Andreas Aardal Hanssen2010-06-011-1/+4
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-0134-204/+529
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-012-3/+19
| |\ \ \
| | * | | Documentation.Michael Brasser2010-06-011-1/+16
| | * | | Optimization for sci file loading.Michael Brasser2010-06-011-2/+3
| * | | | Missed file.Warwick Allison2010-06-011-0/+8
| |/ / /
| * | | Ensure text color set by S60 input method works for QML ItemsMartin Jones2010-06-011-8/+33
| * | | License.Warwick Allison2010-06-011-0/+41
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-0161-321/+599
| |\ \ \
| | * | | Test positionAt.Warwick Allison2010-06-011-0/+43
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-0160-320/+555
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-0128-188/+323
| | | |\ \ \ | |_|/ / / / |/| | | | |
| | | * | | Fix example code and imageBea Lam2010-06-011-0/+0
| | | * | | Fix docYann Bodson2010-06-011-1/+1
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-313-226/+174
| | | |\ \ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-3125-183/+317
| | | | |\ \ \