summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* renamed examplebase.pri to symbianpkgrules.priEspen Riskedal2009-08-21241-326/+357
* Fix drawTiledPixmap for texture_from_pixmap on X11/EGLTom Cooksey2009-08-212-0/+5
* Fix double drawing of background in XP scrollbarJens Bache-Wiig2009-08-211-3/+0
* QFSFileEngine compile fix for VS2005Joerg Bornemann2009-08-211-1/+1
* Phonon compile fix for mingwThierry Bastian2009-08-215-12/+12
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-211-1/+1
|\
| * QFSFileEngine compile fix for Windows with VS2005Joerg Bornemann2009-08-211-1/+1
* | Merge branch 'master' of git@scm:qt/qt-s60-publicaxis2009-08-211534-6350/+94573
|\ \ | |/ |/|
| * Fixed compile error.axis2009-08-211-1/+1
| * Merge branch 'master' of git@scm:qt/qt-s60-public into master-s60axis2009-08-211-12/+0
| |\
| | * remove the old .pri files, forgotEspen Riskedal2009-08-211-12/+0
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60axis2009-08-2190-228/+5506
| |\ \
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60axis2009-08-216-112/+249
| |\ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-2123-285/+737
| |\ \ \
| * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-2128-44/+63
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicEspen Riskedal2009-08-211-1/+1
| | |\ \ \ \
| | | * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into mas...Harald Fernengel2009-08-217-58/+42
| | | |\ \ \ \
| | | * | | | | compile.Harald Fernengel2009-08-211-1/+1
| | * | | | | | Rename demobase.pri to symbianpkgrules.priEspen Riskedal2009-08-2127-43/+62
| | | |/ / / / | | |/| | | |
| * | | | | | Merge commit 'qt/master'Jason Barron2009-08-2138-200/+325
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Remove changes from bad merge.Jason Barron2009-08-211-3/+4
| * | | | | | Remove commented-out code from examples.axis2009-08-211-4/+0
| * | | | | | Removed an example that was listed twice.axis2009-08-211-1/+0
| * | | | | | Fixes: Missing deployment of backends for phonon examplesaxis2009-08-212-2/+6
| * | | | | | Revisiting test cases.Aleksandar Sasha Babic2009-08-211-48/+32
| * | | | | | Rebuild configure.exe.Jason Barron2009-08-211-0/+0
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'reviewPatches'axis2009-08-215-50/+15
| |\ \ \ \ \
| | * | | | | Revert "Fixed KERN-EXEC 3 panic on ARMV5 builds caused by combining trinary o...axis2009-08-211-27/+0
| | * | | | | Switched to logical comparison instead of bitwise.axis2009-08-212-11/+6
| | * | | | | Fixed documentation.axis2009-08-211-3/+2
| | * | | | | Fixed some comments and code style issues after review.axis2009-08-213-9/+7
| * | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-212-5/+4
| |\ \ \ \ \ \
| | * | | | | | Fixing compile issue on platforms other than Symbian.Aleksandar Sasha Babic2009-08-211-4/+4
| | * | | | | | Remove QtScript from deployed libraries.axis2009-08-211-1/+0
| * | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-218-88/+14
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | compile again after mergeHarald Fernengel2009-08-218-88/+14
| * | | | | | | Merge commit 'qt/master'Jason Barron2009-08-2121-21/+4976
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | compile again after QESDP fixHarald Fernengel2009-08-211-1/+1
| * | | | | | | compile again with QExplicitlySharedDataPointerHarald Fernengel2009-08-213-12/+12
| * | | | | | | Fixing cause for failing network tests on Symbian.Aleksandar Sasha Babic2009-08-211-10/+49
| * | | | | | | Cleaning test cases.Aleksandar Sasha Babic2009-08-211-6/+3
| * | | | | | | Removing #ifdef guards around inlcude statements.Aleksandar Sasha Babic2009-08-211-2/+0
| * | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-211-5/+4
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-212-3/+3
| | |\ \ \ \ \ \ \
| | * | | | | | | | Updated flawed comment after 5365c1cdJanne Anttila2009-08-211-5/+4
| * | | | | | | | | Merge commit 'qt/master'Jason Barron2009-08-21388-36626/+17175
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | More qpixmap*.cpp fixes for QExplicitlySharedDataPointer.Jason Barron2009-08-212-3/+3
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-21207-2674/+5187
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix qpixmap*.cpp after latest QExplicitlySharedDataPointer changes.Jason Barron2009-08-204-18/+18
| | * | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-203-1/+5
| | |\ \ \ \ \ \ \ \