summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Update year in Nokia copyright messages.Jason McDonald2012-01-114276-4288/+4288
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2012-01-063-4/+4
|\
| * Updated WebKit to 7b7ded42f42a558bc5672c2523f9c5689bb975d0Zeno Albisser2012-01-063-4/+4
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2012-01-051-1/+2
|\ \ | |/
| * Fix crash when creating a QScriptEngine in a native threadSimon Hausmann2012-01-051-1/+2
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2012-01-0512-24/+95
|\ \ | |/ |/|
| * Fix http authentication to a different realm on the same serverShane Kearns2012-01-041-4/+2
| * Fix race in http connection channelShane Kearns2012-01-042-1/+3
| * Don't fetch credentials from cache following a failed proxy authenticationShane Kearns2012-01-048-13/+52
| * Handle plain socket write errors in SSLShane Kearns2012-01-041-2/+9
| * Fix for assertion failureShane Kearns2012-01-042-1/+6
| * Fix faulty logic in http connection pipeliningShane Kearns2012-01-041-2/+6
| * QThreads on Symbian are named to allow them to be opened externallymread2012-01-041-1/+17
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2012-01-023-15/+18
|\ \
| * \ Merge remote-tracking branch 'qt-qml-review/master' into master-qml-stagingKai Koehne2012-01-023-15/+18
| |\ \
| | * | Declarative: Use qDebug() for debugger status updatesKai Koehne2011-11-283-3/+3
| | * | Declarative: Unify output of warning messages in debug serverKai Koehne2011-11-281-12/+15
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-12-226-6/+6
|\ \ \ \ | | |_|/ | |/| |
| * | | Symbian: Fix exporting and importing of some functions for autotestsMiikka Heikkinen2011-12-216-6/+6
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-12-201-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-symbian-staging into ma...Qt Continuous Integration System2011-12-208-39/+80
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Fix missing part from commit dae052cb11c0018121f2c4028aed9db17769fd77Jani Hautakangas2011-12-191-0/+1
| * | | | | Fix m_longTapDetector causing crash.Jani Hautakangas2011-12-191-6/+8
| * | | | | 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-symbian-staging into ma...Qt Continuous Integration System2011-12-161-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Symbian: fix tst_QMenuBar::task256322_highlight() regressionSatyam Bandarapu2011-12-151-0/+2
* | | | | | 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
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | |
| | * | | | Default to QDir::homePath() in Symbian native file dialogsGareth Stockwell2011-12-131-2/+2
| | * | | | Fix NTLM authentication with email addressShane Kearns2011-12-121-8/+3
| | * | | | Fix null pointer dereference in NTLM authenticationShane Kearns2011-12-121-2/+5
| * | | | | 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 '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
| |\ \ \ \ \ | | |/ / / /
| | * | | | Revert "Fix memory leaks in OpenVG and OpenGL resource pools"mread2011-12-125-6/+21
* | | | | | Fix Memoy leak relateded to contextmenu.Debao Zhang2011-12-131-1/+1
|/ / / / /
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-12-123-16/+51
|\ \ \ \ \ | |/ / / /
| * | | | Fix window surface config on OpenGL graphics system.Jani Hautakangas2011-12-092-8/+33
| * | | | Symbian: Fix double deletion of selected text when using predictiveMiikka Heikkinen2011-12-091-8/+18
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-12-091-1/+4
|\ \ \ \ \ | |/ / / /
| * | | | Symbian: improving diagnostics for QWaitConditionmread2011-12-081-1/+4
| * | | | Revert "Fix sqlite driver memory eating due to close failure"Honglei Zhang2011-12-071-7/+0