summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update examples autotest to use the runtime directlyAaron Kennedy2010-04-154-96/+42
* Support valuetypes as method return valuesAaron Kennedy2010-04-159-41/+133
* Compile without Qt3 support.Yann Bodson2010-04-151-1/+1
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-151-0/+20
|\
| * DocAaron Kennedy2010-04-151-0/+20
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-1518-104/+178
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-1556-1467/+327
| |\
| * | Add Component.onDestruction attached propertyAaron Kennedy2010-04-1517-99/+171
| * | CommentsAaron Kennedy2010-04-151-1/+3
| * | Remove unused parameterAaron Kennedy2010-04-153-4/+4
* | | Simplify dynamic resource loading to avoid cluttering Text API.Warwick Allison2010-04-153-13/+10
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-1524-1436/+130
|\ \ \ | | |/ | |/|
| * | Visual test updates.Michael Brasser2010-04-1521-1422/+109
| * | Rename section so that it's not linked to by references to "JavaScript"Bea Lam2010-04-151-1/+1
| * | Doc improvementsBea Lam2010-04-152-13/+20
* | | Use qmlInfo for image loading errors, not qWarning().Warwick Allison2010-04-1511-44/+101
|/ /
* | Correctly resolve, and load, IMG tags in Text element.Warwick Allison2010-04-1510-10/+176
* | Rename "sql" test so autotester doesn't get confused.Warwick Allison2010-04-1520-20/+20
* | Should work now, don't skip.Warwick Allison2010-04-151-1/+0
* | ignore autotester logsWarwick Allison2010-04-151-0/+1
|/
* Rename the ridiculous QDeclarativeDeclarativeData -> QDeclarativeDataAaron Kennedy2010-04-1521-80/+80
* Rename QDeclarativeData -> QAbstractDeclarativeDataAaron Kennedy2010-04-156-17/+17
* Fix typoBea Lam2010-04-151-1/+1
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-158-51/+319
|\
| * Improve integration docs and add examplesBea Lam2010-04-158-51/+319
* | Add flow property to Grid, adding TopToBottom mode.Martin Jones2010-04-154-43/+185
|/
* Add QML object destruction hookAaron Kennedy2010-04-152-2/+13
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-155-3/+36
|\
| * Make sure richtext wraps correctly with a fixed height set.Martin Jones2010-04-152-1/+21
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-151-2/+2
| |\
| | * Fix localFont path in fonts example.Yann Bodson2010-04-151-2/+2
| * | Output script errors in ScriptAction and StateChangeScriptMartin Jones2010-04-152-0/+13
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-14134-1266/+2184
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-1410-70/+259
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-14315-2652/+4612
| | |\
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-1410-70/+259
| | |\ \
| | | * | Phonon MMF: fixed typo in trace statementGareth Stockwell2010-04-141-1/+1
| | | * | Update to def files for 4.7.0-beta1Shane Kearns2010-04-148-65/+234
| | | * | Fixed installer_sis target for 4.7Miikka Heikkinen2010-04-141-4/+24
| * | | | Don't create delegates when destroying view.Martin Jones2010-04-141-1/+4
| | |_|/ | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-144-6/+19
| |\ \ \
| | * | | Updates to the module documentationmae2010-04-143-4/+17
| * | | | Add QML documentation for validatorsAlan Alpert2010-04-141-9/+70
| |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-04-14118-1181/+1833
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-1493-1090/+1616
| | |\ \
| | | * | Revert "Removed double setting of _WIN32_WINNT"Olivier Goffart2010-04-133-8/+25
| | | * | Revert "removed a few warnings on wince builds"Paul Olav Tvete2010-04-132-5/+5
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-1397-1119/+1628
| | | |\ \
| | | | * | removed a few warnings on wince buildsThierry Bastian2010-04-132-5/+5
| | | | * | Removed double setting of _WIN32_WINNTThierry Bastian2010-04-133-25/+8