summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* doc: Added more DITA output to the XML generatorMartin Smith2010-06-183-5/+47
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-179-22/+263
|\
| * Usefully convert from QtScript object/array to QVariantKent Hansen2010-06-178-22/+257
| * document QSslSocket::systemCaCertificates() change in changelogPeter Hartmann2010-06-171-0/+6
* | doc: Added more DITA output to the XML generatorMartin Smith2010-06-172-11/+105
|/
* Implement QIODevice::peek() using read() + ungetBlock().Andreas Kling2010-06-162-7/+23
* Allocate the memory for QtFontSize when count > 1Benjamin Poulain2010-06-161-1/+1
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1615-38/+243
|\
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-1666-530/+733
| |\
| | * Defer allocation of GIF decoding tables/stack.Andreas Kling2010-06-161-2/+12
| | * Make sure only started gestures can cause cancellationsThomas Zander2010-06-161-1/+2
| | * Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-06-163-10/+29
| | * qmake: Fix CONFIG += exceptions_off with the MSVC project generator.Jocelyn Turcotte2010-06-162-2/+6
| | * Fix some kind of race condition while using remote commands.kh12010-06-162-2/+24
| | * Work around ICE in Intel C++ Compiler 11.1.072Thiago Macieira2010-06-161-1/+1
| | * Reduce the memory consumption of QtFontStyleBenjamin Poulain2010-06-161-4/+9
| * | doc: Added more DITA output to the XML generatorMartin Smith2010-06-164-16/+160
* | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-1648-347/+970
|\ \ \
| * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-1631-262/+699
| |\ \ \
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-1628-200/+966
| | |\ \ \
| | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-1628-200/+966
| | | |\ \ \ | | |/ / / /
| | | * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-165-20/+52
| | | * | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5e9b2a886...Simon Hausmann2010-06-161-1/+1
| | | * | | Buildfix for MSVC2008 (C90 violation)Andreas Kling2010-06-151-2/+4
| | | * | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 1313dc846...Simon Hausmann2010-06-1523-180/+912
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-162-2/+28
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-162-2/+28
| | | |\ \ \ | | |/ / / /
| | | * | | VideoWidget exampleKurt Korbatits2010-06-162-2/+28
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-151-0/+158
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jason McDonald2010-06-1513-117/+226
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-1519-24/+24
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-155-89/+53
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-145-89/+53
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-145-89/+53
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Fix issues with thai line breakingLars Knoll2010-06-145-89/+53
| | | | | | | * | | | Add skeleton changes files for 4.6.4.Jason McDonald2010-06-151-0/+158
| | | | | | |/ / / /
| | | | | | * | | | Bump version number after 4.6.3 release.Jason McDonald2010-06-1519-24/+24
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-16144-4171/+6212
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-1641-466/+540
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-1517-85/+271
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-156-19/+59
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-153-5/+4
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | / / | | | | | |_|_|_|_|/ / | | | | |/| | | | | |
| | | | * | | | | | | Fixed unit test failure in qimagereader.Kurt Korbatits2010-06-152-3/+3
| | | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-142-2/+1
| | | | |\ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-142-2/+1
| | | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / / | | | | |/| | | | | |
| | | | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-122-2/+1
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-122-2/+1
| | | | | | |\ \ \ \ \ \ | | | | | | | |_|_|_|/ / | | | | | | |/| | | | |
| | | | | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-122-2/+1
| | | | | | | |\ \ \ \ \
| | | | | | | | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-102-2/+1
| | | | | | | | |\ \ \ \ \
| | | | | | | | | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-06-10155-1611/+280760
| | | | | | | | | |\ \ \ \ \