summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-21319-1285/+9284
|\
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-214-33/+26
| |\
| | * Compile without Qt3 support.Yann Bodson2010-04-211-25/+25
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-2113-40/+106
| | |\
| | * | Ensure workerscript.qml works (autotested).Warwick Allison2010-04-211-0/+1
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-2173-75/+5612
| | |\ \
| | * | | remove debugsWarwick Allison2010-04-212-8/+0
| * | | | Update test files to new syntaxAlan Alpert2010-04-212-5/+5
| | |_|/ | |/| |
| * | | Update strings in testAlan Alpert2010-04-211-2/+2
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-21465-3451/+34188
| |\ \ \ | | | |/ | | |/|
| | * | More focus example cleanup.Yann Bodson2010-04-212-33/+31
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-2135-55/+5565
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-2118-1/+5185
| | | |\ \
| | | | * | Emit released and hoveredChanged in MouseArea when a UngrabMouse is receivedLeonardo Sobral Cunha2010-04-2118-1/+5185
| | | | |/
| | | * | Add hasModelChildren property to delegates with QAbstractItemModel model type.Martin Jones2010-04-217-41/+215
| | | |/
| | | * Balance grid items for larger displays.Warwick Allison2010-04-211-1/+2
| | | * Cleanup declarative focus example.Yann Bodson2010-04-212-7/+2
| | | * Add forceFocus method to QDeclarativeItem.Yann Bodson2010-04-217-5/+161
| | * | AutotestsAaron Kennedy2010-04-2142-0/+163
| | * | AutotestAaron Kennedy2010-04-215-0/+18
| | |/
| | * Don't allow properties in Component elementsAaron Kennedy2010-04-218-0/+34
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-2118-317/+363
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-04-211-1/+3
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-2168-466/+634
| | | | |\
| | | | * | Fix crash.Warwick Allison2010-04-211-1/+3
| | | * | | Ignore message in QDeclarativeLoader test.Yann Bodson2010-04-211-3/+2
| | | | |/ | | | |/|
| | | * | Fix qmlvisual/animation/parentAnimation autotestLeonardo Sobral Cunha2010-04-211-1/+4
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-212-199/+182
| | | |\ \
| | | | * | Remove \internal from QDeclarativePropertyValueSource. It should beBea Lam2010-04-211-2/+4
| | | | * | Revert structural changes to extending.qdoc made inBea Lam2010-04-211-197/+178
| | | * | | delete the viewer before calling exit(). Ensures correct cleanup.Martin Jones2010-04-211-26/+28
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-216-20/+20
| | | |\ \ \ | | | | |/ /
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-04-215-11/+13
| | | | |\ \
| | | | * | | Fix following qdoc changesBea Lam2010-04-211-16/+0
| | | | * | | Fix doc linksBea Lam2010-04-212-3/+4
| | | | * | | Ignore warningsBea Lam2010-04-214-1/+16
| | | * | | | Fix highlight position with StrictlyEnforceRange and range greater than item ...Martin Jones2010-04-214-63/+118
| | | | |/ / | | | |/| |
| | | * | | Make logger widget thread safe.Martin Jones2010-04-213-4/+6
| | * | | | Fix crash when QDeclarativeInfo objects are copiedAaron Kennedy2010-04-212-81/+78
| | |/ / /
| | * | | Use different ports to avoid clashes in parallel testing.Yann Bodson2010-04-212-5/+5
| | |/ /
| | * | Improve docs and examples for Extending QML in C++Bea Lam2010-04-2151-493/+533
| | * | Make property value source examples workBea Lam2010-04-213-3/+3
| | * | Visual test fix.Michael Brasser2010-04-212-2/+3
| | * | License headersAaron Kennedy2010-04-203-1/+83
| | |/
| | * Show command line help / qml runtime output in GUIKai Koehne2010-04-205-11/+114
| | * Add declarative demos to doc.Yann Bodson2010-04-2011-0/+250
| | * CleanupYann Bodson2010-04-2016-99/+0
| | * docWarwick Allison2010-04-206-14/+27
| | * doc typoWarwick Allison2010-04-201-2/+2
| | * Fix API call for multiple tags.Warwick Allison2010-04-201-1/+6