summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-285-2/+66
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-272-0/+10
| |\
| | * Clear the root index when the model is reset.Girish Ramakrishnan2011-04-272-0/+10
| | * Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Martin Jones2011-04-271481-19738/+104595
| | |\
| * | \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-04-271-2/+6
| |\ \ \
| | * | | Fixed QTBUG-11935 : "With MySQL version > 50000 the QMYSQLDriver::Emmanuel BOURGERIE2011-04-271-4/+4
| | * | | Fixed QTBUG-11935Emmanuel BOURGERIE2011-04-271-2/+6
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-272-0/+50
| |\ \ \ \
| | * | | | Legal: add the license header to the hand-editsThiago Macieira2011-04-272-0/+50
* | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-271-4/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-271-4/+5
| |\ \ \ \ \
| | * | | | | Specify swap behavior preserved bit in openvg engine.Laszlo Agocs2011-04-271-4/+5
* | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-2722-90/+396
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-2715-14/+314
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | |_|_|_|/ | |/| | | |
| | * | | | Ignore changes to selectByMouse during a selection.Andrew den Exter2011-04-2713-14/+302
| | * | | | PathView offset out of sync with currentIndex when items are removed.Martin Jones2011-04-272-0/+12
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-273-1/+23
| |\ \ \ \ \ | | |/ / / /
| | * | | | Move the TextInput cursor delegate when the preedit position changes.Andrew den Exter2011-04-273-1/+23
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-04-268-37/+54
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Add new exported symbol to QtGuiu.defEskil Abrahamsen Blomfeldt2011-04-261-0/+2
| | * | | | Handle uppercase 'E' when parsing numbers in SVGs.Kim Motoyoshi Kalland2011-04-201-1/+1
| | * | | | Let QTextLine decide its own x position in QPainterJiang Jiang2011-04-194-22/+26
| | * | | | Support text decoration in QML when using static text back-endEskil Abrahamsen Blomfeldt2011-04-182-11/+21
| | * | | | Fix missing color in text when using static text back-end in QMLEskil Abrahamsen Blomfeldt2011-04-182-3/+4
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-263-60/+33
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | |
| | * | | Input method hints are not correct if using proxy widgetSami Merila2011-04-261-4/+9
| | * | | Fix for GL graphcics system orientation whichJani Hautakangas2011-04-261-32/+16
| | * | | Update Symbian platform notes documentationJani Hautakangas2011-04-261-24/+8
* | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-04-272-6/+2
|\ \ \ \ \
| * \ \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-262-6/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-262-6/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Set QPixmapCache default limit to 10MB on Symbian.Jani Hautakangas2011-04-262-6/+2
* | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-04-2211-19/+147
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-2211-19/+147
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-2111-19/+147
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Document section behavior when not ordered by sectionMartin Jones2011-04-211-0/+8
| | | * | | Fix TextInput cursor position unchanged when selection length is 0.Andrew den Exter2011-04-213-1/+28
| | | * | | Fix TextInput echoMode clearing inputMethodHints set by the user.Andrew den Exter2011-04-214-13/+78
| | | * | | Elide has unexpected effect on Text's implicitWidthMartin Jones2011-04-214-5/+33
* | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-04-2127-27/+21406
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-2127-27/+21406
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-214-16/+36
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Build break fix for simulated QS60StyleSami Merila2011-04-202-11/+11
| | | * | | Drift correction and better accuracy for repeating timers in Symbianmread2011-04-202-5/+25
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-211-1/+1
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | QDeclarativeDebug: Fix typo in warningKai Koehne2011-04-201-1/+1
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-2013-1/+21290
| | |\ \ \ \
| | | * | | | remove exec bit ... again ...Oswald Buddenhagen2011-04-205-0/+0
| | | * | | | Add Korean translationPark Shinjo2011-04-207-0/+21287
| | | * | | | fix unititialized value use when timestamping qconfig.hDarryl L. Miles2011-04-201-1/+3