Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Warwick Allison | 2009-11-19 | 2 | -3/+3 |
|\ | |||||
| * | Rename QML Object to QtObject | Aaron Kennedy | 2009-11-19 | 2 | -3/+3 |
* | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-19 | 33 | -130/+770 |
|\ \ | |/ |/| | |||||
| * | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-17 | 11 | -30/+51 |
| |\ | |||||
| | * | Merge remote branch 'staging/4.6' into 4.6 | Simon Hausmann | 2009-11-17 | 7 | -6/+27 |
| | |\ | |||||
| | | * | Prospective Symbian/abld build fix | Simon Hausmann | 2009-11-16 | 1 | -1/+1 |
| | | * | Merge commit 'upstream/4.6' into 4.6 | Bradley T. Hughes | 2009-11-13 | 6 | -69/+84 |
| | | |\ | |||||
| | | * \ | Merge commit 'coreteam/4.6' into oslo1-4.6 | Marius Storm-Olsen | 2009-11-13 | 4 | -4/+25 |
| | | |\ \ | |||||
| | | | * \ | Merge branch '4.6' into core-4.6 | Thiago Macieira | 2009-11-09 | 38 | -125/+452 |
| | | | |\ \ | |||||
| | | | * | | | network examples: unify the fortune server/client examples | Peter Hartmann | 2009-11-09 | 4 | -4/+25 |
| | | * | | | | Compile securesocketclient example also with openssl-linked | Markus Goetz | 2009-11-13 | 1 | -0/+1 |
| | | * | | | | Merge commit 'upstream/4.6' into 4.6 | Bradley T. Hughes | 2009-11-13 | 2 | -3/+10 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge commit 'upstream/4.6' into 4.6 | Bradley T. Hughes | 2009-11-12 | 11 | -2/+599 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | xmlpatterns filetree example: make app a bundle on Mac | Peter Hartmann | 2009-11-12 | 1 | -1/+0 |
| | * | | | | | | | Make pbuffers example compile under OpenGL/ES 1.1 | Rhys Weatherley | 2009-11-15 | 1 | -0/+8 |
| | * | | | | | | | Make it clear that the two semi-floating widget should overflow. | Jan-Arve Sæther | 2009-11-13 | 1 | -2/+2 |
| | * | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6 | Gunnar Sletta | 2009-11-13 | 7 | -90/+97 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge commit upstream/4.6 into oslo-staging-2/4.6 | Olivier Goffart | 2009-11-13 | 13 | -5/+609 |
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | | | |||||
| | | * | | | | | | | Clean up example (remove unused ifdef). | Jan-Arve Sæther | 2009-11-13 | 1 | -14/+6 |
| | | * | | | | | | | Compile fix Solaris: "sun" is defined to 1 on Solaris :) | Jan-Arve Sæther | 2009-11-13 | 1 | -9/+9 |
| | * | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | Gunnar Sletta | 2009-11-13 | 47 | -79/+1045 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | | | |||||
| | * | | | | | | | | Use a non-cosmetic 1-width pen in example to match graphicsview specs | Gunnar Sletta | 2009-11-10 | 1 | -1/+1 |
| * | | | | | | | | | Fix some spelling errors and a broken namespace. | kh1 | 2009-11-16 | 5 | -27/+27 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge oslo-staging-2/4.6 into upstream/4.6 | Olivier Goffart | 2009-11-13 | 6 | -69/+84 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Merge commit 'widget/4.6' into oslo-staging-2/4.6 | Olivier Goffart | 2009-11-11 | 6 | -69/+84 |
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| | | * | | | | | Make the new examples for effects use the Qt Animation Framework | Thierry Bastian | 2009-11-10 | 6 | -69/+84 |
| * | | | | | | | Merge commit 'origin/4.6' into 4.6-ce | Joerg Bornemann | 2009-11-12 | 14 | -8/+618 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| | * | | | | | | Pinchzoom example zooms more smooth | Denis Dzyubenko | 2009-11-11 | 2 | -5/+18 |
| | * | | | | | | Fixed opening files in the findfile example. | Denis Dzyubenko | 2009-11-11 | 1 | -1/+1 |
| | * | | | | | | Doc: Improved WebKit example coverage. | David Boddie | 2009-11-11 | 8 | -3/+317 |
| | * | | | | | | Improvements to graphics effects API after review round. | Samuel Rødal | 2009-11-11 | 4 | -6/+6 |
| | * | | | | | | Changes to low-level audio API. | Kurt Korbatits | 2009-11-11 | 3 | -12/+12 |
| | * | | | | | | Changes to low-level audio API. | Kurt Korbatits | 2009-11-11 | 3 | -12/+12 |
| | * | | | | | | Changes to low-level audio API. | Kurt Korbatits | 2009-11-11 | 3 | -12/+12 |
| | * | | | | | | Doc: Added an example to demonstrate the QWebElement class. | David Boddie | 2009-11-09 | 6 | -1/+284 |
| | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | fademessage example: don't use a fixed width for the rect under the text | Joerg Bornemann | 2009-11-11 | 1 | -3/+7 |
| * | | | | | | fademessage example: deploy jpeg plugin on Windows CE | Joerg Bornemann | 2009-11-11 | 1 | -0/+3 |
* | | | | | | | Update examples for new SQL API. | Warwick Allison | 2009-11-18 | 2 | -42/+19 |
* | | | | | | | Web service integration example - Google Maps | Warwick Allison | 2009-11-16 | 3 | -0/+98 |
* | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-12 | 3 | -6/+19 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Merge branch '4.6-platform' into 4.6 | Denis Dzyubenko | 2009-11-11 | 3 | -6/+19 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Pinchzoom example zooms more smooth | Denis Dzyubenko | 2009-11-11 | 2 | -5/+18 |
| | * | | | | | Fixed opening files in the findfile example. | Denis Dzyubenko | 2009-11-10 | 1 | -1/+1 |
* | | | | | | | Merge remote branch 'qt/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-11-11 | 13 | -51/+69 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Improvements to graphics effects API after review round. | Samuel Rødal | 2009-11-10 | 4 | -6/+6 |
| |/ / / / / | |||||
| * | | | | | Changes to low-level audio API. | Kurt Korbatits | 2009-11-10 | 3 | -12/+12 |
| * | | | | | Changes to low-level audio API. | Kurt Korbatits | 2009-11-10 | 3 | -12/+12 |
| * | | | | | Merge branch '4.6' of ../qt into 4.6 | Kurt Korbatits | 2009-11-10 | 26 | -67/+424 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge commit 'qtwebkit/qtwebkit-4.6' into 4.6 | Jocelyn Turcotte | 2009-11-09 | 1 | -4/+3 |
| | |\ \ \ \ | |||||
| | | * | | | | Corrects bug in fancybrowser example where image rotation did not work. | Jocelyn Turcotte | 2009-11-06 | 1 | -4/+3 |