summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix boundry conditions for cursor hit testJiang Jiang2011-05-251-1/+1
* Fix cursor position test on CursorOnCharacter caseJiang Jiang2011-05-253-4/+9
* Merge remote branch 'mainline/4.7' into 4.7Jiang Jiang2011-05-2431-498/+644
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-2211-215/+215
| |\
| | * Absenting function in winscw def files.Laszlo Agocs2011-05-2011-215/+215
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-202-22/+61
| |\ \ | | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-203-36/+33
| |\ \
| | * | Notify when the TextInput cursorRectangle property changes within pre-editAndrew den Exter2011-05-203-36/+33
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-191-2/+2
| |\ \ \
| | * | | Fix brush transform in QtDirectFB backend, fixing QTBUG-18577Denis Oliver Kropp2011-05-191-2/+2
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-192-137/+299
| |\ \ \ \ | | |/ / /
| | * | | directfb: Paint engine enhancementsDenis Oliver Kropp2011-05-192-137/+299
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-1812-57/+44
| |\ \ \ \
| | * | | | Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-1812-57/+44
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-181-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-183-51/+51
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Re-apply licenseheader text in source files for qt4.7Jyri Tahtela2011-05-183-51/+51
| |/ / / / /
* | | | | | Fix xToCursor issue due to backporting from 4.8Jiang Jiang2011-05-241-0/+2
* | | | | | Support placing cursor in ligature with mouse or touchJiang Jiang2011-05-234-7/+99
| |_|_|_|/ |/| | | |
* | | | | Fix ligature offset in multi-line textJiang Jiang2011-05-202-2/+19
* | | | | Make selection work across ligaturesJiang Jiang2011-05-201-21/+43
| |/ / / |/| | |
* | | | Fix broken drawing with large fonts using QStaticText and FreeTypeEskil Abrahamsen Blomfeldt2011-05-181-1/+1
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-177939-131573/+131580
|\ \ \
| * | | Updating file with CRLF line endings for the updated headerSergio Ahumada2011-05-171-29/+29
| * | | Fix a regression in QList::mid()Liang Qi2011-05-162-0/+5
| * | | update gitignoreOswald Buddenhagen2011-05-131-2/+5
| * | | remove -fno-stack-protectorOswald Buddenhagen2011-05-131-2/+1
| * | | Fix make confcleanAnders Bakken2011-05-131-4/+4
| * | | Update licenseheader text in source filesJyri Tahtela2011-05-137936-131576/+131576
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-161-2/+2
|\ \ \ \
| * | | | Fixed bug in meego graphics system runtime switching.Samuel Rødal2011-05-161-2/+2
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-05-1518-174/+203
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-05-13339-2707/+30191
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-05-1310-156/+185
| | |\ \ \ \ \
| | * | | | | | Fix memory leak in QXmlQuery::setQuery.Niklas Kurkisuo2011-05-138-18/+18
| * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-05-121-3/+9
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | doc: Fixed QTBUG-19226Martin Smith2011-05-121-2/+6
| | * | | | | | doc: Fixed QTBUG-19223Martin Smith2011-05-121-1/+3
| * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-05-121-26/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | doc: Remved debug code for QTBUG-18791Martin Smith2011-05-121-26/+0
| * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-05-119-145/+193
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | doc: Fixed QTBUG-18791Martin Smith2011-05-119-145/+193
| * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-05-092-1/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-05-091-1/+1
| | |\ \ \ \ \ \
| | * | | | | | | doc: Fixed a QML snippet referenceMartin Smith2011-05-092-1/+2
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-135-40/+52
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Fix instability in QNetworkConfigurationManager autotestShane Kearns2011-05-131-2/+4
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-05-131-15/+20
| |\ \ \ \ \ \ \
| | * | | | | | | Fix softkey icon positioning in S60 5.3Miikka Heikkinen2011-05-131-15/+20
| * | | | | | | | Support word selection list with predictive text from splitviewSami Merila2011-05-133-23/+28
| |/ / / / / / /