Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-04 | 1 | -0/+0 |
|\ | |||||
| * | Update QTestLib documentation with chart use case. | Fabien Freling | 2010-02-04 | 1 | -0/+0 |
* | | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Olivier Goffart | 2010-02-04 | 2 | -3/+3 |
|\ \ | |||||
| * | | Fixed the URL of known issues wiki page in docs | Miikka Heikkinen | 2010-02-01 | 2 | -3/+3 |
* | | | Remove obsolete OpenGL/ES CommonLite (fixed-point) support | Rhys Weatherley | 2010-02-04 | 3 | -16/+11 |
| |/ |/| | |||||
* | | Merge remote branch 'qt/4.6' into qt-master-from-4.6 | Qt Continuous Integration System | 2010-02-01 | 6 | -8/+28 |
|\ \ | |/ | |||||
| * | Doc: Put the correct images with the D-Bus and Embedded Linux sections. | David Boddie | 2010-01-28 | 1 | -2/+2 |
| * | doc: Document the "Type" enum value as a const in variable. | Martin Smith | 2010-01-28 | 1 | -0/+11 |
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-01-24 | 4 | -6/+15 |
| |\ | |||||
| | * | Doc: Fixed broken link. | David Boddie | 2010-01-22 | 1 | -1/+1 |
| | * | Doc: Added a warning about the Accelerated Graphics Driver example. | David Boddie | 2010-01-22 | 1 | -0/+3 |
| | * | Doc: Fixed installation information for Qt for Embedded Linux. | David Boddie | 2010-01-22 | 2 | -5/+11 |
* | | | Merge commit 'oslo1/master' into oslo1-master | Rohan McGovern | 2010-02-01 | 10 | -65/+50 |
|\ \ \ | |||||
| * \ \ | Merge commit 'refs/merge-requests/388' of git://gitorious.org/qt/qt into inte... | David Boddie | 2010-01-28 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | doc: Fix qmake-manual warn_on/warn_off references | Ademar de Souza Reis Jr | 2009-12-03 | 1 | -2/+2 |
| * | | | | Merge branch 'master' into staging-1-master | Paul Olav Tvete | 2010-01-25 | 1257 | -1654/+2570 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch '4.6' | Thiago Macieira | 2010-01-21 | 3 | -5/+5 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | * | | | | Merge branch '4.6' | Thiago Macieira | 2010-01-18 | 19 | -149/+895 |
| | |\ \ \ \ | |||||
| | * | | | | | Doc: Cocoa is now the default Mac port. | Morten Johan Sørvig | 2010-01-15 | 1 | -21/+19 |
| | * | | | | | Merge branch '4.6' | Thiago Macieira | 2010-01-13 | 1244 | -1316/+1396 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch '4.6' | Thiago Macieira | 2010-01-12 | 2 | -6/+23 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Rename files in completer example since QDirModel is not used. | Alexis Menard | 2010-01-08 | 1 | -15/+15 |
| | * | | | | | | | Merge branch '4.6' | Thiago Macieira | 2010-01-08 | 8 | -25/+47 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Assistant: Add doucmentation for -rebuild-search-index option. | ck | 2010-01-07 | 1 | -1/+5 |
| | * | | | | | | | | Merge branch '4.6' | Thiago Macieira | 2009-12-26 | 7 | -58/+118 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Doc: remove obsolete Win9x stuff from the documentation | miniak | 2009-12-22 | 5 | -23/+6 |
| | * | | | | | | | | | Merge branch '4.6' | Thiago Macieira | 2009-12-08 | 3 | -14/+11 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge commit 'oslo-staging-1/4.6' into master-mainline | Richard Moe Gustavsen | 2009-12-04 | 3 | -5/+7 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch '4.6' | Thiago Macieira | 2009-12-02 | 6 | -31/+42 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ \ \ \ | Merge commit 'origin/4.6' into oslo1-master | Rohan McGovern | 2010-02-01 | 1257 | -1594/+2525 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Assistant docs: Fix link. | ck | 2010-01-21 | 1 | -1/+1 |
| * | | | | | | | | | | | QtHelp docs: Fix illegal namespace name. | ck | 2010-01-21 | 2 | -2/+2 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6 | David Boddie | 2010-01-20 | 4 | -8/+47 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-01-19 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Fix copyright year. | Jason McDonald | 2010-01-19 | 1 | -1/+1 |
| | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-01-19 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | Fix Typo | Thomas Zander | 2010-01-19 | 1 | -1/+1 |
| | * | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-01-18 | 2 | -6/+45 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | Describe patch-capabilities in the install instructions. | Shane Kearns | 2010-01-18 | 2 | -6/+45 |
| * | | | | | | | | | | | Doc: Fixed some earlier incorrect documentation fixes. | David Boddie | 2010-01-20 | 1 | -3/+3 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6 | David Boddie | 2010-01-15 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i... | Qt Continuous Integration System | 2010-01-14 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Revert "Frequency to SampleRate and channels to channelCount." | Kurt Korbatits | 2010-01-14 | 1 | -1/+1 |
| | | * | | | | | | | | | Revert "Added setChannelCount() to QAudioFormat." | Kurt Korbatits | 2010-01-14 | 1 | -1/+1 |
| * | | | | | | | | | | | Doc: Added placeholder pages for new examples and updated the overviews. | David Boddie | 2010-01-15 | 13 | -131/+835 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6 | David Boddie | 2010-01-13 | 6 | -32/+48 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Simon Hausmann | 2010-01-13 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2010-01-13 | 1244 | -1313/+1394 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | |||||
| | | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int... | Qt Continuous Integration System | 2010-01-09 | 1 | -3/+3 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int... | Qt Continuous Integration System | 2010-01-09 | 1 | -3/+3 |
| | | | |\ \ \ \ \ \ \ \ |