summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-105-6161/+6738
|\
| * networking: regenerate effective TLD table for cookiesPeter Hartmann2011-11-102-6158/+6730
| * QNAM: Fix authentication cache when the password is in the URLOlivier Goffart2011-11-083-3/+8
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-11-102-3/+32
|\ \
| * | Fix to QtOpenGL crash on SymbianJani Hautakangas2011-11-082-3/+32
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-11-105-12/+161
|\ \ \
| * | | WINSCW def file update so that qtgui can pick up virtual from qtcoremread2011-11-091-2/+3
| * | | Preventing zero-timer lockups when Symbian's active scheduler usedmread2011-11-083-9/+155
| * | | Fix memory leak in S60StyleMiikka Heikkinen2011-11-081-1/+3
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-081-0/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | SSL: blacklist intermediate certificates that issued weak certsPeter Hartmann2011-11-081-0/+3
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-081-0/+4
|\ \ \ \
| * | | | Give better error message when using unsupported lookbehinds in QRegExpKjell Rune Skaaraas2011-11-071-0/+4
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-11-041-1/+5
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Clear error due to FRAMEBUFFER_SRGB_CAPABLE_EXTJani Hautakangas2011-11-031-0/+3
| * | | | Add GL_EXT_texture_format_BGRA8888 support.Jani Hautakangas2011-11-031-1/+2
| * | | | Revert "Correction for effectiveBoundingRect() calculation for QGraphicsItem"Samuel Rødal2011-11-031-11/+4
| * | | | Correction for effectiveBoundingRect() calculation for QGraphicsItemChristophe Oosterlynck2011-11-021-4/+11
| * | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-11-0252-215/+671
| |\ \ \ \
* | \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-11-0314-9/+367
|\ \ \ \ \ \
| * | | | | | Re-apply change a14033620fab5edca44293ec6dfcc904e2e0eb20 by Andreas KlingAndreas Kling2011-11-031-1/+1
| * | | | | | Re-apply change 3489808c1dcd157ac09dd6da16bc057b56696d59 by Ademar de Souza R...Ademar de Souza Reis Jr2011-11-031-1/+1
| * | | | | | Re-apply change 3dd9e66baaa0848bcc2eb7daecf2b63724624358 by Ademar de Souza R...Ademar de Souza Reis Jr2011-11-031-43/+43
| * | | | | | Updated WebKit to 99371ddc1d61832131835964a753e1c5817f6916Zeno Albisser2011-11-0315-53/+411
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-11-022-3/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Fix QFont related compilation errors on Mac OSX CarbonSamuli Piippo2011-11-012-3/+3
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-11-022-1482/+1473
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Correct faulty 4.7->4.8 merge of Symbian def-filesLiang Qi2011-11-012-1482/+1473
| * | | | | Merge remote-tracking branch 'qt/4.8'Pasi Pentikainen2011-11-0173-420/+852
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-11-016-20/+23
|\ \ \ \ \ \ \
| * | | | | | | qpaintdevice-qt3.html documentation errorsartoka2011-11-011-11/+11
| * | | | | | | QWebElement example missed informationartoka2011-11-011-1/+1
| * | | | | | | QPointer made no mention of QWeakPointerartoka2011-11-011-1/+1
| * | | | | | | QNetworkDiskCache documentation missed informationartoka2011-11-011-2/+2
| * | | | | | | QList document referenced to non existing functionartoka2011-11-011-2/+2
| * | | | | | | Fix multiple typos in QLineF documentation.artoka2011-11-011-3/+6
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-11-013-39/+136
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | |_|/ / / / / |/| | | | | |
| * | | | | | Supporting parallel pointer event delivery on Symbianmread2011-10-313-39/+136
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-011-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | SSL documentation: correct enum namePeter Hartmann2011-10-311-1/+1
* | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-10-313-1/+26
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-313-1/+26
| |\ \ \ \ \ \ \
| | * | | | | | | Symbian - disable memory mapping in QNetworkDiskCacheShane Kearns2011-10-281-1/+1
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-10-272-0/+25
| | |\ \ \ \ \ \ \
| | | * | | | | | | Adding items to a view with no delegate crashes.Martin Jones2011-10-272-0/+25
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-10-311-1/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Fix QFile::copy() returning false but error() being NoErrorxiechyong2011-10-311-1/+4
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-10-2813-50/+27
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Symbian Linuxification building case changesPasi Pentikainen2011-10-205-30/+6
| * | | | | | | | Use QBasicAtomicInt as a static variableShane Kearns2011-10-191-2/+2