summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-0527-44/+782
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-11-051-0/+21
| |\ | | | | | | | | | into kinetic-declarativeui
| | * Document the vector3d type in QMLRhys Weatherley2009-11-051-0/+21
| | | | | | | | | | | | | | | Task-number: QTBUG-5334 Reviewed-by: Aaron Kennedy
| * | Use darker() and lighter() functions from global Qt object rather than from ↵Yann Bodson2009-11-0515-16/+16
| | | | | | | | | | | | SystemPalette.
| * | qmlsystempalette autotestsYann Bodson2009-11-055-28/+171
| |/
| * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-11-058-93/+272
| |\ | | | | | | | | | into kinetic-declarativeui
| * | fillmode visual testYann Bodson2009-11-056-0/+574
| | |
* | | Add test for GridView, and fix bug.Martin Jones2009-11-056-24/+672
| |/ |/|
* | Add listview test file.Martin Jones2009-11-051-0/+59
| |
* | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-0512-178/+195
|\ \ | |/ | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * update text visualsYann Bodson2009-11-056-174/+192
| |
| * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-11-0511-113/+282
| |\ | | | | | | | | | into kinetic-declarativeui
| * | use FreeMono.ttfYann Bodson2009-11-056-4/+3
| | |
* | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-05194-382/+13915
|\ \ \ | | |/ | |/| | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/graphicsitems/qmlgraphicsloader.cpp
| * | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-11-0511-1/+1573
| |\ \ | | |/ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-11-051-1/+1
| | |\ | | | | | | | | | | | | into kinetic-declarativeui
| | | * Fix signal overriding.Michael Brasser2009-11-051-1/+1
| | | |
| | * | qmlgraphicstext visual testsYann Bodson2009-11-0510-0/+1572
| | |/
| * | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-11-05268-1754/+14883
| |\ \ | | |/ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-11-0589-232/+223
| | |\ | | | | | | | | | | | | into kinetic-declarativeui
| | | * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-0529-36/+758
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | Remove "to" limit on minor version.Warwick Allison2009-11-0586-222/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QML_DEFINE_TYPE etc. now define just the initial support version, with support in all future versions being thus implied. QTBUG-5421
| | | * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-053-214/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * \ \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-0459-145/+1157
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | | Remove property-order sensitivity.Warwick Allison2009-11-043-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes autotest.
| | | * | | | Remove invalid testWarwick Allison2009-11-041-5/+1
| | | | | | |
| | * | | | | visual tests for borderimageYann Bodson2009-11-0554-0/+10724
| | | | | | |
| | * | | | | update rect visualsYann Bodson2009-11-052-0/+355
| | | |_|_|/ | | |/| | |
| | * | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-11-0526-179/+638
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | * \ \ \ Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-11-054-219/+7
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * | | | QmlPropertyMap autotest update.Michael Brasser2009-11-051-5/+7
| | | | | |_|/ | | | | |/| |
| | | * | | | Partial valuetypes testAaron Kennedy2009-11-0523-0/+671
| | | | |_|/ | | | |/| |
| | * | | | more borderimage autotestsYann Bodson2009-11-053-30/+70
| | | | | |
| | * | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-11-0497-1312/+2863
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | into kinetic-declarativeui
| | * | | | autotestsYann Bodson2009-11-042-1/+10
| | | | | |
| * | | | | Particles cleaned up and placed in in qmlgraphics/Alan Alpert2009-11-0511-113/+282
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API changes: Removed bool streamIn Added int emissionRate Added int emissionVariance Added void burst(count, emissionRate=-1) While rewriting the internals to accomodate this, all other outstanding particles bugs were believed fixed. Task-number: QT-2392 QT-2391 QT-2390 QT-2406
* | | | | Fix flicking endpoint adjustment with variable height items.Martin Jones2009-11-052-48/+56
| | | | |
* | | | | Loader cleanup and testing.Martin Jones2009-11-054-45/+63
| | | | |
* | | | | Test more ListView.Martin Jones2009-11-051-0/+94
| |_|/ / |/| | |
* | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-0489-1298/+2777
|\ \ \ \ | | |/ / | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-11-042-0/+11
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-11-0446-1192/+1852
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | Rebuild configure.exe (using a vs2005 compiler)Kai Koehne2009-11-041-0/+0
| | | | |/ | | | |/| | | | | | | | | | | The same was done in 4.6 (04d5735a)
| | * | | Add missing file.Michael Brasser2009-11-041-0/+11
| | | | |
| * | | | declarative.pro updateAaron Kennedy2009-11-041-33/+36
| | | | |
| * | | | Missing file for 48ea5a5c74620f9811debc6bf1e49bf095d30722Aaron Kennedy2009-11-041-3/+3
| | | | |
| * | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-11-0438-1167/+1706
| |\ \ \ \ | | | |/ / | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | docs (somewhere is better than nowhere)Warwick Allison2009-11-041-1/+30
| | | | |
| | * | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-042-2/+70
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Update visual tests (mae fixed line spacing)Warwick Allison2009-11-0429-1152/+1590
| | | | | |