summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-122-3/+13
|\
| * Add support for Qt::WA_TranslucentBackground with OpenVG on Symbian^3Jason Barron2010-10-121-0/+8
| * Crash fix when using the runtime graphics system on Symbian.Jason Barron2010-10-121-3/+5
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-123-7/+13
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-113-7/+13
| |\
| | * Compile fix for OpenVG without VGFont.Samuel Rødal2010-10-113-7/+13
* | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-10-110-0/+0
|\ \ \ | |/ / |/| |
| * | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-10-110-0/+0
| |\ \
| | * \ Merge branch 4.6 into qt-4.7-from-4.6Qt Continuous Integration System2010-10-100-0/+0
| | |\ \
| | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-10-1012-64/+572
| | | |\ \
| | | | * | Added qmake check for presence of RHttpDownloadMgr headerGareth Stockwell2010-10-084-29/+61
| | | | * | qmediaplayer: show buffer status of 0%Gareth Stockwell2010-10-081-1/+1
| | | | * | Progressive download in Phonon MMF backend: integrated with playerGareth Stockwell2010-10-088-43/+211
| | | | * | Progressive download in Phonon MMF backend: added download managersGareth Stockwell2010-10-083-0/+308
| | | |/ /
* | | | | 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 '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 '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 '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
| * | | 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
* | | | 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
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Fix memory leak in QPixmap::toSymbianRSgImage() when an error occurs.Jason Barron2010-10-081-4/+5
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-088-58/+90
|\ \
| * | Fix crash when using Q_GLOBAL_STATIC(QWidget...)Jason Barron2010-10-072-1/+42
| * | Removed the need for S60main.rsc resource file in Symbian.Janne Anttila2010-10-077-57/+48
* | | 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
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-10-071-0/+1
| | |\ \
| | | * | Fix build with cups 1.5 snapshotsBernhard Rosenkraenzer2010-10-071-0/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-0724-427/+638
|\ \ \ \ \
| * | | | | Live texture updates to meegographicssystem helper.Michael Dominic K2010-10-0711-406/+197
| * | | | | Live texture updates to meegographicssystem plugin.Michael Dominic K2010-10-077-0/+303
| * | | | | Revert the integration of the merge request 2286.Benjamin Poulain2010-10-0723-1496/+2798
| * | | | | 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-0727-2817/+1632
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | ActiveQt: also make the designer plugin for qaxwidget build in the opensource...Patrick Spendrin2010-10-071-1/+1
| | * | | | Fix compilationOlivier Goffart2010-10-074-8/+9
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Benjamin Poulain2010-10-063-19/+135
| | |\ \ \ \
| | | * | | | Doc: fix description of the expected behavior for QGraphicsItem::cursorPierre Rossi2010-10-061-1/+1