summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-08-16156-5382/+23328
|\
| * Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-08-166-3/+9833
| |\
| | * 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 remote-tracking branch 'qt-mainline/4.8'aavit2011-08-16150-5377/+13495
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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
| | | | * | | | 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-059-13/+37
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Fix compile errors on S60 3.2Shane Kearns2011-08-057-12/+16
| | | | | * | 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-1/+1
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Symbian/gcce: Remove the useless -T flagMartin Storsjo2011-08-041-1/+1
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-042-4/+4
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Fix installation on S60 5.0Shane Kearns2011-08-041-3/+3
| | | | | * | Fix fancybrowser.proShane Kearns2011-08-041-1/+1
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-08-042-4/+25
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
| | | | | * | Move cursorDelegate with the mouse selection of read only text input.Andrew den Exter2011-08-042-4/+25
| | | | * | | 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
| | | | |\ \ \
| | | | | * | | Updating libpng: Patches to libpng 1.5.4 for building it in Qtaavit2011-08-022-5/+18
| | | | | * | | Updating libpng: Add libpng version 1.5.4aavit2011-08-0241-0/+59715
| | | | | * | | Updating libpng: Remove version 1.4.0aavit2011-08-02124-86010/+0
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-031-1/+6
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| |
| | | | | * | | Ignore child elements in non-application caption/pkg name translationsMiikka Heikkinen2011-08-031-1/+6
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-08-151-2/+2
| | |\ \ \ \ \ \
| | | * | | | | | HTTP internals: send password even if no username is setRobert Hogan2011-08-151-2/+2
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-120-0/+0
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | Merge remote-tracking branch 'qt-qml-review/master' into master-qml-stagingKai Koehne2011-08-120-0/+0
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-08-1129-154/+22
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-08-033-1/+43
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-07-264-1/+60
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-07-203-21/+31
| | | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-07-071-0/+22
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-07-071-2/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | * | | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-121-13/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /