summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'review/master' into stagingJiang Jiang2011-07-206-13/+38
|\
| * Move separator skipping to proper placeJiang Jiang2011-07-192-6/+7
| * Skip shaping for hidden line/paragraph separatorsJiang Jiang2011-07-191-0/+6
| * Add support for opening LinuxInput devices exclusively ('grabbing').Mirko Vogt2011-07-182-2/+15
| * Fixed regression in compilerwarnings.Samuel Rødal2011-07-151-3/+1
| * Apply 57993ba7 properly to 4.8Jiang Jiang2011-07-141-1/+1
| * Deprecate some QPixmap functions (marked as obsolete already).Samuel Rødal2011-07-121-3/+7
| * Deprecate some functions in QImage (that have been obsolete since 4.1).Samuel Rødal2011-07-121-7/+10
| * Fix warning for uninitialized variableJiang Jiang2011-07-121-1/+1
* | Merge remote branch 'review/master' into stagingJiang Jiang2011-07-128-50/+58
|\ \ | |/
| * Fix compiler warning in qtextdocument.cppEskil Abrahamsen Blomfeldt2011-07-111-1/+1
| * Fix crash when app font is addedJiang Jiang2011-07-113-19/+28
| * Use truncate only for subpixel boundingBox x positionJiang Jiang2011-07-082-2/+2
| * Use more numerically robust algorithm to compute QBezier::pointAt().Samuel Rødal2011-07-081-18/+18
| * Fix editable combobox style on MacJiang Jiang2011-07-071-5/+5
| * Revert 344a4dcfe and part of 93bce787Jiang Jiang2011-07-072-6/+5
| * Fix raster subpixel positioning in LionJiang Jiang2011-07-071-1/+1
| * Merge remote branch 'mainline/4.8'Jiang Jiang2011-07-0715-206/+817
| |\
* | \ 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