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-04-2865-551/+1100
|\
| * Improve border image documentation.Yann Bodson2010-04-281-11/+23
| * Update border image examples.Yann Bodson2010-04-287-73/+98
| * Doc - micro fix.Martin Jones2010-04-281-1/+0
| * Fix QML default property HTML generation... again.Martin Jones2010-04-281-8/+0
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-284-13/+73
| |\
| | * Bunch of doc fixes.Alexis Menard2010-04-284-13/+73
| * | Alpha needs to be part of rectangle cache key.Martin Jones2010-04-281-4/+6
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-2814-330/+503
| |\
| | * Code cleanupAaron Kennedy2010-04-281-235/+238
| | * Remove unused variableAaron Kennedy2010-04-282-4/+1
| | * Don't test snippets with C++ componentsBea Lam2010-04-281-0/+2
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-281-29/+43
| | |\
| | * | Don't unnecessarily regenerate property cacheAaron Kennedy2010-04-286-32/+77
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-2830-29/+73
| | |\ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-2810-56/+264
| | |\ \ \
| | * | | | BenchmarkAaron Kennedy2010-04-283-0/+166
| | * | | | Small cleanupsAaron Kennedy2010-04-282-59/+19
| * | | | | Doc: overview for ImageMartin Jones2010-04-281-1/+21
| | |_|_|/ | |/| | |
| * | | | Share Rectangle pixmap caches between items.Martin Jones2010-04-281-29/+43
| | |_|/ | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-2825-19/+19
| |\ \ \
| | * | | Move snippets to correct locationBea Lam2010-04-2825-19/+19
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-281-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Make compileBea Lam2010-04-281-1/+1
| | | |/ | | |/|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-2810-56/+264
| |\ \ \ | | |/ /
| | * | Doc fixesBea Lam2010-04-287-55/+90
| | * | Delete canvas after use in positioner unit testsJoona Petrell2010-04-281-0/+28
| | * | Setting conflicting anchors to items inside positioners should print a warningJoona Petrell2010-04-283-1/+146
| | |/
| * | Fix snap at view boundaries with overshoot on.Martin Jones2010-04-282-8/+14
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-2832-361/+2271
| |\ \ | | |/
| * | Emit hoverChanged appropriately when Item visibility changes.Martin Jones2010-04-282-1/+39
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-2820-207/+966
|\ \ \ | |_|/ |/| |
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-28127-577/+3773
| |\ \
| | * | Update Polish translationsJarek Kobus2010-04-281-160/+160
| | * | Fix compatibility with Qt Mobility.Aaron McCarthy2010-04-281-4/+8
| | * | Fix compile.Aaron McCarthy2010-04-281-1/+1
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-2718-43/+798
| | |\ \ | |/ / / |/| | |
| | * | Fix compilation with QT_NO_TEXTSTREAMTasuku Suzuki2010-04-271-1/+1
| | * | Fix the compilation with QT_NO_TOOLTIPTasuku Suzuki2010-04-272-0/+6
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-2759-482/+3080
| | |\ \
| | | * | Add unit tests for a number of QList methods.Robin Burchell2010-04-271-0/+489
| | | * | Crash while dragging on Mac OS X (Cocoa)Prasanth Ullattil2010-04-271-1/+2
| | | * | Doc & menubar hidden for QtDemo after switching back from fullscreenCarlos Manuel Duclos Vergara2010-04-271-0/+3
| | * | | Merge commit 'refs/merge-requests/577' of git://gitorious.org/qt/qt into inte...David Boddie2010-04-271-6/+2
| | |\ \ \
| | | * | | Slight QList documentation fix.Robin Burchell2010-04-261-6/+2
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-27107-379/+2939
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Ensure text document is created before we access it.Martin Jones2010-04-271-0/+1
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-27106-379/+2938
| |\ \ \ \ \
| | * | | | | Plugins documentation.Bea Lam2010-04-272-7/+15
| | * | | | | Fix update issue when an item has an effect and child.Alexis Menard2010-04-272-1/+48