summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-12-211-7/+5
|\
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-12-2125-320/+1580
| |\
| | * qnetworkproxy_mac.cpp was not compiled in on Mac for the network moduleAndy Shaw2011-12-211-7/+5
| |/ |/|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-12-201-1/+1
|\ \ | |/
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-12-161-1/+1
| |\
| | * Fix crash in positionInLigatureJiang Jiang2011-12-161-1/+1
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-12-203-12/+0
|\ \ \
| * | | SSL: fix build with -openssl-linked for OpenSSL 0.9.8*Peter Hartmann2011-12-193-12/+0
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-12-201-1/+4
|\ \ \ \
| * | | | Add dita_docs target to generate DITA output.Casper van Donderen2011-12-201-1/+4
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-12-208-39/+80
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-12-192-6/+9
| |\ \ \ \ \
| | * | | | | Fix missing part from commit dae052cb11c0018121f2c4028aed9db17769fd77Jani Hautakangas2011-12-191-0/+1
| | * | | | | Fix m_longTapDetector causing crash.Jani Hautakangas2011-12-191-6/+8
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-12-197-36/+74
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix to incorrect ApplicationActivate event in QtOpenGLJani Hautakangas2011-12-166-33/+69
| | * | | | | Symbian - Fix QFile::map with non page aligned offsetsShane Kearns2011-12-151-3/+5
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-12-191-1/+2
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Fix a bug where 'int' is not printed in snippets.Casper van Donderen2011-12-191-1/+2
|/ / / / / /
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-12-161-4/+4
|\ \ \ \ \ \
| * | | | | | Fixes to czech translationPavel Fric2011-12-161-4/+4
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-12-161-0/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-12-151-0/+2
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Symbian: fix tst_QMenuBar::task256322_highlight() regressionSatyam Bandarapu2011-12-151-0/+2
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-12-156-243/+1472
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Update czech translationPavel Fric2011-12-154-88/+774
| * | | | | | I18n: Updates galician translation (4.8)Marcelino Villarino2011-12-132-155/+698
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-12-151-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-12-1525-319/+714
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-12-1525-319/+714
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-12-143-12/+10
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-12-131-2/+2
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Default to QDir::homePath() in Symbian native file dialogsGareth Stockwell2011-12-131-2/+2
| * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-12-122-10/+8
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fix NTLM authentication with email addressShane Kearns2011-12-121-8/+3
| | * | | | | | | Fix null pointer dereference in NTLM authenticationShane Kearns2011-12-121-2/+5
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-12-1322-307/+704
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-12-1375-474/+1253
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | directfb: Backport the work from QtBase to Qt 4.8Holger Hans Peter Freyther2011-12-1319-282/+653
| | * | | | | | | [blitter] Work on tst_QPixmap::clear()Holger Hans Peter Freyther2011-12-134-16/+45
| | * | | | | | | [blitter] Use QScopedPointer for the engine and blittableHolger Hans Peter Freyther2011-12-132-14/+10
| | * | | | | | | [blitter] Generate a new serial number when resizing theHolger Hans Peter Freyther2011-12-131-0/+1
| | * | | | | | | [blitter] Fix memory leak in the blitter paintengineHolger Hans Peter Freyther2011-12-131-5/+5
| |/ / / / / / / |/| | | | | | |
| | | | * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-12-145-6/+21
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Merge branch '4.8-upstream' into master-waterWater-Team2011-12-145-6/+21
| | | | | |\ \ \ | |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-12-125-6/+21
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-12-125-6/+21
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Revert "Fix memory leaks in OpenVG and OpenGL resource pools"mread2011-12-125-6/+21
| | | | * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-12-131-1/+1
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Fix Memoy leak relateded to contextmenu.Debao Zhang2011-12-131-1/+1