summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-06-018-118/+46
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-06-012-28/+29
| |\
| | * QDeclarative: Fix QPerformanceTimer on SymbianKai Koehne2011-06-012-28/+29
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-016-91/+18
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Jaakko Koskenkorva2011-06-011-3/+3
| | |\ \
| | | * | Fix pixel metrics for Symbian VGA devicesSami Merila2011-05-311-3/+3
| | * | | Increase SSL readbuffer 1 -> 16 kBJaakko Koskenkorva2011-05-311-2/+2
| | |/ /
| | * | Revert "Fix QNetworkConfigurationManager usage outside main thread first"Shane Kearns2011-05-313-86/+4
| | * | Fix tst_QGraphicsItem::sorting() test case for SymbianMiikka Heikkinen2011-05-311-0/+9
* | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-31114-204/+7808
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-306-30/+60
| |\ \ \ | | |/ /
| | * | Fix QHeaderView test case for VGA Symbian devices.Miikka Heikkinen2011-05-301-1/+11
| | * | Fix for BCM2727 chip detection on SymbianJani Hautakangas2011-05-304-28/+38
| | * | Fix QMenuBar autotest failures for SymbianSami Merila2011-05-302-1/+11
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-301-1/+1
| |\ \ \ | | |/ /
| | * | Fixed contains check casing in mmf.pro fileTomi Vihria2011-05-301-1/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-288-12/+51
| |\ \ \ | | |/ /
| | * | QToolButton autotest trigger() fails in E6Sami Merila2011-05-271-1/+1
| | * | Documented Symbian peculiarity about QDesktopWidget::availableGeometryMiikka Heikkinen2011-05-271-0/+10
| | * | Fix non-Symbian builds broken by previous commit.Miikka Heikkinen2011-05-273-6/+6
| | * | Fix SYMBIAN_VERSION_* ifdeffingMiikka Heikkinen2011-05-274-9/+9
| | * | Predictive text is not committed when writing in a QLineEditSami Merila2011-05-262-2/+31
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-2718-136/+58
| |\ \ \ | | | |/ | | |/|
| | * | Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalA...Joona Petrell2011-05-2718-136/+58
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-2682-10/+7650
| |\ \ \ | | | |/ | | |/|
| | * | Fixed more CI-errors caused by qmlshadersplugin addition.Marko Niemelä2011-05-263-1/+83
| | * | Fixed CI-errors caused by qmlshadersplugin addition.Marko Niemelä2011-05-2644-70/+315
| | * | Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-259-39/+51
| | * | Update the detection of is_using_gnupoc for S3.Liang Qi2011-05-251-1/+1
| | * | Backported QML ShaderEffectItem from QML2.0 into Qt Quick 1.1Marko Niemelä2011-05-2574-1/+7285
| | * | Revert "Fixing Linux compatibility issues for Symbian"Laszlo Agocs2011-05-2512-44/+57
| | * | sockets: limit buffer size of the internal sockets in proxy enginesShane Kearns2011-05-242-0/+4
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-254-7/+106
| |\ \ \
| | * | | Fix boundry conditions for cursor hit testJiang Jiang2011-05-251-1/+1
| | * | | Fix cursor position test on CursorOnCharacter caseJiang Jiang2011-05-253-4/+9
| | * | | Merge remote branch 'mainline/4.7' into 4.7Jiang Jiang2011-05-2431-498/+644
| | |\ \ \
| | * | | | Fix xToCursor issue due to backporting from 4.8Jiang Jiang2011-05-241-0/+2
| | * | | | Support placing cursor in ligature with mouse or touchJiang Jiang2011-05-234-7/+99
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-251-1/+11
| |\ \ \ \ \
| | * | | | | fix the "Host" header for ipv6 URLs in QNAMshiroki2011-05-251-1/+11
* | | | | | | Merge branch '4.8' into qt-4.8-from-4.7Liang Qi2011-05-2777-1133/+1560
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-05-2748-330/+1298
| |\ \ \ \ \ \ \
| | * | | | | | | Added some of my Qt 4.8 changes to the changelogOlivier Goffart2011-05-261-0/+22
| | * | | | | | | Merge remote-tracking branch 'earth-staging/master'Olivier Goffart2011-05-2611-51/+110
| | |\ \ \ \ \ \ \
| | | * | | | | | | Update bearer startup code in network autotestsShane Kearns2011-05-258-33/+98
| | | * | | | | | | symbian socket engine: share ip address conversion codeShane Kearns2011-05-253-18/+12
| | * | | | | | | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-269-77/+53
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | license header check: fix exception for URL TLD tablePeter Hartmann2011-05-251-1/+1
| | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-248452-141937/+141860
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | QUrl TLD: fix documentation file for "Add QUrl::topLevelDomain() ..."Peter Hartmann2011-05-241-4/+4