Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-06-17 | 4 | -7/+52 |
|\ | |||||
| * | Add test for model data changes. | Martin Jones | 2010-06-17 | 2 | -2/+47 |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-06-16 | 2 | -5/+5 |
| |\ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-06-16 | 1 | -0/+28 |
| | |\ | |||||
| | * | | Minor demo fixes | Alan Alpert | 2010-06-16 | 1 | -4/+5 |
| | * | | Fix autoScroll implementation | Alan Alpert | 2010-06-16 | 1 | -1/+0 |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-06-17 | 1 | -22/+64 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-06-16 | 1 | -22/+64 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Fixed problem with wrong size hints when items were removed. | Jan-Arve Sæther | 2010-06-16 | 1 | -22/+64 |
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6 | Simon Hausmann | 2010-06-16 | 4 | -4/+4 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | 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 | 9 | -9/+9 |
| |\ \ \ \ \ | |||||
| | * | | | | | Bump version number after 4.6.3 release. | Jason McDonald | 2010-06-15 | 9 | -9/+9 |
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6 | Simon Hausmann | 2010-06-16 | 13 | -34/+97 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | 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 | 13 | -34/+97 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | Temporary fix for regression in QSslCertificate::fromPath() | Zeno Albisser | 2010-06-15 | 1 | -0/+3 |
| | * | | | | | Fix symbian building of TARGET with a slash | Thomas Zander | 2010-06-15 | 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-15 | 11 | -33/+93 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-06-12 | 11 | -33/+93 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | use "win32-g++*" scope to match all MinGW makespecs | Mark Brand | 2010-06-10 | 4 | -4/+4 |
| | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-06-08 | 7 | -29/+89 |
| | | | |\ \ \ \ \ | |||||
| | | | | * \ \ \ \ | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-s... | Denis Dzyubenko | 2010-06-07 | 29 | -148/+854 |
| | | | | |\ \ \ \ \ | |||||
| | | | | | * | | | | | XQuery test suite (and others): remove p4 dependency | Peter Hartmann | 2010-06-07 | 1 | -4/+0 |
| | | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-06-05 | 3 | -18/+5 |
| | | | | | |\ \ \ \ \ | |||||
| | | | | | | * | | | | | Add convenience constructor to QTextOption::Tab | David Faure | 2010-06-04 | 3 | -18/+5 |
| | | | | * | | | | | | | Fix QApplication/QWidget to really take ownership of input contexts | Michael Hasselmann | 2010-06-07 | 2 | -7/+18 |
| | | | | * | | | | | | | Fixed GestureOverride event delivery in GraphicsView. | Denis Dzyubenko | 2010-06-07 | 1 | -0/+66 |
* | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6 | Simon Hausmann | 2010-06-16 | 3 | -0/+68 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-06-16 | 2 | -0/+40 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | / | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Fix bug with childrenRect resizing on startup. | Michael Brasser | 2010-06-15 | 2 | -0/+40 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Fixed QImageReader::format() inconsistency. | Samuel Rødal | 2010-06-15 | 1 | -0/+28 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6 | Simon Hausmann | 2010-06-15 | 2 | -12/+41 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | Fixed unit test failure in qimagereader. | Kurt Korbatits | 2010-06-15 | 1 | -2/+2 |
| * | | | | | | | | 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 | 1 | -0/+17 |
| * | | | | | | | | QLocalSocket/Win: call close on async connection loss | Joerg Bornemann | 2010-06-14 | 1 | -1/+20 |
* | | | | | | | | | 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 | 4 | -47/+130 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6 | Simon Hausmann | 2010-06-13 | 4 | -47/+130 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | / / / / / / | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Fix incorrect line breaking in QtWebKit. | Pierre Rossi | 2010-06-11 | 1 | -6/+105 |
| | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | QLocalSocket: don't emit readChannelFinished() twice on Windows | Joerg Bornemann | 2010-06-10 | 1 | -1/+1 |
| | * | | | | | QLocalSocket: fix reading from a socket after broken connection | Joerg Bornemann | 2010-06-10 | 1 | -3/+13 |
| | * | | | | | tst_QLocalSocket::threadedConnection autotest stabilized | Joerg Bornemann | 2010-06-10 | 1 | -26/+12 |
| | * | | | | | tst_qlocalsocket: pro files of client / server examples fixed | Joerg Bornemann | 2010-06-10 | 2 | -12/+0 |
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-06-12 | 125 | -232/+838 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-06-12 | 125 | -232/+838 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix test - sizeHint should not change after initial load. Also use | Bea Lam | 2010-06-11 | 1 | -5/+3 |
| | * | | | | | | Fix qmlviewer test failure on windows | Martin Jones | 2010-06-11 | 1 | -8/+8 |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-06-10 | 1 | -0/+17 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Improve test stability. | Warwick Allison | 2010-06-10 | 1 | -0/+17 |
| | * | | | | | | | Stablize qmlviewer test | Martin Jones | 2010-06-10 | 1 | -13/+14 |
| | |/ / / / / / | |||||
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-06-09 | 1 | -0/+1 |
| | |\ \ \ \ \ \ |