Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | doc: Added more DITA output to the XML generator | Martin Smith | 2010-06-18 | 3 | -5/+47 |
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-06-17 | 9 | -22/+263 |
|\ | |||||
| * | Usefully convert from QtScript object/array to QVariant | Kent Hansen | 2010-06-17 | 8 | -22/+257 |
| * | document QSslSocket::systemCaCertificates() change in changelog | Peter Hartmann | 2010-06-17 | 1 | -0/+6 |
* | | doc: Added more DITA output to the XML generator | Martin Smith | 2010-06-17 | 2 | -11/+105 |
|/ | |||||
* | Implement QIODevice::peek() using read() + ungetBlock(). | Andreas Kling | 2010-06-16 | 2 | -7/+23 |
* | Allocate the memory for QtFontSize when count > 1 | Benjamin Poulain | 2010-06-16 | 1 | -1/+1 |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-06-16 | 15 | -38/+243 |
|\ | |||||
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-06-16 | 66 | -530/+733 |
| |\ | |||||
| | * | Defer allocation of GIF decoding tables/stack. | Andreas Kling | 2010-06-16 | 1 | -2/+12 |
| | * | Make sure only started gestures can cause cancellations | Thomas Zander | 2010-06-16 | 1 | -1/+2 |
| | * | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t... | Kent Hansen | 2010-06-16 | 3 | -10/+29 |
| | * | qmake: Fix CONFIG += exceptions_off with the MSVC project generator. | Jocelyn Turcotte | 2010-06-16 | 2 | -2/+6 |
| | * | Fix some kind of race condition while using remote commands. | kh1 | 2010-06-16 | 2 | -2/+24 |
| | * | Work around ICE in Intel C++ Compiler 11.1.072 | Thiago Macieira | 2010-06-16 | 1 | -1/+1 |
| | * | Reduce the memory consumption of QtFontStyle | Benjamin Poulain | 2010-06-16 | 1 | -4/+9 |
| * | | doc: Added more DITA output to the XML generator | Martin Smith | 2010-06-16 | 4 | -16/+160 |
* | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-06-16 | 48 | -347/+970 |
|\ \ \ | |||||
| * \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6 | Simon Hausmann | 2010-06-16 | 31 | -262/+699 |
| |\ \ \ | |||||
| | * \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-06-16 | 28 | -200/+966 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-06-16 | 28 | -200/+966 |
| | | |\ \ \ | | |/ / / / | |||||
| | | * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ... | Simon Hausmann | 2010-06-16 | 5 | -20/+52 |
| | | * | | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5e9b2a886... | Simon Hausmann | 2010-06-16 | 1 | -1/+1 |
| | | * | | | Buildfix for MSVC2008 (C90 violation) | Andreas Kling | 2010-06-15 | 1 | -2/+4 |
| | | * | | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 1313dc846... | Simon Hausmann | 2010-06-15 | 23 | -180/+912 |
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-06-16 | 2 | -2/+28 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-06-16 | 2 | -2/+28 |
| | | |\ \ \ | | |/ / / / | |||||
| | | * | | | VideoWidget example | Kurt Korbatits | 2010-06-16 | 2 | -2/+28 |
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-06-15 | 1 | -0/+158 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6 | Jason McDonald | 2010-06-15 | 13 | -117/+226 |
| | | |\ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-06-15 | 19 | -24/+24 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-06-15 | 5 | -89/+53 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-06-14 | 5 | -89/+53 |
| | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-06-14 | 5 | -89/+53 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * | | | | | | Fix issues with thai line breaking | Lars Knoll | 2010-06-14 | 5 | -89/+53 |
| | | | | | | * | | | | Add skeleton changes files for 4.6.4. | Jason McDonald | 2010-06-15 | 1 | -0/+158 |
| | | | | | |/ / / / | |||||
| | | | | | * | | | | Bump version number after 4.6.3 release. | Jason McDonald | 2010-06-15 | 19 | -24/+24 |
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6 | Simon Hausmann | 2010-06-16 | 144 | -4171/+6212 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6 | Simon Hausmann | 2010-06-16 | 41 | -466/+540 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-06-15 | 17 | -85/+271 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6 | Simon Hausmann | 2010-06-15 | 6 | -19/+59 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-06-15 | 3 | -5/+4 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | / / | | | | | |_|_|_|_|/ / | | | | |/| | | | | | | |||||
| | | | * | | | | | | | Fixed unit test failure in qimagereader. | Kurt Korbatits | 2010-06-15 | 2 | -3/+3 |
| | | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-06-14 | 2 | -2/+1 |
| | | | |\ \ \ \ \ \ \ | | | |/ / / / / / / / | |||||
| | | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-06-14 | 2 | -2/+1 |
| | | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / / | | | | |/| | | | | | | |||||
| | | | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-06-12 | 2 | -2/+1 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-06-12 | 2 | -2/+1 |
| | | | | | |\ \ \ \ \ \ | | | | | | | |_|_|_|/ / | | | | | | |/| | | | | | |||||
| | | | | | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-06-12 | 2 | -2/+1 |
| | | | | | | |\ \ \ \ \ | |||||
| | | | | | | | * \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-06-10 | 2 | -2/+1 |
| | | | | | | | |\ \ \ \ \ | |||||
| | | | | | | | | * \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6 | Kurt Korbatits | 2010-06-10 | 155 | -1611/+280760 |
| | | | | | | | | |\ \ \ \ \ |