Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-25 | 5 | -4/+6 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-11-24 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge remote branch 'qt/4.7' into 4.7 | Jason McDonald | 2010-11-23 | 1 | -0/+2 |
| | |\ | |||||
| | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-11-19 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * \ | Merge remote branch 'qt/4.7' into 4.7 | Jason McDonald | 2010-11-18 | 4 | -31/+64 |
| | | |\ \ | |||||
| | | * | | | Bump Qt version to 4.7.2. | Jason McDonald | 2010-11-12 | 1 | -1/+1 |
| * | | | | | Merge branch '4.7-upstream' into 4.7-water | Thierry Bastian | 2010-11-22 | 1 | -0/+2 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-11-19 | 1 | -0/+2 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | Compile with QT_NO_PROXYSCREEN. | Sam Magnuson | 2010-11-19 | 1 | -0/+2 |
| | | | |/ | | | |/| | |||||
| * | | | | Merge branch '4.7-upstream' into 4.7-water | Thierry Bastian | 2010-11-19 | 2 | -2/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Doc: Fixing typo | Sergio Ahumada | 2010-11-16 | 2 | -2/+2 |
| | |/ / | |||||
| * | | | Tactile Feedback plugin is not compiled in latest Sym^3 RnD envs | Sami Merila | 2010-11-18 | 2 | -2/+2 |
| |/ / | |||||
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-19 | 4 | -31/+64 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Perttu Pohjonen | 2010-11-15 | 1 | -3/+3 |
| |\ \ | |||||
| | * | | Fix for KERN-EXEC 0 caused by QNetworkAccessManager::get | Ville Pernu | 2010-11-12 | 1 | -3/+3 |
| | * | | Minor adjustments to merge-request 915 | Donald Carr | 2010-11-12 | 1 | -2/+2 |
| | * | | Implement brush transformations for directfb. | Sam Magnuson | 2010-11-12 | 1 | -14/+28 |
| | |/ | |||||
| * | | Fix for E32User-CBASE 46 Panic when using CActiveSchedulerWait | Perttu Pohjonen | 2010-11-15 | 2 | -14/+33 |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-11-11 | 1 | -14/+28 |
| |\ \ | | |/ | |/| | |||||
| | * | Minor adjustments to merge-request 915 | Donald Carr | 2010-11-11 | 1 | -2/+2 |
| | * | Implement brush transformations for directfb. | Sam Magnuson | 2010-11-11 | 1 | -14/+28 |
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-12 | 14 | -100/+280 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-11-11 | 6 | -37/+146 |
| |\ \ | | |/ | |/| | |||||
| | * | Coding style: bang cleanup. | Michael Dominic K | 2010-11-11 | 1 | -10/+10 |
| | * | Removed call to glFinish, obsoleted by fence syncs. | Michael Dominic K | 2010-11-11 | 1 | -1/+0 |
| | * | Plugin-side support for creating/destroying/waiting on fence sync. | Michael Dominic K | 2010-11-11 | 4 | -13/+49 |
| | * | Added MeeGo graphicssystem entry points for KHR_fence_sync. | Michael Dominic K | 2010-11-11 | 2 | -2/+76 |
| | * | Trailing whitespace fixes. | Michael Dominic K | 2010-11-11 | 3 | -15/+15 |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-11-11 | 4 | -46/+87 |
| |\ \ | |||||
| | * \ | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | juhvu | 2010-11-10 | 2 | -36/+51 |
| | |\ \ | |||||
| | | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Lorn Potter | 2010-11-09 | 29 | -383/+1102 |
| | | |\ \ | |||||
| | | * | | | get rid of dependency on QtGui | Lorn Potter | 2010-11-09 | 2 | -36/+51 |
| | * | | | | Removed implicity QtGui linking from icd.pro as it is not needed. | juhvu | 2010-11-09 | 1 | -1/+1 |
| | | |/ / | | |/| | | |||||
| | * | | | DFB: Make sure QPixmap::hasAlpha is respected | Anders Bakken | 2010-11-08 | 1 | -7/+27 |
| | * | | | Fix some painting issues in QDirectFBPaintEngine | Anders Bakken | 2010-11-08 | 1 | -9/+15 |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-11-10 | 1 | -1/+1 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Use $${EPOCROOT} variable rather than absolute paths in .pro files | Gareth Stockwell | 2010-11-10 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Doc: Fixing typo | Sergio Ahumada | 2010-11-09 | 1 | -1/+1 |
| * | | | Doc: Fixing typo | Sergio Ahumada | 2010-11-09 | 2 | -3/+3 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-11-08 | 2 | -14/+44 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-11-05 | 2 | -14/+44 |
| | |\ \ | |||||
| | | * | | Doc: Fixing typo | Sergio Ahumada | 2010-11-03 | 1 | -3/+3 |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-11-03 | 2 | -14/+44 |
| | | |\ \ | |||||
| | | | * | | Use 32bit textures for alpha textures after all. | Michael Dominic K | 2010-11-02 | 2 | -2/+21 |
| | | | * | | One more fix for dithering. | Michael Dominic K | 2010-11-02 | 1 | -8/+8 |
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-10-29 | 1 | -4/+15 |
| | | | |\ \ | |||||
| | | | | * | | 32bit => 16bit conversion has 4byte-aligned output. | Michael Dominic K | 2010-10-29 | 1 | -4/+15 |
* | | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-11-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Task-number: QTBUG-15059 | juhvu | 2010-11-08 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-11-06 | 1 | -1/+2 |
|\ \ \ \ \ \ |