summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-2921-60/+239
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-2818-56/+218
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-03-2764-488/+472
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-22119-896/+4977
| | | |\
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-03-218-13/+23
| | | |\ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-0958-317/+1814
| | | |\ \ \
| | * | \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-253-1/+10
| | |\ \ \ \ \
| | | * | | | | Fix QUnifiedTimer bugAlan Alpert2011-03-242-1/+8
| | | * | | | | Fix memory leak.Martin Jones2011-03-241-0/+2
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-251-1/+4
| | |\ \ \ \ \ \
| | | * | | | | | Make sure num_glyphs pass to HarfBuzz is large enoughJiang Jiang2011-03-241-1/+4
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-233-12/+40
| | |\ \ \ \ \ \ \
| | | * | | | | | | Icon in QMessageBox::question is deformed on SymbianSami Merila2011-03-231-3/+10
| | | * | | | | | | Prevent crash when connecting signal in splitviewSami Merila2011-03-231-9/+12
| | | * | | | | | | GraphicsViews: Focused widget is not visible after orientation changeSami Merila2011-03-231-12/+14
| | | * | | | | | | GraphicsViews: Focused widget is not visible after orientation changeSami Merila2011-03-231-0/+15
| | | * | | | | | | Add missing nullify for the s60 style's background pixmap pointer.Laszlo Agocs2011-03-231-0/+1
| | * | | | | | | | 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-doc-team into 4.7Geir Vattekar2011-03-251-0/+3
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-251-4/+13
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | qdoc: Added default values to config file for DITAMartin Smith2011-03-251-0/+3
| * | | | | | | | | | | Doc: Update to QStyledItemDelegate::displayText()Geir Vattekar2011-03-251-0/+5
| | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Doc: Work on QAudioInput::start() functions.Geir Vattekar2011-03-251-4/+13
| |/ / / / / / / / /
* | | | | | | | | | Doc: Fixed markup.David Boddie2011-03-251-2/+2
* | | | | | | | | | Doc: Added a missing command.David Boddie2011-03-251-1/+1
* | | | | | | | | | Doc: Removed duplicate documentation.David Boddie2011-03-251-13/+0
|/ / / / / / / / /
* | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-24150-1191/+6775
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-03-23148-1191/+6769
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-22148-1191/+6769
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | | * | | | | | | 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