summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-08-243-21/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Fix QGLGlyphCache for Open GL ES (1).Eike Ziller2011-08-241-15/+20
| | * | | | | | | | | | | | Revert "Include trailing space width in RTL text line width"Eskil Abrahamsen Blomfeldt2011-08-241-5/+1
| | * | | | | | | | | | | | Fix justification of RTL textEskil Abrahamsen Blomfeldt2011-08-241-1/+2
| * | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-08-2413-54/+280
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | uikit: fix examples to no longer ship the custom fontsEike Ziller2011-08-242-12/+0
| | * | | | | | | | | | | | Use CoreText for font rendering on uikit.Eike Ziller2011-08-2413-42/+280
* | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-08-272-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-08-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Check if bridge plugin vector is still valid.Frederik Gladhorn2011-08-261-1/+1
| * | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-08-258-13/+362
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-258-13/+362
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-08-251-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | QWindowsStyle: fix bug in eventFilter on KeyPressed event with alt pressed: i...peterpa2011-08-251-2/+5
| * | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-08-246-40/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-246-40/+50
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-08-2361-190/+298
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-230-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-08-1961-190/+298
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-08-276-200/+256
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Revert "Don't second-guess the "engine"; call cleanPath on absolutePaths"João Abecasis2011-08-261-2/+8
| * | | | | | | | | | | | | | | | | | Revert "In 4.7 QFileInfo::absolute(File)Path returned clean paths"João Abecasis2011-08-261-3/+1
| * | | | | | | | | | | | | | | | | | In 4.7 QFileInfo::absolute(File)Path returned clean pathsJoão Abecasis2011-08-261-1/+3
| * | | | | | | | | | | | | | | | | | ret is an "internal" path, no need to re-process itJoão Abecasis2011-08-261-1/+1
| * | | | | | | | | | | | | | | | | | We prefer capitalized drive letters, make it so soonerJoão Abecasis2011-08-261-2/+3
| * | | | | | | | | | | | | | | | | | Don't second-guess the "engine"; call cleanPath on absolutePathsJoão Abecasis2011-08-261-8/+2
| * | | | | | | | | | | | | | | | | | Compare non-canonical paths before falling back on expensive computationJoão Abecasis2011-08-262-0/+9
| * | | | | | | | | | | | | | | | | | Fix QDir::operator==(const QDir &) constJoão Abecasis2011-08-263-3/+10
| * | | | | | | | | | | | | | | | | | Off-by-one error in assert condition...João Abecasis2011-08-221-1/+1
| * | | | | | | | | | | | | | | | | | Leftovers from 401722ef9e6fe79bd41f9d5f79668f5c4997c8e6João Abecasis2011-08-181-14/+0
| * | | | | | | | | | | | | | | | | | Merged fileTemplate test with QTBUG_4796João Abecasis2011-08-171-68/+48
| * | | | | | | | | | | | | | | | | | Cleanup code: removing empty stubsJoão Abecasis2011-08-171-29/+0
| * | | | | | | | | | | | | | | | | | Fix QTemporaryFile regressions and new found issuesJoão Abecasis2011-08-172-50/+36
| * | | | | | | | | | | | | | | | | | Use "native paths" on POSIX platforms as wellJoão Abecasis2011-08-171-27/+3
| * | | | | | | | | | | | | | | | | | Cleanup #includesJoão Abecasis2011-08-171-2/+0
| * | | | | | | | | | | | | | | | | | Add output on test failureJoão Abecasis2011-08-171-17/+26
| * | | | | | | | | | | | | | | | | | Atomic implementation of create file and obtain handle for Win/SymbianJoão Abecasis2011-08-172-60/+122
| * | | | | | | | | | | | | | | | | | Minimize encoding conversions when generating unique file nameJoão Abecasis2011-08-171-15/+54
| * | | | | | | | | | | | | | | | | | Use QStringBuilder when copying template for modificationJoão Abecasis2011-08-171-15/+47
| * | | | | | | | | | | | | | | | | | Make Symbian follow Windows code in temporary path generationJoão Abecasis2011-08-171-8/+5
| * | | | | | | | | | | | | | | | | | Encapsulate pointer manipulations to createFileTemplate functionJoão Abecasis2011-08-171-15/+18
* | | | | | | | | | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-2758-653/+513
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-2658-653/+513
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-262-4/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Fixed use of deleted object in XmlPatterns EvaluationCachemread2011-08-262-4/+3
| | * | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-251-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | Crash when creating scroll bar skin graphics on S60 (debug only)Sami Merila2011-08-251-3/+3
| | * | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-251-2/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | QS60Style omits drawing theme background in some Symbian SDKsSami Merila2011-08-251-2/+6
| | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-244-44/+116
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \