Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | renamed examplebase.pri to symbianpkgrules.pri | Espen Riskedal | 2009-08-21 | 241 | -326/+357 |
* | Fix drawTiledPixmap for texture_from_pixmap on X11/EGL | Tom Cooksey | 2009-08-21 | 2 | -0/+5 |
* | Fix double drawing of background in XP scrollbar | Jens Bache-Wiig | 2009-08-21 | 1 | -3/+0 |
* | QFSFileEngine compile fix for VS2005 | Joerg Bornemann | 2009-08-21 | 1 | -1/+1 |
* | Phonon compile fix for mingw | Thierry Bastian | 2009-08-21 | 5 | -12/+12 |
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | axis | 2009-08-21 | 1 | -1/+1 |
|\ | |||||
| * | QFSFileEngine compile fix for Windows with VS2005 | Joerg Bornemann | 2009-08-21 | 1 | -1/+1 |
* | | Merge branch 'master' of git@scm:qt/qt-s60-public | axis | 2009-08-21 | 1534 | -6350/+94573 |
|\ \ | |/ |/| | |||||
| * | Fixed compile error. | axis | 2009-08-21 | 1 | -1/+1 |
| * | Merge branch 'master' of git@scm:qt/qt-s60-public into master-s60 | axis | 2009-08-21 | 1 | -12/+0 |
| |\ | |||||
| | * | remove the old .pri files, forgot | Espen Riskedal | 2009-08-21 | 1 | -12/+0 |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60 | axis | 2009-08-21 | 90 | -228/+5506 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60 | axis | 2009-08-21 | 6 | -112/+249 |
| |\ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | axis | 2009-08-21 | 23 | -285/+737 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Jason Barron | 2009-08-21 | 28 | -44/+63 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Espen Riskedal | 2009-08-21 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into mas... | Harald Fernengel | 2009-08-21 | 7 | -58/+42 |
| | | |\ \ \ \ | |||||
| | | * | | | | | compile. | Harald Fernengel | 2009-08-21 | 1 | -1/+1 |
| | * | | | | | | Rename demobase.pri to symbianpkgrules.pri | Espen Riskedal | 2009-08-21 | 27 | -43/+62 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge commit 'qt/master' | Jason Barron | 2009-08-21 | 38 | -200/+325 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Remove changes from bad merge. | Jason Barron | 2009-08-21 | 1 | -3/+4 |
| * | | | | | | Remove commented-out code from examples. | axis | 2009-08-21 | 1 | -4/+0 |
| * | | | | | | Removed an example that was listed twice. | axis | 2009-08-21 | 1 | -1/+0 |
| * | | | | | | Fixes: Missing deployment of backends for phonon examples | axis | 2009-08-21 | 2 | -2/+6 |
| * | | | | | | Revisiting test cases. | Aleksandar Sasha Babic | 2009-08-21 | 1 | -48/+32 |
| * | | | | | | Rebuild configure.exe. | Jason Barron | 2009-08-21 | 1 | -0/+0 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Merge branch 'reviewPatches' | axis | 2009-08-21 | 5 | -50/+15 |
| |\ \ \ \ \ | |||||
| | * | | | | | Revert "Fixed KERN-EXEC 3 panic on ARMV5 builds caused by combining trinary o... | axis | 2009-08-21 | 1 | -27/+0 |
| | * | | | | | Switched to logical comparison instead of bitwise. | axis | 2009-08-21 | 2 | -11/+6 |
| | * | | | | | Fixed documentation. | axis | 2009-08-21 | 1 | -3/+2 |
| | * | | | | | Fixed some comments and code style issues after review. | axis | 2009-08-21 | 3 | -9/+7 |
| * | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Jason Barron | 2009-08-21 | 2 | -5/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fixing compile issue on platforms other than Symbian. | Aleksandar Sasha Babic | 2009-08-21 | 1 | -4/+4 |
| | * | | | | | | Remove QtScript from deployed libraries. | axis | 2009-08-21 | 1 | -1/+0 |
| * | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Jason Barron | 2009-08-21 | 8 | -88/+14 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | compile again after merge | Harald Fernengel | 2009-08-21 | 8 | -88/+14 |
| * | | | | | | | Merge commit 'qt/master' | Jason Barron | 2009-08-21 | 21 | -21/+4976 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | compile again after QESDP fix | Harald Fernengel | 2009-08-21 | 1 | -1/+1 |
| * | | | | | | | compile again with QExplicitlySharedDataPointer | Harald Fernengel | 2009-08-21 | 3 | -12/+12 |
| * | | | | | | | Fixing cause for failing network tests on Symbian. | Aleksandar Sasha Babic | 2009-08-21 | 1 | -10/+49 |
| * | | | | | | | Cleaning test cases. | Aleksandar Sasha Babic | 2009-08-21 | 1 | -6/+3 |
| * | | | | | | | Removing #ifdef guards around inlcude statements. | Aleksandar Sasha Babic | 2009-08-21 | 1 | -2/+0 |
| * | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Jason Barron | 2009-08-21 | 1 | -5/+4 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Janne Anttila | 2009-08-21 | 2 | -3/+3 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Updated flawed comment after 5365c1cd | Janne Anttila | 2009-08-21 | 1 | -5/+4 |
| * | | | | | | | | | Merge commit 'qt/master' | Jason Barron | 2009-08-21 | 388 | -36626/+17175 |
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | More qpixmap*.cpp fixes for QExplicitlySharedDataPointer. | Jason Barron | 2009-08-21 | 2 | -3/+3 |
| | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Janne Anttila | 2009-08-21 | 207 | -2674/+5187 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix qpixmap*.cpp after latest QExplicitlySharedDataPointer changes. | Jason Barron | 2009-08-20 | 4 | -18/+18 |
| | * | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Shane Kearns | 2009-08-20 | 3 | -1/+5 |
| | |\ \ \ \ \ \ \ \ |