summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-04-291-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix missing glyphs for large fonts with QStaticText/GL/FreetypeEskil Abrahamsen Blomfeldt2011-04-291-1/+1
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-04-281-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix crash in raster on X11 when text contains unsupported charactersEskil Abrahamsen Blomfeldt2011-04-281-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-287-1/+75
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Made the autotest for drawing pixmaps with painter open more fail safe.Laszlo Agocs2011-04-281-8/+23
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-04-28910-3401/+74200
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | 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' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-271-4/+5
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ 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
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ 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 '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-214-16/+36
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ 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
* | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-209-9/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | QDeclarativeDebug: Fix endless loop for property with SCRITABLE falseKai Koehne2011-04-202-6/+27
| * | | | | | | | | | | | | Fix Symbian/Linux compilation breakage in plugins/qmltoolingKai Koehne2011-04-201-1/+1
| * | | | | | | | | | | | | Make QMLViewer startup animation stop after a whileAlan Alpert2011-04-194-1/+37
| * | | | | | | | | | | | | Fix excessive scrolling in TextInput with mid string pre-edit text.Andrew den Exter2011-04-192-1/+15
* | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-207-320/+458
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | / / / | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Updated Russian translationSergey Belyashov2011-04-194-319/+366
| * | | | | | | | | | | | Ukrainian translation updatedVictor Ostashevsky2011-04-193-1/+92
* | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \