summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-11-303-40/+352
|\ \ \ | | |/ | |/|
| * | Fix HarfBuzz Thai character SARA AM handlingJiang Jiang2011-11-303-40/+352
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-11-301-14/+26
|\ \ | |/ |/|
| * Reduce unnecessary QtCore DLL loads during Symbian app thread creationmread2011-11-301-14/+26
|/
* 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 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 scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integr...Qt Continuous Integration System2011-10-211-1/+1
|\ \ \
| * | | Doc: Fix example codeSergio Ahumada2011-10-211-1/+1
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-211-1/+1
|\ \ \
| * | | Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504Sami Merila2011-10-211-1/+1
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-202-3/+35
|\ \ \ \ | |/ / /
| * | | Accepting predicted text using hardware keyboard replaces unwanted partSami Merila2011-10-202-3/+35
| | | * 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 '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-194-1/+16
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Workaround to VideoCore III scissor bug.Jani Hautakangas2011-10-194-1/+16
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-10-191-6/+8
|\ \ \
| * | | Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4aavit2011-10-191-6/+8
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-193-9/+18
|\ \ \ \ | | |/ / | |/| |
| * | | Fix to QGLWidget crashJani Hautakangas2011-10-183-9/+18
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-182-8/+9
|\ \ \ \ | |/ / /
| * | | Update def filesJani Hautakangas2011-10-182-8/+9
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-171-1/+1
|\ \ \ \ | |/ / /
| * | | Typo fixJani Hautakangas2011-10-141-1/+1
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-10-173-2/+47
|\ \ \ \
| * | | | Fix crash on exit when overriding signal handlers in states.Michael Brasser2011-10-173-2/+47
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-146-1/+67
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote branch 'qt/4.7' into 4.7Shane Kearns2011-10-14104-601/+945
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-131-2/+38
|\ \ \ \ \
| * | | | | symbian - search drives for translation filesShane Kearns2011-10-131-2/+38
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-10-122-15/+10
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |