Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 6 | -30/+76 |
|\ | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-12 | 2 | -5/+7 |
| |\ | |||||
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-11 | 2 | -5/+7 |
| | |\ | |||||
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-10 | 2 | -5/+7 |
| | | |\ | |||||
| | | | * | A little optimization in QTextControlPrivate::setContent. | Alexis Menard | 2010-02-09 | 1 | -3/+5 |
| | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-05 | 1 | -2/+2 |
| | | | |\ | |||||
| | | | | * | Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso... | Warwick Allison | 2010-02-04 | 1 | -2/+2 |
| | | | | |\ | |||||
| | | | | | * | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2010-02-02 | 2 | -3/+5 |
| | | | | | |\ | |||||
| | | | | | * | | Fix tst_qmlgraphicstext::letterSpacing tst_qmlgraphicstext::wordSpacing | Warwick Allison | 2010-01-14 | 1 | -1/+9 |
| | | | | | * | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2010-01-14 | 93 | -156/+140 |
| | | | | | |\ \ | |||||
| | | | | | * | | | Compile fix for QMLViewer | Thomas Hartmann | 2010-01-08 | 1 | -2/+2 |
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast... | Qt Continuous Integration System | 2010-02-11 | 1 | -3/+2 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Fixed cleaning of both undo- and redo-stacks. | Erik Verbruggen | 2010-02-11 | 1 | -3/+2 |
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-02-11 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Crash when deleting the parent of a context menu while it is being displayed | Gabriel de Dietrich | 2010-02-10 | 1 | -2/+2 |
| | |/ / / / / / | |||||
| * | | | | | | | Fixed regression. | Erik Verbruggen | 2010-02-10 | 1 | -4/+4 |
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast... | Qt Continuous Integration System | 2010-02-10 | 4 | -22/+67 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Added method to clear the undo/redo stacks. | Erik Verbruggen | 2010-02-09 | 4 | -22/+67 |
| | |/ / / / / | |||||
* | | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-12 | 3 | -4/+9 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-02-10 | 1 | -1/+5 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Blinking cursors are 2 pixels wide on Mac OS X/Cocoa. | Prasanth Ullattil | 2010-02-10 | 1 | -1/+5 |
| * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-02-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Make compile | Thomas Zander | 2010-02-10 | 1 | -1/+1 |
| | |/ / / / / / | |||||
| * | | | | | | | Clarify QFont::rawName() docs. | Trond Kjernåsen | 2010-02-10 | 1 | -2/+3 |
| |/ / / / / / | |||||
* | | | | | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6 | Qt Continuous Integration System | 2010-02-09 | 4 | -11/+13 |
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | | | |||||
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-02-06 | 1 | -6/+5 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fixed casual crash in initializeDb (Symbian) | Alessandro Portale | 2010-02-05 | 1 | -6/+5 |
| * | | | | | | Make sure we define S_IFDIR on Windows | Thomas Zander | 2010-02-04 | 1 | -3/+6 |
| * | | | | | | Fix copy/pasto | Thomas Zander | 2010-02-04 | 2 | -2/+2 |
| |/ / / / / | |||||
* | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Olivier Goffart | 2010-02-04 | 2 | -21/+60 |
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | | | |||||
| * | | | | Fixed text rendering via scaled QPainter on rasterPaintEngine / Symbian | Alessandro Portale | 2010-02-01 | 2 | -18/+60 |
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-01-28 | 1 | -3/+0 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Remove left over forward declarations | Alessandro Portale | 2010-01-28 | 1 | -3/+0 |
* | | | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6 | Qt Continuous Integration System | 2010-02-01 | 2 | -3/+5 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-01-28 | 1 | -0/+5 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | doc: Specified default values for constructors. | Martin Smith | 2010-01-27 | 1 | -0/+5 |
| * | | | | Removing unneeded code from QFontEngine::getGlyphPositions() | Alessandro Portale | 2010-01-27 | 1 | -3/+0 |
| |/ / / | |||||
* | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into mas... | Pulse Build System | 2010-01-22 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'merge-request-1601' into master-s60 | axis | 2010-01-05 | 3 | -4/+4 |
| |\ \ \ \ | |||||
| | * | | | | Make all Symbian #includes lower case. | Anderson Lizardo | 2009-10-23 | 3 | -4/+4 |
* | | | | | | Merge branch '4.6' | Thiago Macieira | 2010-01-18 | 1 | -1/+9 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Fix tst_qmlgraphicstext::letterSpacing tst_qmlgraphicstext::wordSpacing Sent ... | Warwick Allison | 2010-01-14 | 1 | -1/+9 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch '4.6' | Thiago Macieira | 2010-01-13 | 93 | -95/+94 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge remote branch 'qt/4.6' into oslo-staging-2/4.6 | Paul Olav Tvete | 2010-01-12 | 93 | -125/+100 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-01-12 | 93 | -93/+93 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-01-07 | 93 | -93/+93 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Update copyright year to 2010 | Jason McDonald | 2010-01-06 | 93 | -93/+93 |
| * | | | | | | | fix release mode crash in qfont.cpp initFontSubst() on Windows mobile | Joerg Bornemann | 2010-01-11 | 1 | -2/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch '4.6' | Thiago Macieira | 2010-01-12 | 2 | -32/+7 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Fix for QTBUG-6408 QFontEngineS60::QFontEngineS60 called hundreds of | Jani Hautakangas | 2010-01-11 | 2 | -32/+7 |
| |/ / / / / |