summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-27107-379/+2939
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-278-15/+152
| |\ \
| | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-2726-126/+160
| | |\ \
| | | * | Fix attempted invocation of non-existent timerActivated() slot.Andrew den Exter2010-04-271-2/+2
| | | * | Fix up qdocs for mediaservices namespace.Kurt Korbatits2010-04-271-9/+9
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-275-3/+136
| | | |\ \
| | * | | | MediaServices; Don't look at the debug info when looking for plugins.Justin McPherson2010-04-271-1/+5
| | | |/ / | | |/| |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-265-3/+136
| | |\ \ \
| | | * | | fix nmake build with win32-msvc2010Joerg Bornemann2010-04-263-3/+3
| | | * | | Added mkspec for MSVC 2010Martin Petersson2010-04-262-0/+133
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-273-11/+11
| |\ \ \ \ \
| | * | | | | Revert "QDialog: user-moved dialog would not show on the same place after hide"Gabriel de Dietrich2010-04-273-11/+11
| | |/ / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-2721-335/+2108
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | changes-4.7.0 updatedJoerg Bornemann2010-04-271-0/+25
| | * | | | Update Polish translationJarek Kobus2010-04-271-316/+2044
| | * | | | Cocoa: Native QFileDialog has problems selecting name filterRichard Moe Gustavsen2010-04-271-1/+1
| | * | | | Mac: improve mac native events autotest APIRichard Moe Gustavsen2010-04-272-6/+0
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Peter Yard2010-04-271656-9161/+24745
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Docs Changes to start page. Minor change to Elements doc. See also added to s...Peter Yard2010-04-2716-12/+38
* | | | | | Emit hoverChanged appropriately when Item visibility changes.Martin Jones2010-04-282-1/+39
| |_|_|_|/ |/| | | |
* | | | | 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
| * | | | Fix QDeclarativeTextInput and QGraphicsView in regards of input methods hints.Alexis Menard2010-04-275-12/+115