summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-232-10/+13
|\
| * Fixes QT-4753Xizhi Zhu2011-03-232-10/+13
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-228-30/+149
|\ \
| * | Implement tiled image and pixmap drawing in VG paint engine.Laszlo Agocs2011-03-221-3/+98
| * | Change Symbian to use destroyed swap behaviour in GLJani Hautakangas2011-03-225-23/+51
| * | Remove useless profile reference.axis2011-03-222-4/+0
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-221-2/+2
|\ \ \
| * | | Text bounding rect calculated incorrectly if non-top aligned.Martin Jones2011-03-211-2/+2
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-225-11/+36
|\ \ \ \ | | |/ / | |/| |
| * | | Fixed drawImage() not to attempt drawing null images on openvg.Laszlo Agocs2011-03-221-0/+4
| * | | QS60Style: Update placeholder texture to real oneSami Merila2011-03-224-11/+32
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-224-6/+6
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge remote-tracking branch 'mainline/4.7' into 4.7Oswald Buddenhagen2011-03-2134-256/+557
| |\ \ \
| * | | | Bump Qt version to 4.7.4Timo Turunen2011-03-214-6/+6
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-211-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform.Miikka Heikkinen2011-03-211-1/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-211-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Don't crash calling QTextDocument::blockBoundingRect on invalid blockEskil Abrahamsen Blomfeldt2011-03-211-1/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-217-150/+138
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Change the pooled QGLPixmapData to be backed by QVolatileImage.Laszlo Agocs2011-03-215-141/+128
| * | | | Changed s60 style not to rely on QPixmapData::toNativeType().Laszlo Agocs2011-03-212-7/+6
| * | | | Add missing bitmap locking to QVGPixmapData::fromNativeType.Laszlo Agocs2011-03-211-2/+4
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-211-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fix writing to an attached property from script.Michael Brasser2011-03-211-1/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-213-36/+55
|\ \ \ \ \ | |/ / / /
| * | | | fixes/improvements for new QML right-to-left docsBea Lam2011-03-212-35/+54
| * | | | Write Qt Quick 1.1 right-to-left documentation and examplesJoona Petrell2011-03-181-1/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-195-14/+34
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Add flag for forcibly propagating backing store alpha to framebufferGareth Stockwell2011-03-184-13/+33
| * | | | Fixed unmatched quotes in s60installs.proGareth Stockwell2011-03-181-1/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-182-6/+19
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Added setSwitchPolicy to MeeGo graphicssystem helper API.Samuel Rødal2011-03-182-6/+19
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-173-5/+76
|\ \ \ \ \ | |/ / / /
| * | | | Changes to driver workarounds.Robin Burchell2011-03-171-2/+25
| * | | | Switch to raster also when last window is destroyed (on MeeGo).Samuel Rødal2011-03-171-1/+38
| * | | | Clipboard/Windows: Fix a hang when sending to non-responsive clients.Friedemann Kleint2011-03-171-2/+13
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-172-0/+12
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fix accidental population of the disk cache with partial contentSimon Hausmann2011-03-171-0/+7
| * | | | Fix disk cache interaction for range retrieval HTTP requests.Simon Hausmann2011-03-171-0/+5
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-173-7/+14
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | PathView doesn't update if preferred highlight range changes.Martin Jones2011-03-171-0/+2
| * | | | Image.PreserveAspectFit has unexpected effect on Image's sourceSizeMartin Jones2011-03-172-5/+7
| * | | | Doc improvement for Image.fillMode.Yann Bodson2011-03-171-2/+5
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-172-0/+9
|\ \ \ \ \ | |/ / / /
| * | | | QDeclarativeView flickers when composited on MeeGoMartin Jones2011-03-172-0/+9
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-03-164-8/+26
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Jan-Arve Sæther2011-03-16140-910/+3690
| |\ \ \ \ \
| * | | | | | Introduce QGraphicsItem::ItemStopsFocusHandling flagMichael Hasselmann2011-03-164-8/+26
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-161-18/+11
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fix for wrong dpi metrics for raster pixmaps on Symbian.Laszlo Agocs2011-03-161-18/+11