summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls.Warwick Allison2010-02-23113-649/+984
* Make executable outside dir.Warwick Allison2010-02-231-3/+3
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2310-51/+127
|\
| * Fix but in QmlMetaProperty assignment operatorAaron Kennedy2010-02-232-0/+45
| * Cleanup warnings in qmlmetaproperty testAaron Kennedy2010-02-231-11/+11
| * Rename qmllist autotest to qmllistreferenceAaron Kennedy2010-02-236-23/+23
| * Small QmlMetaProperty code cleanupAaron Kennedy2010-02-231-16/+16
| * Better support modelData for object list models.Michael Brasser2010-02-231-1/+1
| * Add documentation on QMLs memory management assumptionsAaron Kennedy2010-02-231-0/+31
* | Work.Warwick Allison2010-02-231-0/+5
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-231097-72939/+62188
|\
| * Make uncached text painting work for richtext too.Martin Jones2010-02-232-3/+12
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-225-0/+5
| |\
| | * Updated based on change to transformOrignNigel Hietala2010-02-225-0/+5
| * | Documentation UpdateAlan Alpert2010-02-221-1/+5
| |/
| * Doc fixAlan Alpert2010-02-221-1/+1
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-22947-72470/+61700
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-22268-2665/+2384
| | |\
| | | * Replace QmlList* and QList* support with a single QmlListProperty typeAaron Kennedy2010-02-22113-2218/+1931
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2214-27/+157
| | |\ \
| | | * | Documentation fixes.Justin McPherson2010-02-227-18/+22
| | | * | Add a qRegisterQmlElements function to QtMultimediaJustin McPherson2010-02-227-9/+135
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-221-1/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-211-1/+1
| | | |\ \
| | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-211-1/+1
| | | | |\ \
| | | | | * | QtMultimedia: Fix compilation of qml/qsoundeffect_pulse on 64 bit.Daniel Molkentin2010-02-211-1/+1
| | * | | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-2117-553/+204
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Revert "Factored readRegistryKey implementation out of qmake"Thiago Macieira2010-02-219-258/+100
| | | * | | | Revert "Factored epocRoot implementation out of qmake"Thiago Macieira2010-02-2113-297/+106
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-21302-68221/+34221
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-20302-68221/+34221
| | | |\ \ \ \ | | |/ / / / /
| | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-02-20356-6032/+7175
| | | |\ \ \ \
| | | | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-20302-68220/+34223
| | | | |\ \ \ \
| | | * | | | | | Compile fix for symbianaavit2010-02-201-5/+2
| | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge branch 'rtiff392'aavit2010-02-20170-62706/+9373
| | | |\ \ \ \ \
| | | | * | | | | license doc updated for libtiff 3.9.2aavit2010-02-161-39/+78
| | | | * | | | | Our configuration and build modifications to libtiffaavit2010-02-166-1/+454
| | | | * | | | | Add libtiff 3.9.2aavit2010-02-16209-0/+68942
| | | | * | | | | Delete libtiff 3.8.2aavit2010-02-11243-122767/+0
| | | * | | | | | Merge branch 'rjpeg8'aavit2010-02-20133-5520/+24856
| | | |\ \ \ \ \ \
| | | | * | | | | | Update license doc, .pro file and qjpeghandler for libjpeg 8aavit2010-02-163-12/+23
| | | | * | | | | | Our configuration and build modifications to libjpegaavit2010-02-162-2/+53
| | | | * | | | | | Add libjpeg 8aavit2010-02-16137-0/+53170
| | | | * | | | | | Delete libjpeg 6baavit2010-02-1690-33896/+0
| | * | | | | | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-20488-1815/+24680
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | / / / | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Assistant: Remove 'namespace qt' from new files in 4.7Thiago Macieira2010-02-203-6/+0
| | | * | | | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-20485-1809/+24680
| | | |\ \ \ \ \ \ | | |/ / / / / / /
| | | * | | | | | Doc: these files are NOT part of the test suite of the Qt toolkitThiago Macieira2010-02-2046-46/+46
| | | * | | | | | Autotest: make the licenseCheck test also check .qdoc filesThiago Macieira2010-02-201-0/+12
| | | * | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-20782-16228/+102444
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |