summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-25843-9293/+10981
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-231-3/+11
| |\
| | * Fix warning introduced by last commit on hiding of the 'd' memberThiago Macieira2010-10-231-2/+2
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-231-3/+11
| | |\ | |/ /
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-221-3/+11
| | |\
| | | * Fix access to uninitialised memory in case of new throwingThiago Macieira2010-10-221-3/+11
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-2312-34/+213
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-2212-34/+213
| | |\ \
| | | * | Corrected build fail for autotestsTitta Heikkala2010-10-221-2/+2
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-10-225-13/+109
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-2211-33/+212
| | | | |\ \
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-2111-33/+212
| | | | | |\ \
| | | * | | | | QComboBox popup is shown in incorrect location with bottom CBASami Merila2010-10-221-1/+1
| | | | |_|/ / | | | |/| | |
| | | * | | | QS60Style: The QComboBox/QSpinBox text color is not according to themeSami Merila2010-10-211-4/+1
| | | * | | | Using TLS to store QThreadData on Symbianmread2010-10-211-8/+38
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-10-218-14/+40
| | | |\ \ \ \
| | | | * | | | Functions that are externally defined to QtOpenGL needs to be imported.Jani Hautakangas2010-10-216-11/+11
| | | * | | | | Added include for missing file for Symbian3Titta Heikkala2010-10-212-0/+6
| | | * | | | | Support for clipboard between Qt and Symbian applicationsTitta Heikkala2010-10-213-10/+156
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-222-41/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Remove accidentially committed .qmlproject.user file, ignore this filetypeDaniel Molkentin2010-10-222-41/+1
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-2218-352/+498
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-2118-352/+498
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | Fall back to Qt for loading images with DICAPS_COLORKEY.Anders Bakken2010-10-211-7/+11
| | | * | | | | Implement QWidget::metric PdmNumColors for QWSAnders Bakken2010-10-211-0/+24
| | | * | | | | Adding ::scroll capabilities to live pixmaps.Michael Dominic K2010-10-212-3/+70
| | | * | | | | Major refactoring: creating a new QPixmapData subclass for live textures.Michael Dominic K2010-10-2116-345/+396
| | | | |_|_|/ | | | |/| | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-222-21/+23
| |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | |
| | * | | | Fix Flipable docsBea Lam2010-10-222-21/+23
| |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-211-2/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Remove unnecessary roundingAlan Alpert2010-10-211-2/+0
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-213-2/+82
| |\ \ \ \
| | * | | | In meego, support Format_RGB32 too for eglShared images.Michael Dominic K2010-10-211-2/+3
| | * | | | Make sure d->ranges does not have invalid ranges before processing it.Stephen Kelly2010-10-212-0/+79
| | | |_|/ | | |/| |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-212-9/+27
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-212-3/+29
| | |\ \
| | * | | Flickable 'moving' parameter stays at true when setting contentY.Martin Jones2010-10-212-9/+27
| | | |/ | | |/|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-212-3/+29
| |\ \ \ | | |/ / | |/| / | | |/
| | * Fix network request completion crashing on a canceled pixmap requestJoona Petrell2010-10-212-3/+29
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-201-2/+19
| |\
| | * Fixed font rendering in manually built Qt on ARMv6.Samuel Rødal2010-10-201-2/+19
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-205-20/+166
| |\ \
| | * | Don't allow posted events to starve native messages.Bradley T. Hughes2010-10-201-16/+2
| | * | Fix autotest failure with experimental client decoHarald Fernengel2010-10-202-3/+5
| | * | fix a translation bug in qt_zh_CN.tsliang jian2010-10-201-1/+1
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-201-0/+158
| | |\ \ | | | |/ | | |/|
| | | * Add skeleton changes file for Qt 4.7.2Jason McDonald2010-10-201-0/+158
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-203-51/+40
| |\ \ \
| | * | | Ensure we don't refill the view before all model changes are complete.Martin Jones2010-10-202-21/+27
| | * | | ListView item insertion didn't handle delayed item removal correctly.Martin Jones2010-10-202-30/+13