summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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-21584-3055/+28274
|\ \ | |/ |/|
| * Fixed compile error.axis2009-08-211-1/+1
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60axis2009-08-2139-228/+3239
| |\
| * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60axis2009-08-215-86/+211
| |\ \
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-2119-274/+698
| |\ \ \
| * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-211-1/+1
| |\ \ \ \
| | * | | | compile.Harald Fernengel2009-08-211-1/+1
| * | | | | Merge commit 'qt/master'Jason Barron2009-08-2120-91/+147
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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-2114-20/+3978
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | 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
| * | | | | | | Removing #ifdef guards around inlcude statements.Aleksandar Sasha Babic2009-08-211-2/+0
| * | | | | | | Merge commit 'qt/master'Jason Barron2009-08-21329-34664/+14256
| |\ \ \ \ \ \ \
| * | | | | | | | 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-21115-2352/+3182
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 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
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix build error when Q_WS_S60 is undefinedIain2009-08-202-1/+3
| | | * | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicIain2009-08-2078-2184/+3032
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix build problem when Q_WS_S60 is undefinedIain2009-08-201-0/+2
| | * | | | | | | | | | Fix errors in commit d4c0be3bShane Kearns2009-08-202-3/+3
| | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-20100-2241/+3060
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Make qregexp.cpp compile with RVCT.Jason Barron2009-08-201-1/+2
| | | * | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-2028-140/+114
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | compile when bootstrapping QtHarald Fernengel2009-08-201-0/+2
| | | | * | | | | | | | Use QExplicitlySharedDataPointerHarald Fernengel2009-08-204-18/+10
| | | | * | | | | | | | Use QExcplicitlySharedDataPointerHarald Fernengel2009-08-206-20/+14
| | | | * | | | | | | | Use QExplicitlySharedDataPointer wherever possibleHarald Fernengel2009-08-2012-94/+77
| | | | * | | | | | | | Use QExplicitlySharedDataPointerHarald Fernengel2009-08-203-7/+6
| | | | * | | | | | | | Add missing template typedefsHarald Fernengel2009-08-201-0/+4
| | | | * | | | | | | | Fix Q_DECLARE_SHARED macroHarald Fernengel2009-08-201-1/+1
| | | * | | | | | | | | Merge commit 'qt/master'Jason Barron2009-08-2072-2101/+2945
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-20123-456/+606
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /