summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-07-0819-8/+62
|\
| * Merge remote branch 'upstream/4.8'Jerome Pasion2011-07-0817-212/+853
| |\
| * | Doc: Fixed \since declarations.David Boddie2011-07-011-2/+2
| * | Doc: Added more appropriate links to help reduce confusion.David Boddie2011-07-011-0/+2
| * | Doc: Updated documentation with \since 4.8 declarations.David Boddie2011-06-3017-6/+58
* | | Merge remote branch 'mainline/4.8' into stagingJiang Jiang2011-07-0817-212/+853
|\ \ \ | | |/ | |/|
| * | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-072-2/+19
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-061-1/+13
| | |\ \
| | | * | Fix bidi reordering when part of text is rendered by fallback fontEskil Abrahamsen Blomfeldt2011-07-061-1/+13
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-061-1/+6
| | |\ \ \
| | | * | | On symbian QMessageBox does not look like native dialogSami Merila2011-07-061-1/+6
| * | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-063-4/+17
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-053-4/+17
| | |\ \ \ \ | | | |/ / /
| | | * | | Support partial input modeSami Merila2011-07-053-4/+17
| * | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-055-7/+36
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-053-1/+15
| | |\ \ \ \ | | | |/ / /
| | | * | | QS60Style: QMessageBox theme background is incorrectSami Merila2011-07-053-1/+15
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-042-6/+21
| | |\ \ \ \ | | | |/ / /
| | | * | | On symbian QMessageBox icon is on different side than in native dialogSami Merila2011-07-042-6/+21
| * | | | | Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-07-045-24/+679
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-041-1/+1
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | Fix horizontal center alignment with trailing spaceJiang Jiang2011-07-041-1/+1
| | * | | Regression: QS60Style - All standardIcons are drawn as "small icons"Sami Merila2011-07-041-1/+1
| | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-015-24/+679
| | |\ \
| | | * | QS60Style: provide more standard iconsSami Merila2011-07-014-6/+638
| | | * | Do not try to open VKB if it is already open in SymbianMiikka Heikkinen2011-06-301-18/+41
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-07-023-163/+67
| |\ \ \ \
| | * | | | Compile with DEBUG_FONTENGINE defineHarald Fernengel2011-07-011-4/+4
| | * | | | minor optimizationRitt Konstantin2011-07-011-2/+2
| | * | | | remove the old compatibility codeRitt Konstantin2011-07-011-95/+2
| | * | | | make QFontEngineQPF1 work even without mmap(2) supportRitt Konstantin2011-07-011-62/+59
| | * | | | Doc: Fixing typoSergio Ahumada2011-06-301-1/+1
| * | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-07-022-7/+26
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-012-7/+26
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | / | | | |_|_|/ | | |/| | |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-291-4/+19
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Fix QWidget::palettePropagation2() autotest on Symbian (part 2)Sami Merila2011-06-291-0/+1
| | | | * | Fix QWidget::palettePropagation2() autotest on SymbianSami Merila2011-06-291-4/+18
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-06-291-3/+7
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Fix text color in some cases of QML and QStaticTextEskil Abrahamsen Blomfeldt2011-06-291-3/+7
| * | | | | Cocoa: QFileDialog: fix filename filter not applied correctlyRichard Moe Gustavsen2011-06-301-2/+3
| * | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-06-2998-877/+1686
| |\ \ \ \ \ | | |/ / / /
| * | | | | Fix typo in comment.Frederik Gladhorn2011-06-281-1/+1
| * | | | | Mac: respect WA_ShowWithoutActivating flagRichard Moe Gustavsen2011-06-281-1/+4
| * | | | | Merge branch '4.8'Richard Moe Gustavsen2011-06-281-1/+1
| |\ \ \ \ \
| | * | | | | Mac: switch raster off as default paint engineRichard Moe Gustavsen2011-06-151-1/+1
* | | | | | | Fix S60 compileJiang Jiang2011-07-061-1/+1
* | | | | | | Remove some metrics parsing code from Core TextJiang Jiang2011-07-062-20/+3
* | | | | | | Fix Windows compileJiang Jiang2011-07-061-1/+1
* | | | | | | Move styleName out of QtFontStyle::KeyJiang Jiang2011-07-065-46/+57
* | | | | | | Fix regressions in previous QFontDatabase patchJiang Jiang2011-07-051-12/+8