Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'qt/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-11-11 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch '4.6-api-review' into 4.6 | Marius Storm-Olsen | 2009-11-09 | 1 | -1/+1 |
| |\ | |||||
| | * | API review: Rename functions numColors(), setNumColors() and numBytes() | Marius Storm-Olsen | 2009-11-06 | 1 | -1/+1 |
* | | | Fix minehunt demo | Alan Alpert | 2009-11-11 | 4 | -2/+17 |
* | | | Remove WebView::pagewidth and tidy up - it's not needed and interfered | Warwick Allison | 2009-11-10 | 1 | -17/+26 |
* | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-09 | 4 | -21/+23 |
|\ \ \ | |/ / | |||||
| * | | Merge commit 'origin/4.6' into 4.6 | Olivier Goffart | 2009-11-06 | 2 | -17/+19 |
| |\ \ | |||||
| | * \ | Merge branch '4.6-s60' into 4.6 | axis | 2009-11-06 | 1 | -1/+1 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | Merge commit 's60/4.6' into mmfphonon | Frans Englich | 2009-11-04 | 2 | -3/+3 |
| | | |\ | |||||
| | | * \ | Merge branch '4.6' into mmfphonon | Gareth Stockwell | 2009-11-03 | 36 | -28985/+1446 |
| | | |\ \ | |||||
| | | * | | | Fix build caused by merge error. | Frans Englich | 2009-10-23 | 1 | -1/+0 |
| | | * | | | Listen to hasVideoChanged() signal instead, such that we're more robust. | Frans Englich | 2009-10-23 | 1 | -0/+1 |
| | * | | | | Modify QGLShader and QGLShaderProgram in response to API review | Rhys Weatherley | 2009-11-05 | 1 | -16/+18 |
| | | |_|/ | | |/| | | |||||
| * | | | | Result API review with Jasmin | Thierry Bastian | 2009-11-04 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Incorporate API review feedback for math3d classes. | Rhys Weatherley | 2009-11-04 | 2 | -3/+3 |
| | |/ | |/| | |||||
* | | | Rename targets -> matchTargets and properties -> matchProperties. | Michael Brasser | 2009-11-06 | 17 | -27/+27 |
* | | | Update semantics of targets/properties and target/property. | Michael Brasser | 2009-11-06 | 3 | -3/+3 |
* | | | fix calculator | Yann Bodson | 2009-11-05 | 1 | -19/+15 |
* | | | Use darker() and lighter() functions from global Qt object rather than from S... | Yann Bodson | 2009-11-05 | 4 | -4/+4 |
* | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Alan Alpert | 2009-11-05 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Remove "to" limit on minor version. | Warwick Allison | 2009-11-05 | 1 | -1/+1 |
* | | | | Particles cleaned up and placed in in qmlgraphics/ | Alan Alpert | 2009-11-05 | 2 | -11/+8 |
|/ / / | |||||
* | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-04 | 36 | -28985/+1446 |
|\ \ \ | |/ / | |||||
| * | | Reducing file size. | Alessandro Portale | 2009-10-30 | 1 | -0/+0 |
| * | | Reducing file sizes. | Alessandro Portale | 2009-10-30 | 1 | -0/+0 |
| * | | Reducing file sizes. | Alessandro Portale | 2009-10-30 | 1 | -0/+0 |
| * | | Reducing file sizes. | Alessandro Portale | 2009-10-30 | 5 | -0/+0 |
| * | | Reducing file sizes. | Alessandro Portale | 2009-10-30 | 3 | -0/+0 |
| * | | Reducing file sizes. | Alessandro Portale | 2009-10-30 | 13 | -0/+0 |
| * | | Reduced file sizes. | Alessandro Portale | 2009-10-30 | 12 | -28985/+1446 |
| |/ | |||||
* | | Fix assertion (sc not declared). | Warwick Allison | 2009-11-02 | 1 | -1/+1 |
* | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int... | Yann Bodson | 2009-10-30 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Aaron Kennedy | 2009-10-30 | 1 | -0/+40 |
| |\ \ | |||||
| * | | | Rename qfx files to qmlgraphics files | Aaron Kennedy | 2009-10-30 | 1 | -1/+1 |
* | | | | make twitter not depend on flickr example | Yann Bodson | 2009-10-30 | 18 | -20/+172 |
* | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int... | Yann Bodson | 2009-10-30 | 1 | -0/+40 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Warwick Allison | 2009-10-30 | 3 | -7/+47 |
| |\ \ \ | | |/ / | |||||
| * | | | fix headers | Warwick Allison | 2009-10-29 | 1 | -0/+40 |
* | | | | fix twitter example | Yann Bodson | 2009-10-30 | 2 | -3/+3 |
| |/ / |/| | | |||||
* | | | Add local highscores to SameGame | Alan Alpert | 2009-10-29 | 3 | -7/+47 |
|/ / | |||||
* | | Remove QML SQL classes | Aaron Kennedy | 2009-10-28 | 15 | -857/+0 |
* | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int... | Yann Bodson | 2009-10-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | "Compile" | Aaron Kennedy | 2009-10-28 | 1 | -1/+1 |
* | | | cleanup | Yann Bodson | 2009-10-28 | 17 | -33/+33 |
|/ / | |||||
* | | SameGame cleans up blocks now. | Alan Alpert | 2009-10-27 | 1 | -0/+1 |
* | | make remotable | Warwick Allison | 2009-10-26 | 2 | -4/+4 |
* | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Warwick Allison | 2009-10-26 | 1 | -0/+1 |
|\ \ | |||||
| * | | Flip around perspective origin | Aaron Kennedy | 2009-10-26 | 1 | -0/+1 |
* | | | Allow flickr demo to be remote. | Warwick Allison | 2009-10-26 | 1 | -0/+10 |
|/ / | |||||
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-25 | 7 | -11/+22 |
|\ \ | |/ |