summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
| | * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-124-30/+61
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Add QLocale::toUpper/LowerLars Knoll2011-07-124-30/+61
| | * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-121-1/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Fix warning for uninitialized variableJiang Jiang2011-07-121-1/+1
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-07-200-0/+0
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.8' into 4.8-tools-stagingJoerg Bornemann2011-07-207-20289/+40195
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-07-2054-20/+1905
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-2054-20/+1905
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | 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-195-4/+190
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Delay masking the last character in Password echo mode.Andrew den Exter2011-07-195-4/+190
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2011-07-1944-0/+1698
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Updated license headers.Toby Tomkins2011-07-1922-425/+425
| | | * | | | | | | | | | | | | Add system tests from research:systemtests repository.Toby Tomkins2011-07-1244-0/+1698
| | * | | | | | | | | | | | | | 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