summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.8-upstream' into master-waterWater-Team2011-07-252-6/+10
|\
| * Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-07-252-6/+10
| |\
| | * Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-07-2525-80/+2145
| | |\ | | |/ | |/|
| | * 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-2223-77/+2142
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-2050-3762/+2342
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-1212-137/+889
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-121-1/+2
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-122-5/+25
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-111-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-111-0/+17
| | |\ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-227-13/+99
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | 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-216-11/+97
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge remote-tracking branch 'earth-team/master'Olivier Goffart2011-07-206-11/+97
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | QNetworkAccessFileBackend: Add warning for file url without scheme.Martin Petersson2011-07-192-7/+5
| | | * | | | | | | | | | | | 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-21198-9966/+275
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-07-21180-9904/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-reviewDavid Boddie2011-07-20248-10753/+1890
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-07-19176-9889/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Removed demo files accidentally introduced by commit 3abaecc3.David Boddie2011-07-19176-9889/+0
| | | * | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-07-1972-864/+1890
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | Doc: Added a link to the How to Learn Qt document.David Boddie2011-07-191-1/+2
| | | | * | | | | | | | | | | | | | Doc: Fixed shader program snippet.David Boddie2011-07-191-2/+2
| | | | * | | | | | | | | | | | | | Doc: Fixed page step sizes in a snippet for QAbstractScrollArea.David Boddie2011-07-181-2/+2
| | | | * | | | | | | | | | | | | | Doc: Moved general notes about character conversion.David Boddie2011-07-181-10/+13
| | | | * | | | | | | | | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-07-1868-849/+1871
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-07-2118-62/+256
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'review/master' into stagingJiang Jiang2011-07-2018-62/+256
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-1914-31/+194
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | 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