summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-08-1815-513/+37
|\
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-08-1820-118/+152
| |\
| * \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-08-1816-176/+110
| |\ \
| * \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-08-17418-9425/+21277
| |\ \ \
| * | | | Doc cleanup.Yann Bodson2009-08-1713-433/+26
| * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-08-1761-524/+355
| |\ \ \ \
| * | | | | Doc cleanup.Yann Bodson2009-08-172-80/+11
* | | | | | Proposed changes following API review.Martin Jones2009-08-183-29/+28
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-08-1810-90/+78
|\ \ \ \ \
| * \ \ \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-08-18429-9581/+21356
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Change Item.contents to Item.childrenRect.Michael Brasser2009-08-189-72/+62
| * | | | | No need to copy pixmap.Michael Brasser2009-08-171-18/+16
* | | | | | MouseRegion API changes following review.Martin Jones2009-08-1810-28/+74
| |/ / / / |/| | | |
* | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-08-179-161/+82
|\ \ \ \ \
| * \ \ \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-08-17418-9425/+21277
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | More namespace improvementsWarwick Allison2009-08-179-161/+82
| | |_|_|/ | |/| | |
* | | | | Small fixes following API review.Martin Jones2009-08-174-5/+18
* | | | | Make pong example scale.Martin Jones2009-08-171-6/+6
* | | | | Add smooth: true to dial example.Martin Jones2009-08-172-4/+4
| |/ / / |/| | |
* | | | Update more often to avoid odd intervals beteeen second movements.Martin Jones2009-08-171-1/+1
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Martin Jones2009-08-17412-9404/+21245
|\ \ \ \ | |_|/ / |/| | |
| * | | Doc: Fix links and silence qdoc warnings.Volker Hilsheimer2009-08-163-24/+25
| * | | Fixed compile.Rohan McGovern2009-08-141-3/+3
| * | | Fixed compile.Rohan McGovern2009-08-141-1/+1
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-08-149-69/+206
| |\ \ \
| | * | | Autotest for correct word wrapping on text next to floating objectEskil Abrahamsen Blomfeldt2009-08-141-0/+39
| | * | | Avoid wrapping outside word boundaries in QTextDocument unless necessaryEskil Abrahamsen Blomfeldt2009-08-141-9/+10
| | * | | Reimplement qSwap and Q_DECLARE_SHARED differently.Thiago Macieira2009-08-146-41/+92
| | * | | Perform license checks on source files.Frans Englich2009-08-141-19/+65
| * | | | Doc: Removed claims that QDialog supports border style sheet settings.David Boddie2009-08-141-3/+3
| |/ / /
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-08-14357-8753/+20007
| |\ \ \
| | * | | QVariant: more work on avoinding conversion between float and doublesThierry Bastian2009-08-145-16/+16
| | * | | Fixed Coverity defect CID 1528.Gabriel de Dietrich2009-08-141-1/+1
| | * | | Removing some unused variables.Alessandro Portale2009-08-146-16/+0
| | * | | QCssParser: reordering initializers to match declarationThierry Bastian2009-08-141-1/+1
| | * | | Fixed coverity warningsThierry Bastian2009-08-1416-37/+26
| | * | | QVariant: added toFloat and toRealThierry Bastian2009-08-1414-48/+90
| | * | | Set the QMAKE_BUNDLE_LOCATION to 'Contents/MacOS' only if it's not setTor Arne Vestbø2009-08-141-1/+1
| | * | | Cocoa: Fix several issues with the event dispatcherRichard Moe Gustavsen2009-08-146-193/+308
| | * | | Our modifications to freetypeHarald Fernengel2009-08-148-23/+292
| | * | | Add freetype 2.3.9Harald Fernengel2009-08-14661-0/+292236
| | * | | Deleted freetype 2.3.6Harald Fernengel2009-08-14650-282668/+0
| | * | | Simplify WebKit import into src/3rdparty/webkitSimon Hausmann2009-08-141-2/+2
| | * | | QTextFormat: better use QVariant::userType over QVariant::typeThierry Bastian2009-08-141-15/+15
| | * | | Fix WebKit import into src/3rdparty/webkitSimon Hausmann2009-08-141-0/+3
| | * | | Fix trailing space in snippet file for gesture documentation.Peter Yard2009-08-141-1/+1
| | * | | Gesture Overview DocumentationPeter Yard2009-08-145-0/+1163
| | * | | Make Qt::NoGesture visible. Needed for QGesture subclassing.Peter Yard2009-08-141-1/+1
| | * | | Add stringbuilder auto test to auto.prohjk2009-08-141-0/+1
| | * | | Fix MLS testWarwick Allison2009-08-141-1/+2