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 | 12 | -55/+137 |
|\ | |||||
| * | doc: add note that items with width or height of 0 are not positioned. | Martin Jones | 2010-06-17 | 1 | -0/+8 |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-06-17 | 73 | -2360/+681 |
| |\ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-06-16 | 10 | -54/+127 |
| | |\ | |||||
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-06-16 | 39 | -127/+336 |
| | | |\ | |||||
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-06-16 | 1 | -0/+1 |
| | | | |\ | |||||
| | | | * | | Move knowledge of QGraphicsObject out of qml engine | Aaron Kennedy | 2010-06-16 | 6 | -15/+62 |
| | | * | | | Write TextInput.positionToRectangle docs. | Alan Alpert | 2010-06-16 | 2 | -4/+10 |
| | | * | | | Fix autoScroll implementation | Alan Alpert | 2010-06-16 | 2 | -35/+54 |
| * | | | | | clearFocus() shouldn't mess with focus if it doesn't have focus | Martin Jones | 2010-06-17 | 1 | -1/+2 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-06-16 | 32 | -112/+273 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Stopping a flick resulted in the next click being consumed. | Martin Jones | 2010-06-16 | 1 | -0/+1 |
| | |_|/ | |/| | | |||||
* | | | | 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 | 8 | -17/+35 |
|\ \ \ \ | |||||
| * | | | | Fix crash on Mac OS X when drawing text with Qt::TextBypassShaping set | Tor Arne Vestbø | 2010-06-16 | 1 | -1/+2 |
| * | | | | Fixed infinite recursion when drawing very large painter paths. | Kim Motoyoshi Kalland | 2010-06-16 | 3 | -9/+14 |
| * | | | | Fixed full-rule on clipped painter paths. | Kim Motoyoshi Kalland | 2010-06-16 | 1 | -0/+4 |
| * | | | | Removed unnecessary lines of code. | Kim Motoyoshi Kalland | 2010-06-16 | 1 | -4/+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-16 | 3 | -3/+15 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Fixed problem with wrong size hints when items were removed. | Jan-Arve Sæther | 2010-06-16 | 3 | -3/+15 |
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6 | Simon Hausmann | 2010-06-16 | 24 | -256/+509 |
|\ \ \ \ \ | |||||
| * | | | | | 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/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-06-15 | 3 | -4/+4 |
| |\ \ \ \ \ | |||||
| | * | | | | | Bump version number after 4.6.3 release. | Jason McDonald | 2010-06-15 | 3 | -4/+4 |
| * | | | | | | 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 |
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6 | Simon Hausmann | 2010-06-16 | 64 | -2306/+555 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | 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 | 64 | -2306/+555 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| | * | | | | | | | | 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 | 64 | -2306/+555 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Use native locale aware string comparison on Symbian. | Denis Dzyubenko | 2010-06-15 | 1 | -0/+4 |
| | | * | | | | | | | | Temporary fix for regression in QSslCertificate::fromPath() | Zeno Albisser | 2010-06-15 | 1 | -3/+8 |
| | | * | | | | | | | | 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 | 63 | -2305/+545 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Fix a minor typo in QAbstractItemModel's documentation. | Robin Burchell | 2010-06-14 | 1 | -1/+1 |
| | | | * | | | | | | | | QXmlSchema: allow usage of xsd:all | Peter Hartmann | 2010-06-14 | 2 | -0/+37 |
| | | | * | | | | | | | | QSslSocket: fix build for MinGW and VS 2005 | Peter Hartmann | 2010-06-14 | 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 | 2010-06-14 | 60 | -2304/+503 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ | 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 | 60 | -2304/+503 |
| | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | | Fix symbian-abld build failure with bearer plugins | Miikka Heikkinen | 2010-06-11 | 4 | -2/+4 |
| | | | | | * | | | | | | | | remove certificate bundle | Peter Hartmann | 2010-06-11 | 3 | -1992/+0 |
| | | | | | * | | | | | | | | make QSslSocket::systemCaCertificates() use system certs | Peter Hartmann | 2010-06-11 | 3 | -20/+138 |
| | | | | | * | | | | | | | | Adjusted RegExp in QSslCertificate::fromPath() | Zeno Albisser | 2010-06-11 | 1 | -1/+1 |
| | | | | | * | | | | | | | | Fix QSystemTrayIcon::supportsMessages() on Windows | miniak | 2010-06-11 | 7 | -22/+31 |
| | | | | | * | | | | | | | | Use NIM_SETVERSION to get the latest behavior | miniak | 2010-06-11 | 1 | -16/+71 |
| | | | | | * | | | | | | | | Cleanup obsolete stuff | miniak | 2010-06-11 | 2 | -58/+4 |
| | | | | | * | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-06-11 | 234 | -1165/+3493 |
| | | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | | | * | | | | | | | | Fixed a broken merge. | Denis Dzyubenko | 2010-06-11 | 2 | -66/+0 |