summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-07987-86967/+59113
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-0616-432/+416
| |\
| | * Fixed license headers for examples in masterTimo Turunen2011-04-0516-432/+416
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-06114-8593/+1881
| |\ \
| | * \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-04-0533-71/+47
| | |\ \
| | | * | Fixed compilation of qpixmap_raster.cppSamuel Rødal2011-04-051-1/+2
| | | * | Draw graphics item bounding rects drawn when QT_DRAW_SCENE_ITEM_RECTS=1J-P Nurmi2011-04-051-0/+13
| | | * | Put all the declarations of qt_defaultDpi{,X,Y}() in one placeJiang Jiang2011-04-0528-69/+20
| | | * | Really avoid compiler warnings on Windowsaavit2011-04-054-2/+13
| | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-04-054-50/+100
| | |\ \ \ | | | |/ /
| | | * | Made extension resolving work with Core profile.Samuel Rødal2011-04-054-50/+100
| | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-04-04665-24472/+27657
| | |\ \ \ | | | |/ /
| | | * | Avoid some compiler warnings on Windowsaavit2011-04-041-0/+2
| | | * | Fix positioning in GL2 paint engine with subpixel antialiasingJiang Jiang2011-04-044-107/+11
| | | * | Update defs filesJani Hautakangas2011-04-044-9/+9
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-04-048-802/+1170
| | | |\ \
| | | * | | Doc: Updating 3rdparty license docaavit2011-04-041-41/+158
| | | * | | Merge branch 'jpeg8c'aavit2011-04-0465-7524/+393
| | | |\ \ \
| | | | * | | Updating libjpeg: Add Qt building modificationsaavit2011-03-282-0/+170
| | | | * | | Updating libjpeg: Add version 8c.aavit2011-03-2887-0/+45145
| | | | * | | Updating libjpeg: Removing libjpeg version 8aavit2011-03-28136-52446/+0
| | | * | | | Another compilation fix for WinCEaavit2011-04-041-0/+2
| | * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-04-048-801/+1170
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Update .def filesJani Hautakangas2011-04-048-801/+1170
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-04-0529-292/+1521
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-051232-81069/+144252
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-03-281-2/+38
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fixed QFtp autotests not to crash in network time out situationsTomi Vihria2011-03-281-2/+38
| | * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-03-228-105/+174
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Make createpackage and patch_capabilties scripts use tmp dirMiikka Heikkinen2011-03-224-41/+73
| | | * | | | | | | Fix for QTBUG-16985.Dmitry Trofimov2011-03-221-15/+17
| | | * | | | | | | Revert "QComboBox fix for QTBUG-16985"Dmitry Trofimov2011-03-221-37/+46
| | | * | | | | | | Moving Symbian CPU core detection to qthread_symbian.cppmread2011-03-182-30/+17
| | | * | | | | | | QComboBox fix for QTBUG-16985Dmitry Trofimov2011-03-181-46/+37
| | | * | | | | | | Making Symbian helper threads exit cleanly at app exitmread2011-03-182-19/+67
| | * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-03-17167-175/+8127
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamSami Lempinen2011-03-171-0/+1
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Add ".make.cache" to the files to be cleaned for symbian-abld.Miikka Heikkinen2011-03-171-0/+1
| | | * | | | | | | | Merge remote branch 'qt-master/master'Sami Lempinen2011-03-17164-173/+8121
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Fix mismatched $$translations handling after mergeMiikka Heikkinen2011-03-161-1/+1
| | | * | | | | | | | Fix emulator deployment for items with "!:" drive.Miikka Heikkinen2011-03-161-1/+4
| | * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-03-16509-4444/+10373
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Fix build breakGuoqing Zhang2011-03-161-1/+1
| | | * | | | | | | | Merge remote branch 'qt-master/master'Guoqing Zhang2011-03-16506-4444/+10369
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Add digit conversion in default format functionGuoqing Zhang2011-03-163-0/+4
| | * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-03-151-3/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Removed broken "deploy.path" support from SymbianMiikka Heikkinen2011-03-151-3/+1
| | * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-03-114-5/+20
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | fixing build issue in qwaitcondition_symbian.cppmread2011-03-111-1/+1
| | | * | | | | | | | | fixing build error in qthread_symbian.cppmread2011-03-111-2/+2