summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix cacheBuffer documentation.Martin Jones2010-05-053-12/+28
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-058-22/+22
|\
| * Docs - point to property types from tutorial and QML Basic Types pageBea Lam2010-05-052-10/+13
| * Fix qdoc errorsBea Lam2010-05-056-12/+9
* | Document delegate life cycle.Martin Jones2010-05-053-1/+11
* | little doc fix.Martin Jones2010-05-051-1/+1
|/
* Turn off smooth rendering for qDrawBorderPixmap() with transforms.Martin Jones2010-05-051-0/+14
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-0521-207/+223
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-053-2/+13
| |\
| | * Don't start valuesource animations until all component objects have been comp...Michael Brasser2010-05-053-2/+13
| * | docWarwick Allison2010-05-0519-205/+210
| |/
* | Test for QList<QObject*> model with object properties changing.Martin Jones2010-05-051-0/+99
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-0535-152/+396
|\ \ | |/
| * Example i18n.Warwick Allison2010-05-056-0/+69
| * Allow translations without extra command-line args, and document both.Warwick Allison2010-05-053-27/+68
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-0558-467/+874
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-0522-119/+251
| | |\
| | | * Doc improvements, simplify example codeBea Lam2010-05-0519-118/+208
| | | * Enable states to be activated via their 'when' clause even if unnamed.Michael Brasser2010-05-053-1/+43
| | * | Null objects should appear as JS nullAaron Kennedy2010-05-053-4/+5
| | |/
| | * Fix a crash with null objects returned from a Q_INVOKABLERhys Weatherley2010-05-051-1/+2
| * | syntax updateWarwick Allison2010-05-051-1/+1
* | | QList<QObject*> models now update their properties when they change.Martin Jones2010-05-058-15/+49
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-0529-291/+514
|\ \ \ | | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-04197-2236/+4507
| |\ \
| | * | Optimization for QDeclarativePaintedItem.Michael Brasser2010-05-042-12/+20
| | * | Update childrenRect when children are added or removed.Michael Brasser2010-05-044-3/+95
| | * | Optimize childrenRect.Michael Brasser2010-05-042-43/+87
| | * | Remove obsolete doc groupings.Michael Brasser2010-05-0415-69/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-049-168/+315
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-039-168/+315
| | |\ \ \
| | | * | | Updated WebKit to 3f0f51f4c87e65bfe04165c6af4c00934b0ca1e2Simon Hausmann2010-05-034-3/+14
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-039-168/+304
| | | |\ \ \
| | | | * | | Updated WebKit to 8941bee5706ef2171ed5def63834deefc7440d11Simon Hausmann2010-05-039-168/+304
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-044-52/+102
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Doc improvementsBea Lam2010-05-044-52/+102
| | |_|_|_|/ | |/| | | |
* | | | | | Ensure flick endpoint is recalculated for variable height lists.Martin Jones2010-05-042-2/+3
|/ / / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Warwick Allison2010-05-04656-154657/+259318
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-0359-367/+1959
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-05-0312-89/+215
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-0358-364/+1950
| | | |\ \ \ | | |/ / / / | |/| | | |
| | | * | | QGraphicsView drawing artifacts due to rounding errors.Bjørn Erik Nilsen2010-05-036-80/+194
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-036-9/+21
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Fix a small typo: therfore -> thereforeLaszlo Papp2010-05-031-1/+1
| | * | | | Fix a small typo in setColor description (brush -> color)Laszlo Papp2010-05-031-1/+1
| | * | | | only add phonon and scripttools dependencies if they're available, otherwise ...Romain Pokrzywka2010-05-031-3/+7
| | * | | | s/INCPATH/INCLUDEPATH/Oswald Buddenhagen2010-05-031-2/+2
| | * | | | qdoc: Added breadcrumbs for most other pages.Martin Smith2010-05-032-2/+10
| | | * | | Fixed a QBuffer warning caused by a regression in qjpegJohn Brooks2010-05-031-3/+9
| | | |/ /
| | | * | Fixed OpenGL version flags for versions > 3.2.Kim Motoyoshi Kalland2010-05-031-1/+14