Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-07-25 | 2 | -6/+10 |
|\ | |||||
| * | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-07-25 | 2 | -6/+10 |
| |\ | |||||
| | * | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7 | Liang Qi | 2011-07-25 | 25 | -80/+2145 |
| | |\ | | |/ | |/| | |||||
| | * | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-07-22 | 2 | -5/+12 |
| | |\ | |||||
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-07-21 | 1 | -11/+20 |
| | | |\ | |||||
| | | | * | Fixed crash when loading 16 bits-per-pixel grayscale TIFs. | Kim Motoyoshi Kalland | 2011-07-20 | 1 | -11/+20 |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-07-21 | 1 | -0/+4 |
| | | |\ \ | |||||
| | | | * | | Fix compilation on Symbian platforms without SgImage support | Jani Hautakangas | 2011-07-21 | 1 | -0/+4 |
* | | | | | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-07-23 | 2 | -2/+5 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma... | Qt Continuous Integration System | 2011-07-23 | 2 | -2/+5 |
| |\ \ \ \ \ | |||||
| | * | | | | | Build Qt for Symbian on Mac/gcce again | Liang Qi | 2011-07-22 | 2 | -2/+5 |
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast... | Qt Continuous Integration System | 2011-07-22 | 23 | -77/+2142 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team | Qt Continuous Integration System | 2011-07-20 | 50 | -3762/+2342 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team | Qt Continuous Integration System | 2011-07-12 | 12 | -137/+889 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team | Qt Continuous Integration System | 2011-07-12 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team | Qt Continuous Integration System | 2011-07-12 | 2 | -5/+25 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team | Qt Continuous Integration System | 2011-07-11 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team | Qt Continuous Integration System | 2011-07-11 | 1 | -0/+17 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-07-22 | 7 | -13/+99 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-07-22 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Fix the timeout calculation again. | Thiago Macieira | 2011-07-22 | 1 | -2/+2 |
| * | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-07-21 | 6 | -11/+97 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | Merge remote-tracking branch 'earth-team/master' | Olivier Goffart | 2011-07-20 | 6 | -11/+97 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | QNetworkAccessFileBackend: Add warning for file url without scheme. | Martin Petersson | 2011-07-19 | 2 | -7/+5 |
| | | * | | | | | | | | | | | | Native memory mapped file support | Shane Kearns | 2011-06-28 | 3 | -4/+67 |
| | | * | | | | | | | | | | | | Fix compiler warning | Shane Kearns | 2011-06-27 | 1 | -0/+1 |
| | | * | | | | | | | | | | | | Create QScopedResource class | Shane Kearns | 2011-06-27 | 1 | -0/+24 |
* | | | | | | | | | | | | | | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-07-21 | 198 | -9966/+275 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master... | Qt Continuous Integration System | 2011-07-21 | 180 | -9904/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-review | David Boddie | 2011-07-20 | 248 | -10753/+1890 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team | Qt Continuous Integration System | 2011-07-19 | 176 | -9889/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | Removed demo files accidentally introduced by commit 3abaecc3. | David Boddie | 2011-07-19 | 176 | -9889/+0 |
| | | * | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team | Qt Continuous Integration System | 2011-07-19 | 72 | -864/+1890 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | |||||
| | | | * | | | | | | | | | | | | | | Doc: Added a link to the How to Learn Qt document. | David Boddie | 2011-07-19 | 1 | -1/+2 |
| | | | * | | | | | | | | | | | | | | Doc: Fixed shader program snippet. | David Boddie | 2011-07-19 | 1 | -2/+2 |
| | | | * | | | | | | | | | | | | | | Doc: Fixed page step sizes in a snippet for QAbstractScrollArea. | David Boddie | 2011-07-18 | 1 | -2/+2 |
| | | | * | | | | | | | | | | | | | | Doc: Moved general notes about character conversion. | David Boddie | 2011-07-18 | 1 | -10/+13 |
| | | | * | | | | | | | | | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-07-18 | 68 | -849/+1871 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-07-21 | 18 | -62/+256 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'review/master' into staging | Jiang Jiang | 2011-07-20 | 18 | -62/+256 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team | Qt Continuous Integration System | 2011-07-19 | 14 | -31/+194 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | | Move separator skipping to proper place | Jiang Jiang | 2011-07-19 | 2 | -6/+7 |
| | | | * | | | | | | | | | | | | | | | | | | Skip shaping for hidden line/paragraph separators | Jiang Jiang | 2011-07-19 | 1 | -0/+6 |
| | | | * | | | | | | | | | | | | | | | | | | Support interface orientation for uikit. | Eike Ziller | 2011-07-18 | 7 | -19/+155 |
| | | | * | | | | | | | | | | | | | | | | | | Add support for opening LinuxInput devices exclusively ('grabbing'). | Mirko Vogt | 2011-07-18 | 2 | -2/+15 |
| | | | * | | | | | | | | | | | | | | | | | | Fixed regression in compilerwarnings. | Samuel Rødal | 2011-07-15 | 1 | -3/+1 |
| | | | * | | | | | | | | | | | | | | | | | | Properly quit the input event thread in the directfb platform plugin. | Samuel Rødal | 2011-07-14 | 1 | -0/+2 |
| | | | * | | | | | | | | | | | | | | | | | | Apply 57993ba7 properly to 4.8 | Jiang Jiang | 2011-07-14 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | | | | | | | | Deprecate some QPixmap functions (marked as obsolete already). | Samuel Rødal | 2011-07-12 | 1 | -3/+7 |
| | | | * | | | | | | | | | | | | | | | | | | Deprecate some functions in QImage (that have been obsolete since 4.1). | Samuel Rødal | 2011-07-12 | 1 | -7/+10 |