summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.8-upstream' into master-waterWater-Team2011-06-292478-8415/+82909
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-06-2925-225/+236
| |\
| | * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-2825-225/+236
| | |\
| | | * Fix vertical positioning of glyphs in raster engine with FreeTypeJiang Jiang2011-06-281-3/+4
| | | * Ensure a small event check interval on uikit platform.con2011-06-281-1/+1
| | | * Change default application font for uikit platform.con2011-06-281-0/+6
| | | * Use the QPoint memory layout change only on Desktop Maccon2011-06-281-1/+1
| | | * Fix 2cb398e1d901e62384bb2b388761cfd18fc8804a in case of no coreservicescon2011-06-282-0/+5
| | | * Add IPHONEOS deployment vars to makespecIan2011-06-272-2/+4
| | | * Post key events via QWindowSystemInterface, don't post events direclyIan2011-06-272-27/+12
| | | * Use nicer fonts and a few little patches to uikit platform.Ian2011-06-276-18/+25
| | | * Update README and qmlapplicationviewer to suit 4.8.con2011-06-276-43/+60
| | | * Updated proof-of-concept UIKit mkspecsIan2011-06-278-133/+121
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-06-28141-2378/+2378
| |\ \ \
| | * \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-06-27141-2378/+2378
| | |\ \ \
| | | * | | Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-06-27141-2378/+2378
| | * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-06-272375-6769/+81102
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-06-272375-6769/+81102
| | | |\ \ \
| * | | \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-06-283-1/+5
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-27117-455/+2327
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-06-27117-455/+2327
| | | |\ \ \ \
| | * | \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-271-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Reorder variable to eliminate warningsJiang Jiang2011-06-271-1/+1
| | * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-272-0/+4
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Only compare styleNames if they are not emptyJiang Jiang2011-06-272-2/+2
| | | * | | | | Add styleName to QFontDef comparisonJiang Jiang2011-06-252-0/+4
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-06-2712-19/+130
| |\ \ \ \ \ \ \
| | * | | | | | | Make it compile with openssl 1.0.0d, gcc 4.6Bernhard Rosenkraenzer2011-06-273-0/+12
| | * | | | | | | QStringBuilder: do not crash with null char*Olivier Goffart2011-06-273-0/+16
| | * | | | | | | Fix event delevery orderOlivier Goffart2011-06-275-18/+101
| | * | | | | | | QSocketNotifier autotest - fix compile with MSVCShane Kearns2011-06-241-1/+1
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-06-2710-30/+400
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-06-23497-9295/+21219
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-06-271-2/+4
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | / / / | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-06-17430-8055/+19276
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | | * | | | | | | QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5Simo Fält2011-06-171-2/+4
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-06-279-25/+58
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-2390-1166/+2459
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-06-239-25/+58
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-239-25/+58
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Fix broken rpath on waylandJørgen Lind2011-06-231-1/+4
| | | * | | | | | | Make sure to call damage on the buffer when we damage itJørgen Lind2011-06-235-15/+18
| | | * | | | | | | Update the wayland pluginJørgen Lind2011-06-234-11/+38
| * | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-06-2492-347/+1963
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-2492-347/+1963
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-231-7/+0
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Use numeric virtual keyboard for all number entry modes.Miikka Heikkinen2011-06-231-7/+0
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-232-9/+30
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | QTBUG-17776, reporting terminated threads as not running on Symbianmread2011-06-231-0/+6
| | | | * | | | | | | | | Splitview - Auto-translation rules changedSami Merila2011-06-231-9/+24