summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | 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
| | | | |\ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | |
| | | * | | | | | | Fix some bugs in the QML Web Browser buttonsAlan Alpert2010-05-312-1/+2
| | | * | | | | | | Fix zoom bug in QML Web Browser demoAlan Alpert2010-05-312-3/+3
| | | * | | | | | | Fix TypoAlan Alpert2010-05-311-1/+1
| | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Various doc fixes and improvementsBea Lam2010-05-3112-42/+159
| | | * | | | | | Document issues with rectangle border width of 1 where clipping is usedBea Lam2010-05-313-2/+33
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-318-8/+39
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Updated WebKit to c58dc2f491a824ac56e31c440fcf7fe16dab09c4Simon Hausmann2010-05-318-8/+39
| | | * | | | | | Fix positionAt when autoScroll is use.Warwick Allison2010-06-011-1/+1
| | | |/ / / / /
| | * | | | | | Avoid refilling view during model change.Martin Jones2010-06-012-1/+53
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-3110-139/+125
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-3131-801/+1040
| | | |\ \ \ \ \
| | | * | | | | | Simplify selection setting. Make TextInput more like TextEdit.Warwick Allison2010-05-3110-139/+125
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-31187-3252/+6294
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Repaint all text when Ctrl+A is pressed in TextEditMartin Jones2010-05-311-3/+8
| | | | | | * | | Speed up QStaticText with affine transformation on GL2 engineEskil Abrahamsen Blomfeldt2010-06-016-49/+61
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-3131-36/+143
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-3142-384/+375
| |\ \ \ \ \ \ \
| | * | | | | | | Fix QT_NO_TEXTHTMLPARSERTasuku Suzuki2010-05-312-0/+26
| | * | | | | | | Fix QT_NO_DOMTasuku Suzuki2010-05-312-6/+6