summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \
| * | | | | | | Fix dynamicscene exampleAlan Alpert2010-05-193-5/+16
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-19590-58544/+17061
| |\ \ \ \ \ \ \
| * | | | | | | | Update old keyword in docsAlan Alpert2010-05-191-1/+1
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-20179-992/+3327
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | 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
| * | | | | | | | Improve error messages when tests fail.Warwick Allison2010-05-201-14/+15
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-206-8/+178
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Stop highlight animators for highlightFollowsCurrentItem: falseMartin Jones2010-05-206-8/+178
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-2021-93/+192
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Rename Component::errorsString() -> errorString() (and also forBea Lam2010-05-2012-22/+24
| | * | | | | | | | Fixes for docs, example codeBea Lam2010-05-209-71/+168
| * | | | | | | | | Ensure valuetype enums can be assigned from JSAaron Kennedy2010-05-202-0/+10
| * | | | | | | | | Improve testcaseAaron Kennedy2010-05-202-1/+11
| |/ / / / / / / /
| * | | | | | | | Make test more stableAaron Kennedy2010-05-201-2/+3
| * | | | | | | | Autotest (XFAIL) for QTBUG-10822Aaron Kennedy2010-05-202-0/+22
| * | | | | | | | Add return value for resolveTypeInNamespaceAaron Kennedy2010-05-202-3/+3
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-203-0/+21
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-201-0/+1
| | |\ \ \ \ \ \ \ \