summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix the build with -qtnamespace configure optionssuzuki toshiya2011-09-0610-5/+38
* Removed the unnecessary dependency of the QtHelp module on the QtXml oneConstantin Makshin2011-09-052-2/+1
* Designer: Fix static linking.Jarek Kobus2011-08-311-9/+2
* Fix build with Clang for libpng versions 1.4.0 to 1.5.2Tor Arne Vestbø2011-08-311-0/+23
* don't crash when destroying the shortcutsKonstantin Ritt2011-08-301-1/+2
* Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-08-29101-969/+1255
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-08-2816-23/+158
| |\
| | * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-08-23218-3951/+19270
| | |\
| | | * Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-08-23218-3951/+19270
| | | |\
| | * | \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-08-183-0/+33
| | |\ \ \ | | | |/ /
| | | * | Default graphics memory quota for Symbian applicationsMiikka Heikkinen2011-08-183-0/+33
| | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-08-101-2/+1
| | |\ \ \ | | | |/ /
| | | * | Fix warning about missing qs60keycapture_p.h header in guiMiikka Heikkinen2011-08-101-2/+1
| | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-08-052-17/+20
| | |\ \ \ | | | |/ /
| | | * | Reimplement MR1271 over coda patchShane Kearns2011-08-051-16/+16
| | | * | Fixed Symbian memory leak in utcToLocal(QDate &, QTime &)mread2011-08-051-1/+4
| | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-08-0510-4/+104
| | |\ \ \ | | | |/ /
| | | * | Fix bad merge on a couple of xml examplesMiikka Heikkinen2011-08-052-4/+2
| | | * | DEF file freezemread2011-08-048-0/+102
| * | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-280-0/+0
| |\ \ \ \
| | * \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-271-0/+1
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-261-0/+1
| | | |\ \ \ \
| | | | * | | | Porting the QTBUG-21084 fix to 4.7.4mread2011-08-261-0/+1
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-2818-89/+319
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-08-252-14/+16
| | |\ \ \ \ \ \ \
| | | * | | | | | | uikit: get rid of the "min 30fps" for event handling.Eike Ziller2011-08-251-9/+2
| | | * | | | | | | uikit: update READMEEike Ziller2011-08-251-5/+14
| | * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-08-24102-352/+732
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-08-2416-75/+303
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ 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