summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-2990-496/+1799
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-263-17/+48
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-263-17/+48
| | |\
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-263-17/+48
| | | |\
| | | | * Fix compile error on Symbian 9.1, caused in network/access.Frans Englich2010-03-262-14/+33
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-263-3/+15
| | | | |\
| | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-263-3/+15
| | | | | |\
| | | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-263-3/+15
| | | | | | |\
| | | | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-253-3/+15
| | | | | | | |\
| | | | | | | | * QNAM HTTP: Symbian compile fixMarkus Goetz2010-03-251-0/+1
| | | | | | | | * tst_qnetworkreply: Fix side effect, add another testMarkus Goetz2010-03-251-1/+12
| | | | | | | | * QNAM HTTP: Fix crazy crash when exiting applicationMarkus Goetz2010-03-252-2/+2
| * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-261-15/+10
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Refactor QDirectFBPixmap::fromImage slightlyAnders Bakken2010-03-261-14/+9
| | * | | | | | | QDirectFBPixmap can handle NoOpaqueDetection.Anders Bakken2010-03-261-1/+1
| * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-262-2/+47
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | QInputContextFactory::languages implementation for Symbian.Janne Anttila2010-03-262-2/+47
| * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-263-20/+21
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Reverts using composition mode when using DeviceCoordinateMode cache.Yoann Lopes2010-03-262-14/+17
| | * | | | | | | Fix linking errorAnders Bakken2010-03-261-6/+4
| * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-261-2/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| / / / / / | | |_|/ / / / / | |/| | | | | |
| | * | | | | | QS60Style cannot draw transparency to UI element border areasSami Merila2010-03-261-2/+0
| |/ / / / / /
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-264-3/+18
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Changed pkg_prerules to not use default_deployment for vendor IDMiikka Heikkinen2010-03-262-2/+4
| | * | | | | Enable armcc version specific compler options for SymbianMiikka Heikkinen2010-03-262-1/+14
| | | |_|/ / | | |/| | |
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-261-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| / / | | |_|/ / | |/| | |
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Rhys Weatherley2010-03-2510-38/+88
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-251-0/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-2510-38/+88
| |\ \ \ \
| | * | | | Correct documentation for ObjectReplacementCharacter and ReplacementCh.Frans Englich2010-03-251-2/+6
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-259-36/+82
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Fix for submenu placement for QMenus in Symbian.Janne Anttila2010-03-251-7/+0
| | | * | | Symbian event loop priority drop not used in Symbian^4mread2010-03-251-0/+13
| | | * | | QMessageBox is smaller than native MessageBoxSami Merila2010-03-258-29/+69
| | | | | * Fix another off-by-1 error in OpenVG image painting.Rhys Weatherley2010-03-251-1/+1
| | | | |/
| | | | * Fix OpenVG build on non-Symbian platforms.Rhys Weatherley2010-03-251-0/+2
| | |_|/ | |/| |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-252-1/+75
| |\ \ \ | | |/ / | |/| |
| | * | Prevents a useless repaint with QGraphicsItem cache mode.Yoann Lopes2010-03-252-1/+75
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-251-6/+11
| |\ \ \
| | * | | Doc: Fix links in the ActiveQt framework, and also link to the tools.Volker Hilsheimer2010-03-251-6/+11
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-252-92/+95
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Bill King2010-03-251-2/+2
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-251-38/+119
| |\ \ \ \
| * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-251-2/+2
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-241-2/+2
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-241-2/+2
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-241-2/+2
| | | | |\ \ \ \
| | | | | * | | | Calculate period size correctly.Justin McPherson2010-03-241-2/+2
| | | | | | | * | Sql Autotest cleanup and tweaking.Bill King2010-03-252-92/+95
| | | | | | |/ /
| | | | | | * | Fix ODBC compilation for ODBC versions < 3.5Bill King2010-03-251-0/+2