summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-1712-55/+137
|\
| * doc: add note that items with width or height of 0 are not positioned.Martin Jones2010-06-171-0/+8
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-1773-2360/+681
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-1610-54/+127
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-1639-127/+336
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-06-161-0/+1
| | | | |\
| | | | * | Move knowledge of QGraphicsObject out of qml engineAaron Kennedy2010-06-166-15/+62
| | | * | | Write TextInput.positionToRectangle docs.Alan Alpert2010-06-162-4/+10
| | | * | | Fix autoScroll implementationAlan Alpert2010-06-162-35/+54
| * | | | | clearFocus() shouldn't mess with focus if it doesn't have focusMartin Jones2010-06-171-1/+2
| | |_|_|/ | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-1632-112/+273
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Stopping a flick resulted in the next click being consumed.Martin Jones2010-06-161-0/+1
| | |_|/ | |/| |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-178-17/+35
|\ \ \ \
| * | | | Fix crash on Mac OS X when drawing text with Qt::TextBypassShaping setTor Arne Vestbø2010-06-161-1/+2
| * | | | Fixed infinite recursion when drawing very large painter paths.Kim Motoyoshi Kalland2010-06-163-9/+14
| * | | | Fixed full-rule on clipped painter paths.Kim Motoyoshi Kalland2010-06-161-0/+4
| * | | | Removed unnecessary lines of code.Kim Motoyoshi Kalland2010-06-161-4/+0
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-163-3/+15
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fixed problem with wrong size hints when items were removed.Jan-Arve Sæther2010-06-163-3/+15
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-1624-256/+509
|\ \ \ \ \
| * | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-165-20/+52
| * | | | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5e9b2a886...Simon Hausmann2010-06-161-1/+1
| * | | | | Buildfix for MSVC2008 (C90 violation)Andreas Kling2010-06-151-2/+4
| * | | | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 1313dc846...Simon Hausmann2010-06-1523-180/+912
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-153-4/+4
| |\ \ \ \ \
| | * | | | | Bump version number after 4.6.3 release.Jason McDonald2010-06-153-4/+4
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-155-89/+53
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-145-89/+53
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-145-89/+53
| | | |\ \ \ \ \ \
| | | | * | | | | | Fix issues with thai line breakingLars Knoll2010-06-145-89/+53
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-1664-2306/+555
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1664-2306/+555
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1564-2306/+555
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Use native locale aware string comparison on Symbian.Denis Dzyubenko2010-06-151-0/+4
| | | * | | | | | | | Temporary fix for regression in QSslCertificate::fromPath()Zeno Albisser2010-06-151-3/+8
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1563-2305/+545
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Fix a minor typo in QAbstractItemModel's documentation.Robin Burchell2010-06-141-1/+1
| | | | * | | | | | | | QXmlSchema: allow usage of xsd:allPeter Hartmann2010-06-142-0/+37
| | | | * | | | | | | | QSslSocket: fix build for MinGW and VS 2005Peter Hartmann2010-06-141-0/+4
| | | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1460-2304/+503
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1260-2304/+503
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * | | | | | | | Fix symbian-abld build failure with bearer pluginsMiikka Heikkinen2010-06-114-2/+4
| | | | | | * | | | | | | | remove certificate bundlePeter Hartmann2010-06-113-1992/+0
| | | | | | * | | | | | | | make QSslSocket::systemCaCertificates() use system certsPeter Hartmann2010-06-113-20/+138
| | | | | | * | | | | | | | Adjusted RegExp in QSslCertificate::fromPath()Zeno Albisser2010-06-111-1/+1
| | | | | | * | | | | | | | Fix QSystemTrayIcon::supportsMessages() on Windowsminiak2010-06-117-22/+31
| | | | | | * | | | | | | | Use NIM_SETVERSION to get the latest behaviorminiak2010-06-111-16/+71
| | | | | | * | | | | | | | Cleanup obsolete stuffminiak2010-06-112-58/+4
| | | | | | * | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-11234-1165/+3493
| | | | | | |\ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | Fixed a broken merge.Denis Dzyubenko2010-06-112-66/+0