Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'mainline/4.7' into 4.7 | Oswald Buddenhagen | 2011-03-31 | 11 | -44/+100 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-03-31 | 1 | -15/+19 |
| |\ | |||||
| | * | QSoftkeyManager auto test update | Titta Heikkala | 2011-03-30 | 1 | -15/+19 |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-03-30 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Corrected case mismatch. | axis | 2011-03-29 | 1 | -1/+1 |
| | * | Merge commit 'refs/merge-requests/2584' of gitorious.org:qt/qt into merge-req... | Sami Merila | 2011-03-29 | 66 | -171/+4106 |
| | |\ | |||||
| * | \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-03-30 | 2 | -23/+18 |
| |\ \ \ | |||||
| | * | | | Return correct boundaries reasons from QTextBoundaryFinder. | Andrew den Exter | 2011-03-30 | 2 | -23/+18 |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-03-28 | 2 | -2/+2 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Fixed autotests on Windows. | axis | 2011-03-25 | 2 | -2/+2 |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-03-28 | 1 | -0/+12 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Fix text selection with shift-click. | Andrew den Exter | 2011-03-28 | 1 | -0/+12 |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-03-28 | 1 | -0/+4 |
| |\ \ \ \ | |||||
| | * | | | | Fixed infinite loop in QPainterPath::intersects() when qreal=float. | Samuel Rødal | 2011-03-28 | 1 | -0/+4 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-03-28 | 13 | -3/+256 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-03-25 | 1 | -0/+20 |
| |\ \ \ \ | |||||
| | * | | | | Make sure num_glyphs pass to HarfBuzz is large enough | Jiang Jiang | 2011-03-24 | 1 | -0/+20 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-03-22 | 1 | -0/+18 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Text bounding rect calculated incorrectly if non-top aligned. | Martin Jones | 2011-03-21 | 1 | -0/+18 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-03-22 | 6 | -6/+6 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-03-21 | 1 | -3/+6 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Remove incorrect check in qpixmap autotest. | Laszlo Agocs | 2011-03-21 | 1 | -3/+6 |
* | | | | | | | QDirIterator returns hidden directories when it should only return files | Carlos Manuel Duclos Vergara | 2011-03-30 | 1 | -0/+55 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | QSslSocket: add test for blacklisted certificates | Peter Hartmann | 2011-03-25 | 3 | -3/+74 |
* | | | | | | QSslCertificate: fix test for blacklisted certs on Windows | Peter Hartmann | 2011-03-25 | 1 | -2/+2 |
* | | | | | | QSslCertificate: report fraudulent certificates as invalid | Peter Hartmann | 2011-03-24 | 10 | -0/+182 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge remote-tracking branch 'mainline/4.7' into 4.7 | Oswald Buddenhagen | 2011-03-21 | 13 | -24/+219 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-03-21 | 1 | -1/+5 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Prepare fromSymbianCFbsBitmap autotest for 16 bpp format. | Laszlo Agocs | 2011-03-21 | 1 | -1/+5 |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-03-21 | 2 | -8/+28 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Fix writing to an attached property from script. | Michael Brasser | 2011-03-21 | 2 | -8/+28 |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-03-17 | 1 | -21/+146 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-03-17 | 4 | -1/+95 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | PathView doesn't update if preferred highlight range changes. | Martin Jones | 2011-03-17 | 2 | -1/+41 |
| | * | | | | Image.PreserveAspectFit has unexpected effect on Image's sourceSize | Martin Jones | 2011-03-17 | 2 | -0/+54 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-03-17 | 1 | -3/+3 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Re-enable lineHeight tests. | Yann Bodson | 2011-03-17 | 1 | -3/+3 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int... | Qt Continuous Integration System | 2011-03-16 | 1 | -11/+58 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7 | Jan-Arve Sæther | 2011-03-16 | 49 | -89/+2645 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Introduce QGraphicsItem::ItemStopsFocusHandling flag | Michael Hasselmann | 2011-03-16 | 1 | -11/+58 |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-03-16 | 4 | -0/+30 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| | * | | | | | | Qt.include() used in WorkerScript is broken on Windows. | Martin Jones | 2011-03-16 | 4 | -0/+30 |
* | | | | | | | | Bump Qt version to 4.7.4 | Timo Turunen | 2011-03-21 | 6 | -6/+6 |
| |_|_|_|/ / / |/| | | | | | | |||||
* | | | | | | | Fix accidental population of the disk cache with partial content | Simon Hausmann | 2011-03-17 | 1 | -0/+93 |
* | | | | | | | Fix disk cache interaction for range retrieval HTTP requests. | Simon Hausmann | 2011-03-17 | 1 | -21/+53 |
|/ / / / / / | |||||
* | | | | | | 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 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | |