summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-107-6166/+6828
|\
| * networking: regenerate effective TLD table for cookiesPeter Hartmann2011-11-103-6158/+6736
| * QNAM: Fix authentication cache when the password is in the URLOlivier Goffart2011-11-084-8/+92
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-11-102-3/+32
|\ \
| * \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-11-082-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-1076-42768/+16188
|\ \ \ \
| * \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-11-0973-42676/+16117
| |\ \ \ \
| | * | | | WINSCW def file update so that qtgui can pick up virtual from qtcoremread2011-11-091-2/+3
| | * | | | Add mobile-reduced ts-files for Symbian.Pasi Pentikainen2011-11-0969-42665/+15959
| | * | | | Preventing zero-timer lockups when Symbian's active scheduler usedmread2011-11-083-9/+155
| * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-11-081-1/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix memory leak in S60StyleMiikka Heikkinen2011-11-081-1/+3
| * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-11-082-91/+68
| |\ \ \ \ \ | | |/ / / /
| | * | | | Improve whatlog generation for Symbian tools2 builds.Miikka Heikkinen2011-11-032-91/+68
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-082-3/+18
|\ \ \ \ \ \
| * | | | | | Qt Designer: Fix static linking on Mac.Friedemann Kleint2011-11-082-3/+18
* | | | | | | 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
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-11-031-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
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-11-030-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Revert "Correction for effectiveBoundingRect() calculation for QGraphicsItem"Samuel Rødal2011-11-032-45/+4
| | * | | | | Correction for effectiveBoundingRect() calculation for QGraphicsItemChristophe Oosterlynck2011-11-022-4/+45
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-11-0292-346/+929
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-11-0292-346/+929
| | |\ \ \ \ \
* | | \ \ \ \ \ 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
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-11-012-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
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-11-01105-2109/+14530
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | 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-01105-634/+13064
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-11-0121-46/+61
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Missing icon in the designer documentationartoka2011-11-012-2/+4
| * | | | | | | | | Fridge magnet example code snippet errorartoka2011-11-011-1/+1
| * | | | | | | | | qpaintdevice-qt3.html documentation errorsartoka2011-11-011-11/+11
| * | | | | | | | | QWebElement example missed informationartoka2011-11-011-1/+1
| * | | | | | | | | QSPlitter style-sheet example was invalidartoka2011-11-011-1/+1
| * | | | | | | | | Errors in QSqlDriver::handle examplesartoka2011-11-011-3/+3
| * | | | | | | | | QGLColormap example was invalidartoka2011-11-011-2/+3