summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-06-015-45/+37
|\
| * 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-013-17/+8
| |\ \
| | * \ 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-311-12/+3
* | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-3147-153/+3008
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-304-29/+39
| |\ \ \ | | |/ /
| | * | Fix for BCM2727 chip detection on SymbianJani Hautakangas2011-05-304-28/+38
| | * | Fix QMenuBar autotest failures for SymbianSami Merila2011-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-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-287-11/+50
| |\ \ \ | | |/ /
| | * | 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-2714-108/+38
| |\ \ \ | | | |/ | | |/|
| | * | Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalA...Joona Petrell2011-05-2714-108/+38
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-2623-8/+2892
| |\ \ \ | | | |/ | | |/|
| | * | Fixed more CI-errors caused by qmlshadersplugin addition.Marko Niemelä2011-05-261-1/+1
| | * | Fixed CI-errors caused by qmlshadersplugin addition.Marko Niemelä2011-05-264-9/+9
| | * | Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-254-27/+39
| | * | Backported QML ShaderEffectItem from QML2.0 into Qt Quick 1.1Marko Niemelä2011-05-2516-0/+2855
| | * | Revert "Fixing Linux compatibility issues for Symbian"Laszlo Agocs2011-05-257-32/+45
| | * | 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-253-7/+81
| |\ \ \
| | * | | 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-2425-486/+622
| | |\ \ \
| | * | | | 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-233-7/+74
| * | | | | 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-2751-1061/+974
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-05-2726-278/+770
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'earth-staging/master'Olivier Goffart2011-05-263-18/+12
| | |\ \ \ \ \ \ \
| | | * | | | | | | symbian socket engine: share ip address conversion codeShane Kearns2011-05-253-18/+12
| | * | | | | | | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-268-76/+52
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-244256-73821/+73652
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | QUrl TLD: fix documentation file for "Add QUrl::topLevelDomain() ..."Peter Hartmann2011-05-241-4/+4
| | * | | | | | | | | Add QUrl::topLevelDomain() and move TLD table from QtNetwork to QtCoreRobert Hogan2011-05-2410-51/+214
| | * | | | | | | | | fix Symbian ordinals for merge request re. utf8 characters in SSL certsPeter Hartmann2011-05-241-1/+5
| | * | | | | | | | | fix coding style for merge request re. utf8 characters in SSL certsPierre Rossi2011-05-231-7/+6
| | * | | | | | | | | Use OpenSSL X509_NAME_ENTRY API to parse UTF8 subjectName/issuerNameRaul Metsma2011-05-233-36/+29
| | * | | | | | | | | Fix the build for QUuidLiang Qi2011-05-232-2/+6
| | * | | | | | | | | Improved performance of the QLocale::name() function.Denis Dzyubenko2011-05-201-9/+22
| | * | | | | | | | | Optimize QUuid::QUuid(const char *)Liang Qi2011-05-201-1/+9