Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/4.7' into HEAD | Thiago Macieira | 2011-03-16 | 12 | -10/+173 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-03-16 | 2 | -0/+47 |
| |\ | |||||
| | * | Disabled non-QDeclarativeItems in Flickable break flicking | Martin Jones | 2011-03-16 | 2 | -0/+47 |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-03-15 | 1 | -0/+17 |
| |\ \ | |||||
| | * | | Adjust right bearing when breaking with line separators | Jiang Jiang | 2011-03-15 | 1 | -0/+17 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-03-15 | 1 | -2/+12 |
| |\ \ \ | |||||
| | * | | | Fix qgraphicstransform autotest for Symbian, where qreal is float. | Laszlo Agocs | 2011-03-14 | 1 | -2/+12 |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-03-15 | 6 | -1/+75 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Regression: currentIndex was not set correctly after model cleared. | Martin Jones | 2011-03-15 | 2 | -0/+46 |
| | * | | | Remove bindings before assigning constants in VME | Aaron Kennedy | 2011-03-15 | 4 | -1/+29 |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-03-14 | 1 | -0/+5 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Prevented infinite recursion in QPainterPath::contains(). | Samuel Rødal | 2011-03-14 | 1 | -0/+5 |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-03-14 | 1 | -7/+17 |
| |\ \ \ \ | |||||
| | * | | | | QNAM HTTP: error() in case connection is closed unexpectedly | Markus Goetz | 2011-03-14 | 1 | -7/+17 |
* | | | | | | Merge earth-team into master | Olivier Goffart | 2011-03-15 | 6 | -36/+200 |
|\ \ \ \ \ \ | |||||
| * | | | | | | SSL: Switch default version to TlsV1SslV3 (i.e. use TLS 1 or SSL 3) | Peter Hartmann | 2011-03-14 | 1 | -3/+15 |
| * | | | | | | SSL: introduce new option TlsV1SslV3 for SSL communication | Peter Hartmann | 2011-03-14 | 1 | -30/+120 |
| * | | | | | | tst_qnetworkreply: fix MiniHttpServer crash | Martin Petersson | 2011-03-10 | 1 | -1/+0 |
| * | | | | | | Improve handling QByteArray with QStringBuilder | Denis Dzyubenko | 2011-03-03 | 1 | -1/+25 |
| * | | | | | | SSL tests: Be more verbose in on-demand cert test | Markus Goetz | 2011-03-03 | 2 | -2/+2 |
| * | | | | | | Fix qstringbuilder test. | Olivier Goffart | 2011-03-02 | 1 | -0/+1 |
| * | | | | | | Wrap qPrintable inside QString | Olivier Goffart | 2011-03-01 | 1 | -0/+2 |
| * | | | | | | Fix QTextStream::pos() causes buffer offset issues on large text files. | Chris Kawano | 2011-03-01 | 1 | -0/+36 |
| * | | | | | | SSL: Switch default version to TLS 1.0 | Peter Hartmann | 2011-02-28 | 1 | -2/+2 |
* | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-03-14 | 3 | -0/+16 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-03-14 | 3 | -0/+16 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-03-14 | 3 | -0/+16 |
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||||
| | | * | | | | | Fix TextEdit mouseSelectionMode overriding selectByMouse. | Andrew den Exter | 2011-03-14 | 3 | -0/+16 |
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast... | Qt Continuous Integration System | 2011-03-14 | 4 | -58/+166 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master-upstream' | Thierry Bastian | 2011-03-10 | 115 | -1095/+5566 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' | Gabriel de Dietrich | 2011-02-15 | 223 | -281/+16232 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Added QMdiArea::tabsMovable and tabsClosable | J-P Nurmi | 2011-02-10 | 1 | -0/+73 |
| * | | | | | | | | | | Merge branch 'master-upstream' | Gabriel de Dietrich | 2011-02-08 | 50 | -837/+2212 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2011-01-20 | 1710 | -6083/+6690 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Enable the widthForHeight() test case. | Jan-Arve Saether | 2011-01-19 | 1 | -5/+4 |
| * | | | | | | | | | | | | Fix some wrong tests in heightForWidth() | Jan-Arve Saether | 2011-01-19 | 1 | -15/+18 |
| * | | | | | | | | | | | | Fix and enable the tests that were disabled. | Jan-Arve Saether | 2011-01-19 | 1 | -37/+33 |
| * | | | | | | | | | | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-25 | 42 | -554/+3578 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-24 | 5 | -0/+122 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-22 | 19 | -49/+314 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-17 | 20 | -390/+945 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-16 | 102 | -192/+2237 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-15 | 18 | -23/+501 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-14 | 2 | -2/+63 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-11 | 152 | -2970/+9330 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-07 | 9 | -48/+25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-05 | 3 | -0/+541 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-04 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-02 | 1 | -0/+41 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-11-27 | 3 | -51/+41 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |