summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \ \ \
| | * | | | | 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/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-19148-860/+2840
| |\ \ \ | | | |/ | | |/|
| | * | Search for QML import libraries also in application directoryKai Koehne2010-05-192-8/+16
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-19146-852/+2824
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-05-1927-211/+698
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-195-163/+242
| | | | |\ \
| | | | | * | Rename qml executable to qmlviewerKai Koehne2010-05-193-6/+8
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-199-162/+439
| | | | | |\ \
| | | | | | * | Introduce a threaded interpreter for QML binding bytecodeAaron Kennedy2010-05-191-156/+233
| | | | | * | | Don't crash if the target parent is destroyed.Martin Jones2010-05-191-1/+1
| | | | * | | | Disable mouse-based selection in TextInput/TextEditWarwick Allison2010-05-197-10/+137
| | | | | |/ / | | | | |/| |
| | | | * | | Bug moved.Warwick Allison2010-05-191-1/+1
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1979-127/+349
| | | | |\ \ \ | | | | | |/ /
| | | | | * | When changing Loader source, remove old item from scene immediately.Martin Jones2010-05-191-2/+6