Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master... | Qt Continuous Integration System | 2011-07-08 | 19 | -8/+62 |
|\ | |||||
| * | Merge remote branch 'upstream/4.8' | Jerome Pasion | 2011-07-08 | 17 | -212/+853 |
| |\ | |||||
| * | | Doc: Fixed \since declarations. | David Boddie | 2011-07-01 | 1 | -2/+2 |
| * | | Doc: Added more appropriate links to help reduce confusion. | David Boddie | 2011-07-01 | 1 | -0/+2 |
| * | | Doc: Updated documentation with \since 4.8 declarations. | David Boddie | 2011-06-30 | 17 | -6/+58 |
* | | | Merge remote branch 'mainline/4.8' into staging | Jiang Jiang | 2011-07-08 | 17 | -212/+853 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-07-07 | 2 | -2/+19 |
| |\ \ | |||||
| | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-07-06 | 1 | -1/+13 |
| | |\ \ | |||||
| | | * | | Fix bidi reordering when part of text is rendered by fallback font | Eskil Abrahamsen Blomfeldt | 2011-07-06 | 1 | -1/+13 |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-07-06 | 1 | -1/+6 |
| | |\ \ \ | |||||
| | | * | | | On symbian QMessageBox does not look like native dialog | Sami Merila | 2011-07-06 | 1 | -1/+6 |
| * | | | | | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-07-06 | 3 | -4/+17 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-07-05 | 3 | -4/+17 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Support partial input mode | Sami Merila | 2011-07-05 | 3 | -4/+17 |
| * | | | | | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-07-05 | 5 | -7/+36 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-07-05 | 3 | -1/+15 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | QS60Style: QMessageBox theme background is incorrect | Sami Merila | 2011-07-05 | 3 | -1/+15 |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-07-04 | 2 | -6/+21 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | On symbian QMessageBox icon is on different side than in native dialog | Sami Merila | 2011-07-04 | 2 | -6/+21 |
| * | | | | | Merge remote branch 'origin/4.7' into qt-4.8-from-4.7 | Jani Hautakangas | 2011-07-04 | 5 | -24/+679 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-07-04 | 1 | -1/+1 |
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ / | |||||
| | | * | | Fix horizontal center alignment with trailing space | Jiang Jiang | 2011-07-04 | 1 | -1/+1 |
| | * | | | Regression: QS60Style - All standardIcons are drawn as "small icons" | Sami Merila | 2011-07-04 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-07-01 | 5 | -24/+679 |
| | |\ \ | |||||
| | | * | | QS60Style: provide more standard icons | Sami Merila | 2011-07-01 | 4 | -6/+638 |
| | | * | | Do not try to open VKB if it is already open in Symbian | Miikka Heikkinen | 2011-06-30 | 1 | -18/+41 |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-07-02 | 3 | -163/+67 |
| |\ \ \ \ | |||||
| | * | | | | Compile with DEBUG_FONTENGINE define | Harald Fernengel | 2011-07-01 | 1 | -4/+4 |
| | * | | | | minor optimization | Ritt Konstantin | 2011-07-01 | 1 | -2/+2 |
| | * | | | | remove the old compatibility code | Ritt Konstantin | 2011-07-01 | 1 | -95/+2 |
| | * | | | | make QFontEngineQPF1 work even without mmap(2) support | Ritt Konstantin | 2011-07-01 | 1 | -62/+59 |
| | * | | | | Doc: Fixing typo | Sergio Ahumada | 2011-06-30 | 1 | -1/+1 |
| * | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-07-02 | 2 | -7/+26 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-07-01 | 2 | -7/+26 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | / | | | |_|_|/ | | |/| | | | |||||
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-06-29 | 1 | -4/+19 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | Fix QWidget::palettePropagation2() autotest on Symbian (part 2) | Sami Merila | 2011-06-29 | 1 | -0/+1 |
| | | | * | | Fix QWidget::palettePropagation2() autotest on Symbian | Sami Merila | 2011-06-29 | 1 | -4/+18 |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-06-29 | 1 | -3/+7 |
| | | |\ \ \ | | | | |/ / | | | |/| | | |||||
| | | | * | | Fix text color in some cases of QML and QStaticText | Eskil Abrahamsen Blomfeldt | 2011-06-29 | 1 | -3/+7 |
| * | | | | | Cocoa: QFileDialog: fix filename filter not applied correctly | Richard Moe Gustavsen | 2011-06-30 | 1 | -2/+3 |
| * | | | | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-06-29 | 98 | -877/+1686 |
| |\ \ \ \ \ | | |/ / / / | |||||
| * | | | | | Fix typo in comment. | Frederik Gladhorn | 2011-06-28 | 1 | -1/+1 |
| * | | | | | Mac: respect WA_ShowWithoutActivating flag | Richard Moe Gustavsen | 2011-06-28 | 1 | -1/+4 |
| * | | | | | Merge branch '4.8' | Richard Moe Gustavsen | 2011-06-28 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Mac: switch raster off as default paint engine | Richard Moe Gustavsen | 2011-06-15 | 1 | -1/+1 |
* | | | | | | | Fix S60 compile | Jiang Jiang | 2011-07-06 | 1 | -1/+1 |
* | | | | | | | Remove some metrics parsing code from Core Text | Jiang Jiang | 2011-07-06 | 2 | -20/+3 |
* | | | | | | | Fix Windows compile | Jiang Jiang | 2011-07-06 | 1 | -1/+1 |
* | | | | | | | Move styleName out of QtFontStyle::Key | Jiang Jiang | 2011-07-06 | 5 | -46/+57 |
* | | | | | | | Fix regressions in previous QFontDatabase patch | Jiang Jiang | 2011-07-05 | 1 | -12/+8 |