summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Fix infinite recursion when changing geometry on MacGabriel de Dietrich2011-05-261-7/+5
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-253-7/+81
|\
| * 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-2425-486/+622
| |\
| * | 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-233-7/+74
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-251-1/+11
|\ \ \
| * | | fix the "Host" header for ipv6 URLs in QNAMshiroki2011-05-251-1/+11
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-251-1/+1
|\ \ \ \
| * | | | Flickable could flick in wrong direction if given too few touch samplesMartin Jones2011-05-251-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-251-0/+6
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | |
| * | | Fix the state of default network configuration.Xizhi Zhu2011-05-241-0/+6
* | | | 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-201-22/+44
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Fix ligature offset in multi-line textJiang Jiang2011-05-201-2/+2
| * | | Make selection work across ligaturesJiang Jiang2011-05-201-21/+43
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-202-36/+23
|\ \ \ \ | | |_|/ | |/| |
| * | | Notify when the TextInput cursorRectangle property changes within pre-editAndrew den Exter2011-05-202-36/+23
* | | | 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-187-45/+32
|\ \ \ \
| * | | | Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-187-45/+32
* | | | | 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
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | Fix broken drawing with large fonts using QStaticText and FreeTypeEskil Abrahamsen Blomfeldt2011-05-181-1/+1
* | | | Re-apply licenseheader text in source files for qt4.7Jyri Tahtela2011-05-183-51/+51
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-173840-65204/+65206
|\ \ \
| * | | Fix a regression in QList::mid()Liang Qi2011-05-161-0/+2
| * | | Update licenseheader text in source filesJyri Tahtela2011-05-133840-65204/+65204
* | | | 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-158-18/+18
|\ \ \ \ \
| * | | | | Fix memory leak in QXmlQuery::setQuery.Niklas Kurkisuo2011-05-138-18/+18
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-134-38/+48
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | 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
| |/ / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-133-4/+36
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | QDeclarativeMouseArea: block context menu eventsCaio Marcelo de Oliveira Filho2011-05-132-0/+29
| * | | | ListViews loses items if all visible items are removed.Martin Jones2011-05-131-4/+7
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-131-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Make TextEdit word selection more natural.Andrew den Exter2011-05-131-1/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-123-3/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Clear confusion between QMainWindow and QMainWindowLayout.Fabien Freling2011-05-123-3/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-121-0/+12
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fix for rounded corners bug in QMenuJani Hautakangas2011-05-121-0/+12
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-121-1/+1
|\ \ \ \ \ | |/ / / /