Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/master' into bearermanagement/integration | Aaron McCarthy | 2010-02-14 | 9 | -116/+133 |
|\ | |||||
| * | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 18 | -246/+314 |
| |\ | |||||
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-... | Qt Continuous Integration System | 2010-02-13 | 1 | -2/+12 |
| | |\ | |||||
| | | * | Enabled searching of IM plugins on Symbian. | axis | 2010-02-12 | 1 | -2/+12 |
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-12 | 5 | -102/+112 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | Explicitly pass size to standard pixmap icon loaders. | Michael Brasser | 2010-02-12 | 1 | -95/+95 |
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-11 | 4 | -7/+17 |
| | | |\ | |||||
| | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-10 | 4 | -7/+17 |
| | | | |\ | |||||
| | | | | * | 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-09 | 3 | -4/+12 |
| | | | | |\ | |||||
| | | | | | * | Add empty constructor for validators. | Alan Alpert | 2010-02-08 | 1 | -2/+3 |
| | | | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-05 | 2 | -2/+9 |
| | | | | | |\ | |||||
| | | | | | | * | Remove hacky fix (breaks autotest). | Michael Brasser | 2010-02-05 | 1 | -1/+0 |
| | | | | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-05 | 2 | -2/+10 |
| | | | | | | |\ | |||||
| | | | | | | | * | Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso... | Warwick Allison | 2010-02-04 | 2 | -2/+10 |
| | | | | | | | |\ | |||||
| | | | | | | | | * | Add bug note. | Michael Brasser | 2010-02-04 | 1 | -1/+1 |
| | | | | | | | | * | Fix compile on visual, changed NaN checks to use qIsNaN instead of isnan. | Joona Petrell | 2010-02-03 | 1 | -2/+3 |
| | | | | | | | | * | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2010-02-02 | 22 | -143/+226 |
| | | | | | | | | |\ | |||||
| | | | | | | | | * | | Tests for NaN values in the property x, y, widht and height setters of | Marco Bubke | 2010-02-01 | 1 | -0/+6 |
| | | | | | | | | * | | Merge commit 'qt/4.6' into kinetic-declarativeui | Bjørn Erik Nilsen | 2010-01-27 | 37 | -385/+1406 |
| | | | | | | | | |\ \ | |||||
| | | | | | | | | * \ \ | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2010-01-20 | 4 | -17/+53 |
| | | | | | | | | |\ \ \ | |||||
| | | | | | | | | * \ \ \ | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2010-01-19 | 22 | -60/+169 |
| | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | * | | | | | 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 | 1118 | -1424/+1591 |
| | | | | | | | | |\ \ \ \ \ | |||||
| | | | | | | | | * | | | | | | Compile fix for QMLViewer | Thomas Hartmann | 2010-01-08 | 1 | -2/+2 |
| | | | | | | | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Aaron Kennedy | 2010-01-05 | 28 | -187/+624 |
| | | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | * \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-17 | 79 | -1048/+1613 |
| | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | * \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-10 | 34 | -392/+741 |
| | | | | | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | | | | | * | | | | | | | | | Fix crash. | Michael Brasser | 2009-12-08 | 1 | -0/+1 |
| | | | | | | | | * | | | | | | | | | Fix crash. | Michael Brasser | 2009-12-08 | 1 | -1/+1 |
| | | | | | | | | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-07 | 1 | -2/+10 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | | * \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-07 | 50 | -406/+529 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-30 | 23 | -417/+236 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-27 | 89 | -518/+912 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-19 | 110 | -784/+936 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-12 | 2 | -3/+10 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'qt/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-11-11 | 76 | -436/+746 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | | * | | | | | | | | | | | | | | | | Revert 4bf7f90a27377f439e86d6175e5e3cdebd131be0 and implement differently. | Warwick Allison | 2009-11-10 | 1 | -3/+0 |
| | | | | | | | | * | | | | | | | | | | | | | | | | Remove no-op diff to 4.6. | Warwick Allison | 2009-11-09 | 1 | -1/+0 |
| | | | | | | | | * | | | | | | | | | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-09 | 147 | -1935/+3889 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | | * | | | | | | | | | | | | | | | | | Compile... | Gunnar Sletta | 2009-11-06 | 1 | -2/+2 |
| | | | | | | | | * | | | | | | | | | | | | | | | | | Remove "to" limit on minor version. | Warwick Allison | 2009-11-05 | 1 | -0/+3 |
| | | | | | | | | * | | | | | | | | | | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-04 | 125 | -2747/+3277 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | | * | | | | | | | | | | | | | | | | | | introduce int QTextDocument::available{Undo,Redo}Steps() const; | hjk | 2009-11-03 | 3 | -0/+33 |
| | | | | | | | | * | | | | | | | | | | | | | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Aaron Kennedy | 2009-10-30 | 1 | -1/+0 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Warwick Allison | 2009-10-30 | 74 | -540/+1058 |
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | | fix merge duplication | Warwick Allison | 2009-10-29 | 1 | -1/+0 |
| | | | | | | | | * | | | | | | | | | | | | | | | | | | | | Rename QFx classes to QmlGraphics | Aaron Kennedy | 2009-10-30 | 1 | -1/+1 |
| | | | | | | | | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | |||||
| | | | | | | | | * | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of ../qt-widget-team into kinetic-declarativeui | Aaron Kennedy | 2009-10-29 | 1 | -2/+2 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-widget-team into kinet... | Aaron Kennedy | 2009-10-29 | 50 | -415/+899 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |