summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-10-256-79/+104
|\
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-10-256-79/+104
| |\ |/ /
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-10-132-79/+90
| |\
| | * Demo Spectrum wav data size is not calculated correctlyJustin McPherson2010-10-132-79/+90
| |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-10-121-0/+0
| |\
| | * Rename .pro file to match directory name.Jason McDonald2010-10-121-0/+0
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-10-124-16/+4
| |\ \ | | |/ | |/|
| | * Revert "Don't define highp/mediump/lowp if desktop GL has them"Trond Kjernåsen2010-10-124-16/+4
| |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-10-113-0/+14
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-10-113-0/+14
| | |\ | |/ /
| | * Add header guards to audio example headers.Justin McPherson2010-10-083-0/+14
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-10-111-1/+1
| |\ \
| | * | Doc: Fixed qdoc warning.David Boddie2010-10-081-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-241-3/+11
|\ \ \
| * | | Fix warning introduced by last commit on hiding of the 'd' memberThiago Macieira2010-10-241-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-2218-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
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /