summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix typoAlan Alpert2010-05-241-1/+1
* Make dynamicscene example embeddeable in another graphics sceneAlan Alpert2010-05-201-1/+1
* Some minor example fixesAlan Alpert2010-05-2010-0/+80
* 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
| * 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
| | |\
| | * | Fix test. Missed files.Warwick Allison2010-05-203-0/+21
| * | | Fix testAaron Kennedy2010-05-201-1/+0
| | |/ | |/|
| * | Missing breakAaron Kennedy2010-05-201-0/+1
| |/
| * Create overview page for examples for Extending QML in C++Bea Lam2010-05-203-4/+27
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-19148-860/+2840
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-19112-3475/+3352
| |\ \
| | * | Added default countries for Mongolian and Nepali.Denis Dzyubenko2010-05-193-31/+43
| | * | Updated tst_qlocale autotest.Denis Dzyubenko2010-05-191-1/+88
| | * | Updated the 4.7.0 change log with my changes.Kim Motoyoshi Kalland2010-05-191-0/+16
| | * | Merge remote branch 'origin/4.7' into HEADOlivier Goffart2010-05-19517-57904/+15918
| | |\ \
| | * | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-05-194-6/+40
| | * | | doc: Fixed many broken links.Martin Smith2010-05-196-19/+30
| | * | | doc: Fixed many broken links.Martin Smith2010-05-1920-50/+50
| | * | | doc: Fixed many broken links.Martin Smith2010-05-1911-64/+49
| | * | | qdoc: Set back to 3 cols for class list; we have a scrollbar now.Martin Smith2010-05-191-1/+1
| | * | | Fix build on Mac OS X and Windows.Aaron McCarthy2010-05-194-13/+13
| | * | | Remove obsolete and broken qvfb skins.Jason McDonald2010-05-1925-437/+4
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-1947-2869/+3034
| | |\ \ \
| | | * | | Only setup ICD test data when ICD is enabled.Aaron McCarthy2010-05-193-12/+12
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-05-1813-5/+71
| | | |\ \ \
| | | | * | | Make sure cursorPositionChanged is emitted when doing undo/redoThorbjørn Lindeijer2010-05-181-0/+8
| | | | * | | Some more 4.7.0 changesJens Bache-Wiig2010-05-181-2/+17
| | | | * | | Fix cosmetic issue in designer filter editsJens Bache-Wiig2010-05-181-1/+1
| | | | * | | Doc: Adding support for IE 6, 7 and 8Morten Engvoldsen2010-05-1810-2/+45