Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix ghost ap issue, and dont block on connect | Lorn Potter | 2010-06-21 | 2 | -82/+235 |
* | Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7 | Lorn Potter | 2010-06-17 | 626 | -7031/+13947 |
|\ | |||||
| * | 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 |
| | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | * \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-06-10 | 1 | -1/+1 |
| | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | * | | | | | | Regression Qt4.4: QMovie does not render properly some mng files | Kurt Korbatits | 2010-06-10 | 1 | -1/+0 |
| | | | | | | | | | | |/ / / / | | | | | | | | | | |/| | | | | |||||
| | | | | | | | | | * | | | | | QMovie cpu usage up to 100% | Kurt Korbatits | 2010-06-10 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-06-14 | 2 | -10/+52 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | |/| | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | beautify tst_QLocalSocket::writeToClientAndDisconnect | Joerg Bornemann | 2010-06-14 | 1 | -9/+2 |
| | | | | * | | | | | | | | | | QLocalSocket/Win: check for broken pipe in waitForReadyRead | Joerg Bornemann | 2010-06-14 | 2 | -0/+28 |
| | | | | * | | | | | | | | | | QLocalSocket/Win: call close on async connection loss | Joerg Bornemann | 2010-06-14 | 2 | -1/+22 |
| | | | * | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-06-14 | 1 | -4/+3 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | | | / / / / / / / / / | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | | | |||||
| | | | | * | | | | | | | | | fix detection of header files | David Fries | 2010-06-14 | 1 | -4/+3 |
| | | * | | | | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-06-14 | 13 | -75/+221 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-06-14 | 13 | -75/+221 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | | Prospective S60 build fix | Simon Hausmann | 2010-06-13 | 2 | -4/+4 |
| | | | | * | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6 | Simon Hausmann | 2010-06-13 | 12 | -71/+217 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / | |||||
| | | | | | * | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-06-12 | 2 | -9/+114 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / | | | | | | | | / / / / / / / / | | | | | | | |/ / / / / / / / | | | | | | |/| | | | | | | | | |||||
| | | | | | | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-06-12 | 2 | -9/+114 |
| | | | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / |