summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Geir Vattekar2010-06-17242-5029/+7795
|\
| * Speed up calls to QPainter::setCompositionMode when the mode is unchangedSimon Hausmann2010-06-171-0/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-179-39/+99
| |\
| | * Fix crash on Mac OS X when drawing text with Qt::TextBypassShaping setTor Arne Vestbø2010-06-161-1/+2
| | * Fixed infinite recursion when drawing very large painter paths.Kim Motoyoshi Kalland2010-06-163-9/+14
| | * Fixed full-rule on clipped painter paths.Kim Motoyoshi Kalland2010-06-161-0/+4
| | * Removed unnecessary lines of code.Kim Motoyoshi Kalland2010-06-161-4/+0
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-164-25/+79
| | |\
| | | * Fixed problem with wrong size hints when items were removed.Jan-Arve Sæther2010-06-164-25/+79
| * | | 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
| | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-101-1/+1
| | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | * | | | | | | Regression Qt4.4: QMovie does not render properly some mng filesKurt Korbatits2010-06-101-1/+0
| | | | | | | | | | | |/ / / / / | | | | | | | | | | |/| | | | |
| | | | | | | | | | * | | | | | QMovie cpu usage up to 100%Kurt Korbatits2010-06-101-1/+1
| | | | * | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-142-10/+52
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | |/| | | | | | | | | | |
| | | | | * | | | | | | | | | | beautify tst_QLocalSocket::writeToClientAndDisconnectJoerg Bornemann2010-06-141-9/+2
| | | | | * | | | | | | | | | | QLocalSocket/Win: check for broken pipe in waitForReadyReadJoerg Bornemann2010-06-142-0/+28
| | | | | * | | | | | | | | | | QLocalSocket/Win: call close on async connection lossJoerg Bornemann2010-06-142-1/+22
| | | | * | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-141-4/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | | | / / / / / / / / / / | | | | | |/ / / / / / / / / / | | | | |/| | | | | | | | | |