summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-195-70/+51
|\
| * Resolve two save/restore geometry issues on X11.Morten Johan Sørvig2010-11-182-7/+7
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-183-63/+44
| |\
| | * Split newQObject tests into smaller chunks.Jedrzej Nowacki2010-11-182-56/+36
| | * Compile fixBradley T. Hughes2010-11-181-1/+0
| | * Don't destroy Qt's internal pthread_key_t if it was not initializedBradley T. Hughes2010-11-181-7/+9
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-183-24/+20
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-183-24/+20
| |\ \ |/ / /
| * | Some optimizations for the gray-raster (raster engine antialiasing).Samuel Rødal2010-11-182-24/+13
| * | Fix fontconfig pattern mergingJiang Jiang2010-11-181-0/+7
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-11-182-13/+10
|\ \ \ | |_|/ |/| |
| * | Build Qt with GCCE 4.4.1, Symbian^3 PDK on Linux and Mac OS X.Liang Qi2010-11-181-4/+1
| * | Unified the usage of $${EPOCROOT} for symbian.Liang Qi2010-11-182-11/+11
|/ /
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-182-0/+34
|\ \ | |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-172-0/+34
| |\ |/ /
| * Fix bidi PDF mark support in Core Text shaperJiang Jiang2010-11-162-0/+34
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-174-11/+93
|\ \
| * | Revert "Improve restoring of miximized window geomertry."Morten Johan Sørvig2010-11-171-10/+7
| * | Use WS_POPUP window style more often on windows.Prasanth Ullattil2010-11-161-11/+12
| * | Add version information for imported JS benchmarksKent Hansen2010-11-162-0/+80
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-162-7/+11
| |\ \ |/ / /
| * | Improve restoring of miximized window geomertry.Morten Johan Sørvig2010-11-151-7/+10
| * | Fix wrong error assumption when converting "0.0" to doubleJoaquim Rocha2010-11-151-0/+1
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-1612-37/+324
|\ \ \ | |/ / |/| / | |/
| * Avoid the flushing of widgets that shouldn't show on screen.Fabien Freling2010-11-151-0/+5
| * Change in QGraphicsView documentation.Yoann Lopes2010-11-151-4/+3
| * Chip demo: makes scene interaction easier.Yoann Lopes2010-11-152-12/+74
| * Fix cursor position of one digit after RTL textJiang Jiang2010-11-152-1/+24
| * Compile fix.Kim Motoyoshi Kalland2010-11-151-2/+2
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-156-18/+216
| |\ |/ /
| * Introduced new class QAnimationDriver for plugging in what drives animationsGunnar Sletta2010-11-124-16/+214
| * Use correct font for menu item shortcutsJiang Jiang2010-11-121-1/+1
| * Fix text rendering offset for raster engine on MacJiang Jiang2010-11-121-1/+1
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-11-15377-4917/+12192
|\ \ | |/ |/|
| * Fix compilation after merge.Olivier Goffart2010-11-123-3/+2
| * Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-12376-4914/+12190
| |\ |/ /
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2010-11-116-78/+170
| |\
| | * Doc: Fixing typoSergio Ahumada2010-11-111-1/+1
| | * Fix auto-test regression in tst_QDoubleValidatorGabriel de Dietrich2010-11-101-0/+8
| | * Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-0920-216/+497
| | |\
| | * | QS60Style: Color calculation should be optimizedSami Merila2010-11-092-5/+5
| | * | QS60Style: Color calculation should be optimizedSami Merila2010-11-093-59/+130
| | * | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-088-169/+508
| | |\ \
| | * \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-061-2/+3
| | |\ \ \
| | * \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-0573-478/+2882
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-047-295/+353
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-0429-105/+293
| | |\ \ \ \ \ \
| | * | | | | | | With some locales, QDoubleValidator would not accept "C" locale valid numbersGabriel de Dietrich2010-11-023-19/+32
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-114-17/+65
| |\ \ \ \ \ \ \ \
| | * | | | | | | | SSL: Fix for capabilities in QSslCertificate auto testShane Kearns2010-11-111-1/+2