summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-06-291-3/+4
| |\ \ \ \
| | * | | | Fix vertical positioning of glyphs in raster engine with FreeTypeJiang Jiang2011-06-281-3/+4
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-06-283-52/+52
| |\ \ \ \ \
| | * | | | | Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-06-273-52/+52
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-06-283-1/+5
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | / | | |_|_|_|/ | |/| | | |
| | * | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-06-2737-199/+329
| | |\ \ \ \ | | | |/ / /
| | * | | | Reorder variable to eliminate warningsJiang Jiang2011-06-271-1/+1
| | * | | | Only compare styleNames if they are not emptyJiang Jiang2011-06-272-2/+2
| | * | | | Add styleName to QFontDef comparisonJiang Jiang2011-06-252-0/+4
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-06-271-2/+2
| |\ \ \ \ \
| | * | | | | Fix event delevery orderOlivier Goffart2011-06-271-2/+2
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-06-275-24/+337
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-06-2431-187/+328
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-2431-187/+328
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | / / | | | | |/ / | | | |/| |
| | | * | | Use numeric virtual keyboard for all number entry modes.Miikka Heikkinen2011-06-231-7/+0