summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0914-229/+234
|\
| * Make sure WorkerScript thread is stopped on deletion. This also fixesBea Lam2010-04-092-3/+13
| * Release ListModel's worker agent on deletion.Bea Lam2010-04-092-1/+3
| * Doc fixesBea Lam2010-04-093-12/+8
| * Fix exampleBea Lam2010-04-091-7/+15
| * Example code style improvementsBea Lam2010-04-097-206/+195
* | Enable other wrapping modes.Martin Jones2010-04-098-19/+47
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-095-47/+40
|\
| * Remove use of obsolete "Script" element.Warwick Allison2010-04-094-46/+39
| * unwarnWarwick Allison2010-04-091-1/+1
* | TextEdit::wrap changed to TextEdit::wrapMode enumerationMartin Jones2010-04-0910-35/+66
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-09116-919/+444
|\ \ | |/
| * Replace "var" with "variant" in testsAaron Kennedy2010-04-092-11/+11
| * Fix test after deletion of GraphicsObjectContainer.Alexis Menard2010-04-091-23/+20
| * Text.wrap is deprecatedYann Bodson2010-04-092-17/+18
| * Fix url resolution in PropertyChanges.Michael Brasser2010-04-097-9/+85
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-092-7/+31
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-0927-714/+262
| | |\
| | * | Better reporting of extension plugin loading errors.Warwick Allison2010-04-091-7/+23
| | * | self-docWarwick Allison2010-04-091-0/+8
| * | | Replace "property var " with "property variant " in QML codeAaron Kennedy2010-04-0975-127/+127
| * | | Use variant instead of var in QMLAaron Kennedy2010-04-095-30/+11
| | |/ | |/|
| * | Some cleanup in widgets module. Deletion of GraphicsObjectContainer.Alexis Menard2010-04-0910-561/+18
| * | Straighten board linesBea Lam2010-04-091-0/+0
| * | More tutorial improvmentsBea Lam2010-04-099-131/+121
| * | Doc fixesBea Lam2010-04-093-3/+2
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-095-19/+123
|\ \ \ | |/ /
| * | Make the TextInput element nicer. It has scrolling.Alexis Menard2010-04-094-19/+121
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-0980-328/+877
| |\
| * | Verbose failure outputWarwick Allison2010-04-091-0/+2
* | | Ensure GridView content position is stable when moving items.Martin Jones2010-04-092-0/+7
| |/ |/|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-08108-552/+1308
|\ \
| * | Update visual test.Michael Brasser2010-04-089-4/+4
| * | Fix test.Michael Brasser2010-04-081-1/+1
| * | Update test following property name change.Michael Brasser2010-04-083-5/+5
| * | Tune plugin import mechanismmae2010-04-087-54/+175
| * | Fix compile warningsmae2010-04-082-2/+2
| * | Enable setting the imports directory via qt.confKai Koehne2010-04-082-0/+5
| * | Warn if the minehunt C++ plugin is not compiled.Yann Bodson2010-04-081-0/+7
| * | Add tab navigation to twitter example authentication screen.Yann Bodson2010-04-081-5/+8
| * | Don't crash when QML engine is deletedAaron Kennedy2010-04-083-3/+36
| * | Fix crash on null object assignmentAaron Kennedy2010-04-083-1/+25
| * | Fix call to saveHighScores() and restore game timer.Bea Lam2010-04-083-6/+4
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-04-08301-1013/+2210
| |\ \
| | * | Make string -> int conversion consistent in bindingsAaron Kennedy2010-04-085-0/+115
| | * | Improve static assignment to QVariant's in the int and double caseAaron Kennedy2010-04-088-7/+110
| | * | Fix warning in declarative/examples/velocityLeonardo Sobral Cunha2010-04-081-2/+6
| | * | Fix samegame4 tutorial codeLeonardo Sobral Cunha2010-04-082-12/+3
| | * | Missing fileYann Bodson2010-04-081-0/+0
| | * | Update QmlChanges for SmoothedFollowLeonardo Sobral Cunha2010-04-081-4/+12