summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix leaks.Michael Brasser2009-09-084-1/+6
* fix tutorial 3 - qmlviewer bails out with "id conflicts with type name"Frederik Gladhorn2009-09-071-2/+2
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-09-0713-12/+165
|\
| * Add status and progress properties to Loader.Martin Jones2009-09-079-9/+120
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-09-073-1/+36
| |\
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-09-0721-353/+217
| | |\
| | * | Resolve qualified type even if not localfile.Warwick Allison2009-09-071-0/+4
| | * | spelWarwick Allison2009-09-071-1/+1
| | * | Save and restore non-session cookies.Warwick Allison2009-09-071-0/+31
| * | | Call componentComplete() of Keys attached property.Martin Jones2009-09-071-2/+9
| | |/ | |/|
* | | Fix leak.Michael Brasser2009-09-073-0/+11
* | | Fix leaks.Michael Brasser2009-09-073-0/+10
* | | Fix indentation.Michael Brasser2009-09-071-27/+27
|/ /
* | Size the list area correctly.Martin Jones2009-09-071-1/+1
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-09-075-17/+14
|\ \
| * \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-09-075-6/+6
| |\ \
| * | | Use data as the default property of the views.Michael Brasser2009-09-074-15/+12
| * | | Get calculator demo running again.Michael Brasser2009-09-071-2/+2
* | | | Remove KeyProxy in favour of the Keys.forwardTo attached property.Martin Jones2009-09-0711-331/+198
| |/ / |/| |
* | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-09-079-19/+25
|\ \ \ | | |/ | |/|
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-09-078-17/+23
| |\ \ | | |/
| | * Fix warnings.Michael Brasser2009-09-072-11/+8
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-09-072-1/+1
| | |\
| | * | Fix leaks.Michael Brasser2009-09-076-0/+9
| | * | Get recipes example running again.Michael Brasser2009-09-071-6/+6
| * | | Fix scrollbar after API changes.Yann Bodson2009-09-071-2/+2
| | |/ | |/|
* | | Move qmetaobjectbuilder into declarative/qml directoryMartin Jones2009-09-074-4/+4
|/ /
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-09-041-1/+1
|\ \
| * | Remove warningsYann Bodson2009-09-041-1/+1
| |/
* | Rebuild configure.exeAaron Kennedy2009-09-041-0/+0
|/
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-09-0436-606/+679
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Michael Brasser2009-09-042-151/+170
| |\
| | * Make exposeRegion work better in DFB_NO_WM modeAnders Bakken2009-09-042-118/+123
| | * Cache the DFBSurface for the cursor imageAnders Bakken2009-09-041-7/+16
| | * Fix a bug in DFBWindowSurface::setGeometryAnders Bakken2009-09-041-26/+31
| * | Fix compilation on OS X.Michael Brasser2009-09-041-1/+1
| |/
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Michael Brasser2009-09-04566-4841/+14167
| |\
| | * Fix tst_QTableView with skulpture styleOlivier Goffart2009-09-031-0/+9
| | * QStyleSheetStyle test: test that the widget loose their style when they are n...Olivier Goffart2009-09-031-0/+27
| | * QCSSScanner: really skip toLower() when tokenizing the input.Ariya Hidayat2009-09-032-1/+2
| | * Removing a few superfluous semicolons.Alessandro Portale2009-09-039-15/+15
| | * Unbreak static compile (due to symbol conflicts).Ariya Hidayat2009-09-031-21/+21
| | * Merge branch 'minimizeWrapperApp' into 4.6axis2009-09-0318-416/+433
| | |\
| | | * Move the S60/Avkon framework initialization into QtGui.axis2009-09-0316-299/+301
| | | * Use custom S60 framework construction instead of RunApplication().axis2009-08-261-1/+16
| * | | Use qreal for QGraphicsOpacityEffect opacity property.Michael Brasser2009-09-041-1/+1
* | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-09-044-21/+32
|\ \ \ \
| * \ \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-09-04445-2953/+11797
| |\ \ \ \
| | * \ \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-09-04545-4623/+14864
| | |\ \ \ \
| | * | | | | Smooth the rendering in the tiles, not of the tiles.Warwick Allison2009-09-042-12/+4