summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.8-upstream' into master-waterWater-Team2011-07-252-6/+10
|\
| * Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-07-2524-72/+1783
| |\
| * \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-222-5/+12
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-211-11/+20
| | |\ \
| | | * | Fixed crash when loading 16 bits-per-pixel grayscale TIFs.Kim Motoyoshi Kalland2011-07-201-11/+20
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-211-0/+4
| | |\ \ \
| | | * | | Fix compilation on Symbian platforms without SgImage supportJani Hautakangas2011-07-211-0/+4
* | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-232-2/+5
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-07-232-2/+5
| |\ \ \ \ \
| | * | | | | Build Qt for Symbian on Mac/gcce againLiang Qi2011-07-222-2/+5
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-07-2222-69/+1780
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-226-8/+97
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-07-221-2/+2
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Fix the timeout calculation again.Thiago Macieira2011-07-221-2/+2
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-07-215-6/+95
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge remote-tracking branch 'earth-team/master'Olivier Goffart2011-07-205-6/+95
| | |\ \ \ \ \ \
| | | * | | | | | QNetworkAccessFileBackend: Add warning for file url without scheme.Martin Petersson2011-07-191-2/+3
| | | * | | | | | Native memory mapped file supportShane Kearns2011-06-283-4/+67
| | | * | | | | | Fix compiler warningShane Kearns2011-06-271-0/+1
| | | * | | | | | Create QScopedResource classShane Kearns2011-06-271-0/+24
* | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-2118-64/+257
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-07-211-10/+13
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Doc: Moved general notes about character conversion.David Boddie2011-07-181-10/+13
| | |/ / / / / / /
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-07-2117-54/+244
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote branch 'review/master' into stagingJiang Jiang2011-07-2017-54/+244
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Move separator skipping to proper placeJiang Jiang2011-07-192-6/+7
| | | * | | | | | | | Skip shaping for hidden line/paragraph separatorsJiang Jiang2011-07-191-0/+6
| | | * | | | | | | | Support interface orientation for uikit.Eike Ziller2011-07-187-19/+155
| | | * | | | | | | | Add support for opening LinuxInput devices exclusively ('grabbing').Mirko Vogt2011-07-182-2/+15
| | | * | | | | | | | Fixed regression in compilerwarnings.Samuel Rødal2011-07-151-3/+1
| | | * | | | | | | | Properly quit the input event thread in the directfb platform plugin.Samuel Rødal2011-07-141-0/+2
| | | * | | | | | | | Apply 57993ba7 properly to 4.8Jiang Jiang2011-07-141-1/+1
| | | * | | | | | | | Deprecate some QPixmap functions (marked as obsolete already).Samuel Rødal2011-07-121-3/+7
| | | * | | | | | | | Deprecate some functions in QImage (that have been obsolete since 4.1).Samuel Rødal2011-07-121-7/+10
| | | * | | | | | | | Add QLocale::toUpper/LowerLars Knoll2011-07-123-22/+49
| | | * | | | | | | | Fix warning for uninitialized variableJiang Jiang2011-07-121-1/+1
* | | | | | | | | | | Don't include qdbusvirtualobject header twice.Frederik Gladhorn2011-07-211-2/+1
* | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-2015-20304/+40039
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | / / / / / | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-07-208-20/+95
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-208-20/+95
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-191-0/+3
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ | | | | |/| | | | | |
| | | | * | | | | | | Check for buffer overflow in Lookup_MarkMarkPosJiang Jiang2011-07-191-0/+3
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-07-193-4/+78
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Delay masking the last character in Password echo mode.Andrew den Exter2011-07-193-4/+78
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-182-2/+15
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Prevent failed rendering for NPOT textures in GLES2.Samuel Rødal2011-07-181-1/+3
| | | | * | | | | | | | Don't use GL_REPEAT for NPOT textures in GLES2.Samuel Rødal2011-07-181-1/+12
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-182-3/+3
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | |
| | | | * | | | | | | | Avoid crash when surface creation fails.Laszlo Agocs2011-07-182-3/+3
| * | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-07-202-4/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |