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 System2010-05-2117-76/+181
|\
| * changes-4.7.0 updatedJoerg Bornemann2010-05-211-1/+1
| * Revert "Deselect the current selection when the QItemSelectionModel::model is...Olivier Goffart2010-05-214-67/+9
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-2120-84/+247
| |\
| | * 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-2019-84/+245
| | |\
| | | * 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-204-9/+67
| | | * Autotest fix on macosxThierry Bastian2010-05-201-1/+1
| | | * 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-205-60/+160
| | | |\
| | | | * improve Unicode Normalization autotestRitt Konstantin2010-05-201-28/+57
| | | | * more subtests for QCharRitt Konstantin2010-05-201-0/+19
| | | | * 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-192-11/+55
| | | | |\
| | | | | * Fixed an assert in QMenuThierry Bastian2010-05-192-11/+55
* | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-217-16/+140
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-05-217-16/+140
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-201-9/+81
| | |\ \ \ \ \
| | | * | | | | My 4.6.3 changes.Trond Kjernåsen2010-05-201-16/+73
| | | * | | | | Added my 4.6.3 changes.Kim Motoyoshi Kalland2010-05-201-1/+4
| | | * | | | | My 4.6.3 changes.Samuel Rødal2010-05-201-0/+12
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-201-2/+19
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Add my 4.6.3 changesKent Hansen2010-05-201-2/+19
| | |/ / / / /
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-203-9/+43
| | |\ \ \ \ \
| | | * | | | | Fix WebKit version dependency in pkg filesSimon Hausmann2010-05-201-1/+8
| | | * | | | | Add support for including module specific .pri files as part of qt.prf handlingSimon Hausmann2010-05-201-0/+3
| | | * | | | | My changelog entries for 4.6.3Denis Dzyubenko2010-05-201-2/+9
| | | * | | | | Add my changes to the 4.6.3 changes logEskil Abrahamsen Blomfeldt2010-05-201-2/+14
| | | * | | | | my changelog for 4.6.3Peter Hartmann2010-05-201-4/+9
| | * | | | | | 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
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-193-0/+3
| | |\ \ \ \ \ \
| | | * | | | | | fix qmake -project once moreOswald Buddenhagen2010-05-183-0/+3
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2011-1/+81
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Make dynamicscene example embeddeable in another graphics sceneAlan Alpert2010-05-201-1/+1
| * | | | | | | | Some minor example fixesAlan Alpert2010-05-2010-0/+80
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2013-13/+64
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | / / / | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Update docs with correct property nameAlan Alpert2010-05-201-1/+1
| * | | | | | | Fix incorrect mergeAlan Alpert2010-05-201-1/+1
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-20210-3892/+4443
| |\ \ \ \ \ \ \
| | * | | | | | | Work around rendering bug in Rectangle.Michael Brasser2010-05-201-1/+3
| | * | | | | | | Remove warnings.Warwick Allison2010-05-202-3/+0
| | * | | | | | | Test e75088323ae15604139ddfd66b85cc3b8d43abebWarwick Allison2010-05-202-0/+6
| | * | | | | | | Add XmlListModel::errorString()Bea Lam2010-05-203-2/+37
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-195-9/+27
| |\ \ \ \ \ \ \ \