Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.8-upstream' into master-water | Water-Team | 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 | 24 | -72/+1783 |
| |\ | |||||
| * \ | 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 | 22 | -69/+1780 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-07-22 | 6 | -8/+97 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | 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 | 5 | -6/+95 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge remote-tracking branch 'earth-team/master' | Olivier Goffart | 2011-07-20 | 5 | -6/+95 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | QNetworkAccessFileBackend: Add warning for file url without scheme. | Martin Petersson | 2011-07-19 | 1 | -2/+3 |
| | | * | | | | | | 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 | 18 | -64/+257 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master... | Qt Continuous Integration System | 2011-07-21 | 1 | -10/+13 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Doc: Moved general notes about character conversion. | David Boddie | 2011-07-18 | 1 | -10/+13 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-07-21 | 17 | -54/+244 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge remote branch 'review/master' into staging | Jiang Jiang | 2011-07-20 | 17 | -54/+244 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | 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 |
| | | * | | | | | | | | Add QLocale::toUpper/Lower | Lars Knoll | 2011-07-12 | 3 | -22/+49 |
| | | * | | | | | | | | Fix warning for uninitialized variable | Jiang Jiang | 2011-07-12 | 1 | -1/+1 |
* | | | | | | | | | | | Don't include qdbusvirtualobject header twice. | Frederik Gladhorn | 2011-07-21 | 1 | -2/+1 |
* | | | | | | | | | | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-07-20 | 15 | -20304/+40039 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | / / / / / | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-07-20 | 8 | -20/+95 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-07-20 | 8 | -20/+95 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | | | |||||
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-07-19 | 1 | -0/+3 |
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ | | | | |/| | | | | | | |||||
| | | | * | | | | | | | Check for buffer overflow in Lookup_MarkMarkPos | Jiang Jiang | 2011-07-19 | 1 | -0/+3 |
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-07-19 | 3 | -4/+78 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Delay masking the last character in Password echo mode. | Andrew den Exter | 2011-07-19 | 3 | -4/+78 |
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-07-18 | 2 | -2/+15 |
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | | | |||||
| | | | * | | | | | | | | Prevent failed rendering for NPOT textures in GLES2. | Samuel Rødal | 2011-07-18 | 1 | -1/+3 |
| | | | * | | | | | | | | Don't use GL_REPEAT for NPOT textures in GLES2. | Samuel Rødal | 2011-07-18 | 1 | -1/+12 |
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-07-18 | 2 | -3/+3 |
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | | | |||||
| | | | * | | | | | | | | Avoid crash when surface creation fails. | Laszlo Agocs | 2011-07-18 | 2 | -3/+3 |
| * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast... | Qt Continuous Integration System | 2011-07-20 | 2 | -4/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | |