Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8 | David Boddie | 2011-05-24 | 1720 | -30927/+30927 |
|\ | |||||
| * | Merge remote branch 'origin/4.8' into 4.8-from-4.7 | Rohan McGovern | 2011-05-20 | 66 | -954/+978 |
| |\ | |||||
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma... | Qt Continuous Integration System | 2011-05-20 | 3 | -0/+5 |
| | |\ | |||||
| | | * | Increased EPOCHEAPSIZE for qpainter benchmark | Miikka Heikkinen | 2011-05-18 | 1 | -0/+2 |
| | | * | Increased EPOCHEAPSIZE for few benchmarks | Miikka Heikkinen | 2011-05-18 | 2 | -0/+3 |
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas... | Qt Continuous Integration System | 2011-05-19 | 1701 | -29268/+29268 |
| | |\ \ | |||||
| | | * \ | Merge remote-tracking branch 'qt/4.8' | Jyri Tahtela | 2011-05-19 | 8 | -28/+47 |
| | | |\ \ | |||||
| | | * | | | Re-apply licenseheader text in source files for qt4.8 | Jyri Tahtela | 2011-05-18 | 1 | -18/+18 |
| | | * | | | Merge remote-tracking branch 'qt/4.8' | Jyri Tahtela | 2011-05-18 | 129 | -1643/+1616 |
| | | |\ \ \ | |||||
| | | * | | | | Updating file with CRLF line endings for the updated header | Sergio Ahumada | 2011-05-17 | 1 | -29/+29 |
| | | * | | | | Update licenseheader text in source files for qt4.8 | Jyri Tahtela | 2011-05-13 | 1701 | -29278/+29278 |
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-05-19 | 1 | -6/+6 |
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | | * | | | | Update qhostinfo autotest to expect RFC5952 formatted ipv6 addresses | Shane Kearns | 2011-05-19 | 1 | -6/+6 |
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-05-18 | 7 | -28/+32 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Merge remote-tracking branch 'origin/4.8' | Olivier Goffart | 2011-05-18 | 129 | -1643/+1616 |
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | |||||
| | | * | | | | Merge remote-tracking branch 'earth-staging/master' | Olivier Goffart | 2011-05-18 | 1 | -2/+4 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Symbian socket: Implement systemProxyForQuery for service networks | Shane Kearns | 2011-05-18 | 1 | -2/+4 |
| | | * | | | | | tst_q3dns: update test to follow RFC-5952. | Martin Petersson | 2011-05-18 | 1 | -1/+1 |
| | | |/ / / / | |||||
| | | * | | | | Merge remote-tracking branch 'origin/4.8' | Olivier Goffart | 2011-05-16 | 2 | -0/+5 |
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | |||||
| | | * | | | | Merge remote-tracking branch 'origin/4.8' | Olivier Goffart | 2011-05-11 | 18 | -39/+520 |
| | | |\ \ \ \ | |||||
| | | * | | | | | QT_USE_QSTRINGBUILDER to fix source compatibility | Olivier Goffart | 2011-05-09 | 4 | -8/+4 |
| | | * | | | | | Make QHostAddress.toString() follow RFC-5952 for IPv6 address format. | Martin Petersson | 2011-05-06 | 1 | -17/+23 |
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master... | Qt Continuous Integration System | 2011-05-18 | 1 | -0/+15 |
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | | * | | | | | Fix inconsistency between Qt and ICU in Shift-JIS codec with regards to ASCII... | Simon Hausmann | 2011-05-16 | 1 | -0/+15 |
| | | | |_|/ / | | | |/| | | | |||||
| | * | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-05-17 | 17 | -12/+286 |
| | |\ \ \ \ \ | |||||
| * | \ \ \ \ \ | Merge remote branch 'origin/4.7' into 4.8-from-4.7 | Rohan McGovern | 2011-05-17 | 1647 | -28348/+28351 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-05-17 | 1647 | -28350/+28353 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Updating file with CRLF line endings for the updated header | Sergio Ahumada | 2011-05-17 | 1 | -29/+29 |
| | | * | | | | | | | Fix a regression in QList::mid() | Liang Qi | 2011-05-16 | 1 | -0/+3 |
| | | * | | | | | | | Update licenseheader text in source files | Jyri Tahtela | 2011-05-13 | 1647 | -28361/+28361 |
| * | | | | | | | | | Merge remote branch 'origin/4.8' into 4.8-from-4.7 | Rohan McGovern | 2011-05-17 | 114 | -1631/+1330 |
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | / / / / / | | |_|_|/ / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-... | Qt Continuous Integration System | 2011-05-17 | 102 | -974/+1099 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge remote branch 'origin/4.8' into qa-review-master | Rohan McGovern | 2011-05-15 | 301 | -2134/+87991 |
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | | | |||||
| | | * | | | | | | | Fixed license header. | Rohan McGovern | 2011-05-13 | 1 | -0/+42 |
| | | * | | | | | | | Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile | Rohan McGovern | 2011-05-12 | 5 | -0/+36 |
| | | * | | | | | | | Remove Q_ASSERT's from qsharedmemory autotest | Jason McDonald | 2011-05-11 | 2 | -2/+4 |
| | | * | | | | | | | Remove Q_ASSERT's from QNetworkReply autotest | Jason McDonald | 2011-05-10 | 1 | -7/+11 |
| | | * | | | | | | | Remove Q_ASSERT's from qabstractxmlnodemodel test | Jason McDonald | 2011-05-10 | 1 | -8/+7 |
| | | * | | | | | | | Remove Q_ASSERT from QXmlStream autotest | Jason McDonald | 2011-05-10 | 1 | -3/+3 |
| | | * | | | | | | | Remove Q_ASSERT from qxmlquery autotest | Jason McDonald | 2011-05-10 | 1 | -3/+2 |
| | | * | | | | | | | Remove Q_ASSERT's from QXmlStream autotest | Jason McDonald | 2011-05-10 | 1 | -5/+10 |
| | | * | | | | | | | Remove Q_ASSERT from QItemModel autotest | Jason McDonald | 2011-05-10 | 1 | -1/+2 |
| | | * | | | | | | | Remove Q_ASSERT's from qxmlquery autotest | Jason McDonald | 2011-05-10 | 2 | -4/+11 |
| | | * | | | | | | | Remove Q_ASSERT from qxmlquery autotest | Jason McDonald | 2011-05-10 | 2 | -1/+8 |
| | | * | | | | | | | Remove Q_ASSERT's from QXmlStream autotest | Jason McDonald | 2011-05-10 | 1 | -6/+8 |
| | | * | | | | | | | Remove Q_ASSERT from qabstractxmlnodemodel test | Jason McDonald | 2011-05-10 | 1 | -3/+3 |
| | | * | | | | | | | Remove Q_ASSERT from qscriptvaluegenerated test | Jason McDonald | 2011-05-10 | 1 | -6/+7 |
| | | * | | | | | | | Remove Q_ASSERT from QVariant autotest | Jason McDonald | 2011-05-10 | 1 | -6/+9 |
| | | * | | | | | | | Remove Q_ASSERT's from QTreeView autotest | Jason McDonald | 2011-05-09 | 1 | -2/+4 |
| | | * | | | | | | | Remove Q_ASSERT from qtesselator autotest | Jason McDonald | 2011-05-09 | 1 | -1/+2 |