summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Fix warningsOlivier Goffart2010-05-212-3/+4
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-2114-184/+118
|\
| * Fixes QGraphicsItem::scroll issuesBjørn Erik Nilsen2010-05-211-140/+68
| * Fixes wrong QGraphicsItemCache::boundingRect.Bjørn Erik Nilsen2010-05-211-10/+10
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-2114-47/+50
| |\
| | * Revert "Deselect the current selection when the QItemSelectionModel::model is...Olivier Goffart2010-05-213-24/+5
| | * add missing includeOswald Buddenhagen2010-05-201-0/+2
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-2016-52/+72
| | |\
| * | \ Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-211-2/+0
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-05-211-2/+0
| | |\ \
| | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-201-2/+0
| | | |\ \
| | | | * | Switch Symbian^3 QCursor implementation back to 5.0 wayShane Kearns2010-05-201-2/+0
| * | | | | Update docs with correct property nameAlan Alpert2010-05-201-1/+1
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-2075-2385/+2678
| |\ \ \ \ \
| | * | | | | Work around rendering bug in Rectangle.Michael Brasser2010-05-201-1/+3
| | * | | | | Remove warnings.Warwick Allison2010-05-202-3/+0
| | * | | | | Add XmlListModel::errorString()Bea Lam2010-05-202-2/+28
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-195-9/+27
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-19374-47013/+2196
| |\ \ \ \ \ \ \
| * | | | | | | | Update old keyword in docsAlan Alpert2010-05-191-1/+1
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-20118-2855/+4135
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Fix crash when using fonts in non-gui QApplicationEskil Abrahamsen Blomfeldt2010-05-201-2/+5
| * | | | | | | | Deselect the current selection when the QItemSelectionModel::model is reset.Stephen Kelly2010-05-203-5/+24
| * | | | | | | | Compile with gcc 4.0.1Olivier Goffart2010-05-209-13/+13
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-203-32/+30
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | nano optimization of canonicalOrderHelper()Ritt Konstantin2010-05-201-7/+13
| | * | | | | | | fix canonicalOrderHelper() for some corner caseRitt Konstantin2010-05-201-4/+4
| | * | | | | | | use new QChar::requiresSurrogates() instead of hardcoded valueRitt Konstantin2010-05-201-5/+5
| | * | | | | | | prevent fake normalizationRitt Konstantin2010-05-201-2/+4
| | * | | | | | | prefer QChar::*surrogate() over hardcoded valuesRitt Konstantin2010-05-201-3/+3
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-191-11/+1
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Be consistent in conversion from string (eg. color, int rounding).Warwick Allison2010-05-201-11/+14
| * | | | | | | | Simplify code to make next change clearer.Warwick Allison2010-05-201-14/+9
| * | | | | | | | Stop warnings.Warwick Allison2010-05-202-11/+11
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-202-8/+24
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Stop highlight animators for highlightFollowsCurrentItem: falseMartin Jones2010-05-202-8/+24
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-205-18/+21
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Rename Component::errorsString() -> errorString() (and also forBea Lam2010-05-203-7/+10
| | * | | | | | | | Fixes for docs, example codeBea Lam2010-05-202-11/+11
| * | | | | | | | | Ensure valuetype enums can be assigned from JSAaron Kennedy2010-05-201-0/+2
| |/ / / / / / / /
| * | | | | | | | Add return value for resolveTypeInNamespaceAaron Kennedy2010-05-202-3/+3
| * | | | | | | | Missing breakAaron Kennedy2010-05-201-0/+1
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1940-444/+1427
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | / / / / | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1940-444/+1427
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Search for QML import libraries also in application directoryKai Koehne2010-05-192-8/+16
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1938-436/+1411
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-05-1913-176/+386
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-192-157/+234
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-194-161/+271
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | Introduce a threaded interpreter for QML binding bytecodeAaron Kennedy2010-05-191-156/+233