Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.6' | Thiago Macieira | 2010-01-13 | 1244 | -1316/+1396 |
|\ | |||||
| * | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2010-01-13 | 1244 | -1313/+1394 |
| |\ | |||||
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6 | Martin Smith | 2010-01-12 | 2 | -4/+4 |
| | |\ | |||||
| | | * | doc: update snippets for QtScript function expressions | Kent Hansen | 2010-01-12 | 2 | -4/+4 |
| | * | | doc: Updated the descriptions of the connection types. | Martin Smith | 2010-01-12 | 1 | -16/+29 |
| | |/ | |||||
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6 | Martin Smith | 2010-01-11 | 2 | -6/+23 |
| | |\ | |||||
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-01-09 | 1244 | -1293/+1344 |
| | | |\ | |||||
| | | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-01-09 | 1244 | -1293/+1344 |
| | | | |\ | |||||
| | * | | | | doc: Added clarification about allocating space for the 0 terminator. | Martin Smith | 2010-01-11 | 1 | -0/+17 |
| | | |_|/ | | |/| | | |||||
| | * | | | doc: Fixed typos. | Martin Smith | 2010-01-08 | 1 | -8/+7 |
| | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6 | Martin Smith | 2010-01-08 | 3 | -12/+60 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Simon Hausmann | 2010-01-08 | 1 | -2/+2 |
| | | |\ \ \ | |||||
| | | * | | | | Doc: Added license information for the Symbian version of qtmain. | David Boddie | 2010-01-07 | 1 | -5/+47 |
| | | * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6 | David Boddie | 2010-01-07 | 1244 | -1280/+1302 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6 | David Boddie | 2010-01-06 | 2 | -3/+3 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Doc: Improved the advice about deployment of plugins. | David Boddie | 2010-01-06 | 1 | -4/+10 |
| | | * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6 | David Boddie | 2009-12-18 | 3 | -3/+47 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | Doc: Fixed comments in a code snippet. | David Boddie | 2009-12-18 | 1 | -1/+1 |
| | * | | | | | | | | doc: Explained parameter value defaults where appropriate. | Martin Smith | 2010-01-08 | 1 | -23/+27 |
| | | |_|_|/ / / / | | |/| | | | | | | |||||
| | * | | | | | | | doc: Corrected parameter value in snippet. | Martin Smith | 2010-01-07 | 1 | -1/+1 |
| | * | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6 | Jason McDonald | 2010-01-06 | 5 | -20/+42 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Update copyright year to 2010 | Jason McDonald | 2010-01-06 | 1244 | -1259/+1259 |
| | | |_|_|/ / / / | | |/| | | | | | | |||||
| * | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | | * | | | | | | Doc typos fixed | Jarek Kobus | 2010-01-08 | 1 | -3/+3 |
| | | | |_|_|_|/ | | | |/| | | | | |||||
* | | | | | | | | Merge branch '4.6' | Thiago Macieira | 2010-01-12 | 2 | -6/+23 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-01-09 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Doc: the QTextDecoder need to be destroyed, reflect that in the example | Olivier Goffart | 2010-01-08 | 1 | -0/+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-08 | 1 | -6/+22 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Separated "make run" and "make runonphone" targets | Miikka Heikkinen | 2010-01-07 | 1 | -6/+22 |
| | | |/ / / | | |/| | | | |||||
* | | | | | | 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 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '4.6' of ../../4.6 into 4.6 | Justin McPherson | 2010-01-07 | 14 | -81/+163 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-01-06 | 2 | -3/+3 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | doc: Replaced usses of rootState() with state machine pointer. | Martin Smith | 2010-01-05 | 1 | -2/+2 |
| | | * | | | doc: Fixed typo. | Martin Smith | 2010-01-05 | 1 | -1/+1 |
| | | | |/ | | | |/| | |||||
| | * | | | Fixed Symbian application deployment instructions | Miikka Heikkinen | 2010-01-05 | 2 | -7/+3 |
| | * | | | Fixed "run" makefile target documentation for Symbian | Miikka Heikkinen | 2010-01-05 | 2 | -1/+15 |
| | * | | | Updated sis file names and related content in Symbian installation docs | Miikka Heikkinen | 2010-01-04 | 2 | -12/+24 |
| | |/ / | |||||
| * | | | Frequency to SampleRate and channels to channelCount. | Kurt Korbatits | 2010-01-06 | 1 | -1/+1 |
| * | | | Added setChannelCount() to QAudioFormat. | Kurt Korbatits | 2010-01-06 | 1 | -1/+1 |
* | | | | 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 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6 | Martin Smith | 2009-12-18 | 1 | -2/+7 |
| |\ \ \ | |||||
| | * \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2009-12-17 | 1 | -0/+39 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge remote branch 'staging/4.6' into 4.6 | Simon Hausmann | 2009-12-17 | 4 | -55/+71 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into qt-inte... | Qt Continuous Integration System | 2009-12-12 | 1 | -2/+7 |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | | * | | | Assistant: Add documentation for -remove-search-index. | ck | 2009-12-10 | 1 | -2/+7 |
| * | | | | | doc: Fixed typos. | Martin Smith | 2009-12-18 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6 | Martin Smith | 2009-12-17 | 4 | -55/+71 |
| |\ \ \ \ | | | |_|/ | | |/| | |