summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-08-23136-3683/+8870
|\
| * Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-193-6/+26
| |\
| | * Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-183-6/+26
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-182-3/+3
| | | |\
| | | | * Fix non-ascii name issues in ICD.Xizhi Zhu2011-08-182-3/+3
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-181-2/+5
| | | |\ \
| | | | * | Compile fix for Symbian 5th and earlierSami Merila2011-08-181-2/+5
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-171-1/+18
| | | |\ \ \ | | | | |/ /
| | | | * | Symbian: Fix backspace on empty lines of multiline texteditsMiikka Heikkinen2011-08-171-1/+18
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-08-1919-93/+121
| |\ \ \ \ \
| | * | | | | Doc: Fixed qdoc warnings.David Boddie2011-08-1517-88/+117
| | * | | | | Doc: Fixed qdoc warnings.David Boddie2011-08-152-4/+2
| | * | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-08-08132-21170/+44784
| | |\ \ \ \ \
| | * | | | | | Doc: Fixed the example of an encoded URL in the class description.David Boddie2011-07-211-2/+3
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-187-12/+33
| |\ \ \ \ \ \ \
| | * | | | | | | uikit: Fixes for Open GL ES 1 and for pre-3GS devicesEike Ziller2011-08-172-6/+27
| | * | | | | | | uikit: Fix warning.Eike Ziller2011-08-171-1/+1
| | * | | | | | | Use thumb instructions for uikitEike Ziller2011-08-171-2/+1
| | * | | | | | | Fix compilation with thumb2.Eike Ziller2011-08-171-0/+2
| | * | | | | | | Update uikit README: svg works, warn about thumbEike Ziller2011-08-171-3/+4
| | * | | | | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-08-164-3/+15
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-08-16109-3850/+8849
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Fix bidi reordering of RTL text with embedded imagesEskil Abrahamsen Blomfeldt2011-08-161-2/+0
| | * | | | | | | | | Fixed infinite loop when loading certain SVGs.Kim Motoyoshi Kalland2011-08-151-1/+1
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-...Qt Continuous Integration System2011-08-181-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'review/master'Sergio Ahumada2011-08-181-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-08-121-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Fix files that don't end with a newline characterSergio Ahumada2011-08-121-1/+1
| * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-181-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Improve documentation for QDeclarativeView::setSource()Keith Isdale2011-08-181-0/+2
| * | | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-183-10/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-173-10/+13
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-171-3/+5
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Handle CloseSoftwareInputPanel event in QCoeFepInputContextSami Merila2011-08-171-3/+5
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-08-171-3/+3
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Fix delayed password masking mid-string.Andrew den Exter2011-08-171-3/+3
| | | | * | | | | | | | | | Revert accidental commitBea Lam2011-08-111-205/+91
| | | | * | | | | | | | | | Rework threading internals in XmlListModel to avoid global staticBea Lam2011-08-111-91/+205
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-161-4/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | don't crash when destroying codec listOswald Buddenhagen2011-08-151-4/+5
| * | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-08-173-54/+87
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-08-165-20/+40
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-08-1544-2932/+7781
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix a crash in a11y introduced by d289e54f2d2aa066cb3Jan-Arve Saether2011-08-151-41/+72
| | * | | | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-1234-176/+81
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fix bug QTBUG-13901, Mac style button rectChris Meyer2011-08-121-1/+1
| | * | | | | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-1115-290/+517
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-08-101-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Cocoa: change usage of deprecated API (scrolling) in LionRichard Moe Gustavsen2011-08-101-12/+14
| * | | | | | | | | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-161-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | / / / / / / / / / / / | | | |_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | |