summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Added missing no_include_pwd checkStyopa Semenukha2011-08-181-1/+1
* Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'suzuki toshiya2011-08-1814-21/+21
* Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-1863-3025/+17812
|\
| * Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-184-10/+20
| |\
| | * Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-174-10/+20
| | |\
| | | * 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-172-3/+10
| | | |\ \
| | | | * | Fix delayed password masking mid-string.Andrew den Exter2011-08-172-3/+10
| | | * | | 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-174-54/+118
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-08-167-20/+9858
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-08-1549-2939/+7814
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fix a crash in a11y introduced by d289e54f2d2aa066cb3Jan-Arve Saether2011-08-151-41/+72
| | * | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-1242-192/+197
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Fix bug QTBUG-13901, Mac style button rectChris Meyer2011-08-122-1/+32
| | * | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-1118-291/+539
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ 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 '4.8-upstream' into master-waterWater-Team2011-08-0815-164/+309
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-08-0444-1953/+4943
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-08-036-44/+49
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-08-021-0/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-08-0151-268/+2146
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-08-081-17/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Minor optimizations for QTextEngineRitt Konstantin2011-08-081-17/+25
| * | | | | | | | | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-166-3/+9833
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-166-3/+9833
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | _ / / / / / / / / / / / / | | | | | / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-152-0/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Join user state of removed text blocksLeandro Melo2011-08-152-0/+19
| | * | | | | | | | | | | | | | | 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/+9800
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Adding Persian translation of Qt.Soroush Rabiei2011-08-121-0/+9800
| | * | | | | | | | | | | | | | | 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-1548-2937/+7812
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-1548-2937/+7812
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-08-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Revert accidental commitBea Lam2011-08-111-205/+91
| | | | * | | | | | | | | | | | | | Rework threading internals in XmlListModel to avoid global staticBea Lam2011-08-111-91/+205