summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-2819-242/+366
|\
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-03-2819-242/+366
| |\
| | * Fix crash and infinite recursion caused by previous commitsJiang Jiang2011-03-282-2/+3
| | * Fix remaining regressions in QWSJiang Jiang2011-03-253-2/+7
| | * Take Xft.hintstyle by default to match the behavior of GTK+Jiang Jiang2011-03-252-1/+10
| | * Fixed remaining issues in subpixel positioning with FreeTypeJiang Jiang2011-03-246-142/+142
| | * Fix QTransform debug outputJiang Jiang2011-03-241-0/+3
| | * qFloor the decoration line width before paintingJiang Jiang2011-03-241-1/+1
| | * Let QTextLine decide its own x position in QPainterJiang Jiang2011-03-241-8/+5
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-03-2313-105/+209
| | |\
| | | * Reset GL glyph cache when texture limit is reachedEskil Abrahamsen Blomfeldt2011-03-236-2/+45
| | | * unlockFace was put in the wrong place in previous patchJiang Jiang2011-03-221-2/+2
| | | * Implement subpixel positioning with FreeTypeJiang Jiang2011-03-228-105/+166
| | * | Avoid repeatedly trying to load unloadable plugins, causing slownessaavit2011-03-231-2/+7
| | |/
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-03-283-52/+54
|\ \ \
| * | | Designer: Fix tab order in action editor dialog.Friedemann Kleint2011-03-281-48/+48
| * | | Make QtUiTools use the lib-infix passed to configure.Friedemann Kleint2011-03-252-4/+6
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-283-2/+120
|\ \ \ \
| * | | | tst_qlocale: improve failure message in tst_QLocale::macDefaultLocaleRohan McGovern2011-03-281-1/+5
| * | | | Add a once-over unrolled fromLatin1 conversion (32 characters)Thiago Macieira2011-03-271-0/+46
| * | | | Add 16-byte loads of the Neon fromLatin1 functionsThiago Macieira2011-03-271-0/+68
| * | | | Fix warning about unused parameterThiago Macieira2011-03-271-1/+1
|/ / / /
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-03-254-4/+57
|\ \ \ \
| * | | | Skip failing testsJoão Abecasis2011-03-252-0/+26
| * | | | QDir: Fix absolute paths when using file enginesJoão Abecasis2011-03-182-4/+31
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-03-252-20/+0
|\ \ \ \ \
| * | | | | Removed old autotest references from Symbian build filesEckhart Koppen2011-03-242-20/+0
* | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-2417-85/+283
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-2417-85/+283
| |\ \ \ \ \ \ |/ / / / / / /
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-233-12/+40
| |\ \ \ \ \ \
| | * | | | | | Icon in QMessageBox::question is deformed on SymbianSami Merila2011-03-231-3/+10
| | * | | | | | Prevent crash when connecting signal in splitviewSami Merila2011-03-231-9/+12
| | * | | | | | GraphicsViews: Focused widget is not visible after orientation changeSami Merila2011-03-231-12/+14
| | * | | | | | GraphicsViews: Focused widget is not visible after orientation changeSami Merila2011-03-231-0/+15
| | * | | | | | Add missing nullify for the s60 style's background pixmap pointer.Laszlo Agocs2011-03-231-0/+1
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-232-10/+13
| |\ \ \ \ \ \ \
| | * | | | | | | Fixes QT-4753Xizhi Zhu2011-03-232-10/+13
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-223-34/+86
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | sort out stdout vs. stderr usageOswald Buddenhagen2011-03-222-34/+39
| | * | | | | | | Changes for 4.7.3Timo Turunen2011-03-221-0/+47
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-229-31/+151
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Implement tiled image and pixmap drawing in VG paint engine.Laszlo Agocs2011-03-221-3/+98
| | * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-s60-public into 4.7Laszlo Agocs2011-03-227-27/+51
| | |\ \ \ \ \ \ \
| | | * | | | | | | Change Symbian to use destroyed swap behaviour in GLJani Hautakangas2011-03-225-23/+51
| | | * | | | | | | Remove useless profile reference.axis2011-03-222-4/+0
| | * | | | | | | | Changed maximum heap size for qmlflickr on Symbian.Laszlo Agocs2011-03-221-1/+2
| | |/ / / / / / /
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-2451-37/+73633
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove the use of the QtTest baseline feature I revertedThiago Macieira2011-03-221-4/+4
| * | | | | | | | | Revert "Add a feature to QTestLib to correct benchmark results."Thiago Macieira2011-03-2220-134/+33
| * | | | | | | | | Use the ARM version of UTF-8 detection in the Neon codeThiago Macieira2011-03-221-16/+13