summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | / / / / / / / | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-161-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-161-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Disabled splitscreen translation still moves screenSami Merila2011-08-161-2/+2
* | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-161-17/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Minor optimizations for QTextEngineRitt Konstantin2011-08-081-17/+25
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-164-3/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | / / / / / | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-151-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Join user state of removed text blocksLeandro Melo2011-08-151-0/+1
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-121-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Missed break of switch-case addedViktor Kolesnyk2011-08-121-0/+1
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-122-3/+24
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Fix softkeys cleanupMiikka Heikkinen2011-08-121-2/+12
| | * | | | | | | | | | Fix clientRect usage in QWidgetPrivate::setGeometry_sys()Miikka Heikkinen2011-08-111-1/+1
| | * | | | | | | | | | Do not allow fullscreen/maximized windows to expand beyond client rectMiikka Heikkinen2011-08-111-7/+9
| | * | | | | | | | | | Do not modify window size for fullscreen windows in setGeometry_sysMiikka Heikkinen2011-08-111-1/+10
* | | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-1543-2930/+7779
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-1543-2930/+7779
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | / / / / | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-082-2/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | / / / / / / / / | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Fix undesirable VKB popup at task switchMiikka Heikkinen2011-08-082-2/+2
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-058-12/+32
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Fix compile errors on S60 3.2Shane Kearns2011-08-056-11/+11
| | | * | | | | | | | Fix to QGLWidget rendering with VG graphics systemJani Hautakangas2011-08-052-1/+21
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-041-3/+3
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Fix installation on S60 5.0Shane Kearns2011-08-041-3/+3
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-08-041-2/+6
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | | * | | | | | | | Move cursorDelegate with the mouse selection of read only text input.Andrew den Exter2011-08-041-2/+6
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-08-03127-52415/+26133
| | |\ \ \ \ \ \ \ \ \