summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-112-1/+89
|\
| * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-112-1/+89
| |\
| | * Making the hybrid allocator change compatible across all 4.7.xmread2010-10-112-1/+89
* | | The completer in an itemview would not be activated right awayThierry Bastian2010-10-111-3/+3
|/ /
* | Add some tests for Indic shaping in HarfbuzzEskil Abrahamsen Blomfeldt2010-10-111-0/+29
* | Fix several errors with shaping of Indic scriptsप्रविण सातपुते2010-10-111-9/+14
* | Remove references ofFabien Freling2010-10-111-1/+0
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-0918-15/+461
|\ \
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-0918-15/+461
| |\ \
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-0918-15/+461
| | |\ \
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-0818-15/+461
| | | |\ \
| | | | * | Experimental support of the unified toolbar withFabien Freling2010-10-0818-15/+461
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-092-6/+14
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-092-6/+14
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-082-6/+14
| | |\ \ \ \
| | | * | | | Avoid in-place convertion of images with multiple referencesBenjamin Poulain2010-10-081-0/+4
| | | * | | | Fix infinite loop when justifying undisplayable Arabic textEskil Abrahamsen Blomfeldt2010-10-081-6/+10
* | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-091-3/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | Account for native child widgets when handling focus eventsGareth Stockwell2010-10-081-3/+4
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-081-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-081-2/+2
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | QGradientCache: Optimize choosing of which gradient to evict from cacheAndreas Kling2010-10-081-2/+2
* | | | | | Extended the convenience functions for QInputDialog for IM hints.axis2010-10-082-5/+52
* | | | | | Merge branch '4.7-s60' into master-s60axis2010-10-084-7/+23
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Added support for using inputMethodHints in QInputDialog edit widget.axis2010-10-083-2/+18
| | |_|/ / | |/| | |
| * | | | Fix memory leak in QPixmap::toSymbianRSgImage() when an error occurs.Jason Barron2010-10-081-4/+5
| | |_|/ | |/| |
* | | | Align .pro with qmake: s/\.sources/.files/.Miikka Heikkinen2010-10-085-35/+35
| |/ / |/| |
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-087-58/+50
|\ \ \ | |/ / | | / | |/ |/|
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-087-58/+50
| |\
| | * Fix crash when using Q_GLOBAL_STATIC(QWidget...)Jason Barron2010-10-071-1/+2
| | * Removed the need for S60main.rsc resource file in Symbian.Janne Anttila2010-10-077-57/+48
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-081-0/+1
|\ \ \ | |/ /
| * | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-10-081-0/+1
| |\ \
| | * \ Merge branch 4.6 into qt-4.7-from-4.6Qt Continuous Integration System2010-10-071-0/+1
| | |\ \
| | | * | Fix build with cups 1.5 snapshotsBernhard Rosenkraenzer2010-10-071-0/+1
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-089-19/+362
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-0710-20/+363
| |\ \ \ \
| | * | | | Live texture updates to meegographicssystem plugin.Michael Dominic K2010-10-077-0/+303
| | * | | | Fix text rendering in GL when using the broken-fbo-fallbackEskil Abrahamsen Blomfeldt2010-10-071-1/+1
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-072-19/+59
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Doc: fix description of the expected behavior for QGraphicsItem::cursorPierre Rossi2010-10-061-1/+1
| | | * | | QGraphicsItem device coordinate cache unefficient in portrait modeBjørn Erik Nilsen2010-10-061-18/+58
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-071-0/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-071-0/+5
| |\ \ \ \ \
| | * | | | | Ensure that actions are still fired even if there is no visible windowAndy Shaw2010-10-071-0/+5
| | |/ / / /
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-0722-53/+191
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0722-53/+191
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Connect property alias change signals on useAaron Kennedy2010-10-0713-42/+147
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-079-11/+44
| | |\ \ \ \
| | | * | | | Doc fix.Michael Brasser2010-10-071-3/+3