summaryrefslogtreecommitdiffstats
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-116-15/+117
|\
| * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-115-10/+105
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-115-10/+105
| | |\
| | | * Making the hybrid allocator change compatible across all 4.7.xmread2010-10-112-1/+89
| | | * Spectrum demo: only use --rpath for linux-g++* mkspecsGareth Stockwell2010-10-111-1/+1
| | | * Spectrum demo: put binaries into correct locations on WindowsGareth Stockwell2010-10-113-8/+15
| * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-111-5/+12
| |\ \ \
| | * \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-111-5/+12
| | |\ \ \ | | | |/ /
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-111-5/+12
| | | |\ \ | | | | |/ | | | |/|
| | | | * Designer: Fix a crash when copying empty page-based containers.Friedemann Kleint2010-10-111-5/+12
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-112-3/+43
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | The completer in an itemview would not be activated right awayThierry Bastian2010-10-112-3/+43
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-112-9/+43
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | 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
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-1118-15/+460
|\ \ \ \ | |/ / /
| * | | 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 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-094-7/+26
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-094-7/+26
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-094-7/+26
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Add missing data for the autotest of in-place conversion for PixmapBenjamin Poulain2010-10-091-0/+0
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-093-7/+26
| | | |\ \ \ \ | | |/ / / / /
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-083-7/+26
| | | |\ \ \ \
| | | | * | | | Avoid in-place convertion of images with multiple referencesBenjamin Poulain2010-10-082-1/+16
| | | | * | | | Fix infinite loop when justifying undisplayable Arabic textEskil Abrahamsen Blomfeldt2010-10-081-6/+10
* | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-091-3/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-091-3/+4
| |\ \ \ \ \ \ |/ / / / / / / | | _ / / / / | | / / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-088-19/+54
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Account for native child widgets when handling focus eventsGareth Stockwell2010-10-081-3/+4
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-081-4/+5
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
* | | | | | 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
| |\ \ \ \ \ |/ / / / / /
| * | | | | 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
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-10-08220-446/+535
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Extended the convenience functions for QInputDialog for IM hints.axis2010-10-082-5/+52
| * | | | | Merge branch '4.7-s60' into master-s60axis2010-10-088-21/+55
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Added support for using inputMethodHints in QInputDialog edit widget.axis2010-10-084-2/+38
| | * | | | Fixed some preprocessor parameters for Mac support.axis2010-10-081-4/+4
| | * | | | Fixed missing QMAKE_MOC definition in certain mkspecs.axis2010-10-082-10/+8
| | | |_|/ | | |/| |
| | * | | 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-08206-403/+405
| * | | Inconsistency with deployment keyword .sources and .files.Miikka Heikkinen2010-10-086-17/+23
|/ / /
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-088-58/+90
|\ \ \ | |_|/ |/| |
| * | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-088-58/+90
| |\ \ | | |/