summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-11-158-8/+92
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integr...Qt Continuous Integration System2011-11-151-0/+4
| |\
| | * tests: allow unstable tests to be marked with CONFIG+=insignificant_testRohan McGovern2011-11-151-0/+4
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-11-151-1/+4
| |\ \ | | |/ | |/|
| | * Fix focusScopeItemChange setting crashDamian Jansen2011-11-151-1/+4
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-11-112-2/+27
| |\ \
| | * | Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEndSami Rosendahl2011-11-112-2/+27
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-11-095-8/+57
| |\ \ \
| | * | | symbian - handle path being passed as part of filename in QTranslatorShane Kearns2011-11-074-5/+54
| | * | | Symbian - fix compile error when default configuredShane Kearns2011-11-071-3/+3
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-11-082-0/+5
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Compile when -no-rtti is specified as a configure optionAndy Shaw2011-11-071-0/+4
| | * | | Ensure that the RC_FILE is correctly handled in a single configurationAndy Shaw2011-11-071-0/+1
| |/ / /
* | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-314-2/+116
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-281-1/+1
| |\ \ \ | | |/ /
| | * | Symbian - disable memory mapping in QNetworkDiskCacheShane Kearns2011-10-281-1/+1
| | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-10-279-59/+127
| |\ \ | | |/ | |/|
| | * Merge remote-tracking branch 'upstream/4.7' into 4.7Sergio Ahumada2011-10-274-2/+27
| | |\ | | |/ | |/|
| * | 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 '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-10-217-62/+37
| | | |\
| | | | * Fix security problem on webpage due to bad JSCasper van Donderen2011-10-215-59/+2
| | | | * Accepting predicted text using hardware keyboard replaces unwanted partSami Merila2011-10-212-3/+35
| | | * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-10-21132-716/+1892
| | | |\ \ | | | | |/
| | | | * Doc: adding link to the Qt Quick Components for Symbian page.Jerome Pasion2011-10-214-0/+125
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-10-2819-86/+81
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-261-2/+2
| |\ \ \ \ \
| | * | | | | Symbian configuration parameter change for linux buildingPasi Pentikainen2011-10-261-2/+2
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-261-7/+8
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Improve patch_capabilities script output.Miikka Heikkinen2011-10-261-7/+8
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-251-2/+8
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix QtSql autotest server addressesHonglei Zhang2011-10-251-2/+8
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-251-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Update SQLite version number in legal documentHonglei Zhang2011-10-251-1/+1
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-241-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Update SQLite version mentioned in licence documentHonglei Zhang2011-10-241-1/+1
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-205-30/+6
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Symbian Linuxification building case changesPasi Pentikainen2011-10-205-30/+6
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-203-26/+37
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix FTP example to handle failure to open network sessionShane Kearns2011-10-192-24/+35
| | * | | | | Use QBasicAtomicInt as a static variableShane Kearns2011-10-191-2/+2
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-186-15/+16
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | FTP - fix interoperability issues with SIZE commandShane Kearns2011-10-181-2/+2
| | * | | | | QS60StyleAnimation exception safetymread2011-10-182-9/+5
| | * | | | | Catch potential throw in ~QSymbianControlmread2011-10-181-1/+5
| | * | | | | Fixed access to null threadData in ~QObjectPrivatemread2011-10-181-2/+3
| | * | | | | Fix the build for makefile build system of SymbianLiang Qi2011-10-181-1/+1
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-181-3/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Symbian - fix compile error when default configuredShane Kearns2011-10-181-3/+3
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-10-282-2/+2
|\ \ \ \ \ \ \