summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-093-1/+16
|\
| * Make sure WorkerScript thread is stopped on deletion. This also fixesBea Lam2010-04-091-0/+13
| * Release ListModel's worker agent on deletion.Bea Lam2010-04-092-1/+3
* | Enable other wrapping modes.Martin Jones2010-04-094-15/+18
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-091-1/+1
|\
| * unwarnWarwick Allison2010-04-091-1/+1
* | TextEdit::wrap changed to TextEdit::wrapMode enumerationMartin Jones2010-04-095-26/+57
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0916-578/+54
|\ \ | |/
| * Fix url resolution in PropertyChanges.Michael Brasser2010-04-093-9/+18
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-091-7/+23
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-0912-560/+100
| | |\
| | * | Better reporting of extension plugin loading errors.Warwick Allison2010-04-091-7/+23
| * | | Use variant instead of var in QMLAaron Kennedy2010-04-093-21/+10
| | |/ | |/|
| * | Some cleanup in widgets module. Deletion of GraphicsObjectContainer.Alexis Menard2010-04-099-541/+3
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-093-19/+97
|\ \ \ | |/ /
| * | Make the TextInput element nicer. It has scrolling.Alexis Menard2010-04-093-19/+97
| |/
* | Ensure GridView content position is stable when moving items.Martin Jones2010-04-091-0/+2
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0829-173/+381
|\
| * Tune plugin import mechanismmae2010-04-083-35/+120
| * Fix compile warningsmae2010-04-082-2/+2
| * Enable setting the imports directory via qt.confKai Koehne2010-04-081-0/+4
| * Don't crash when QML engine is deletedAaron Kennedy2010-04-081-3/+2
| * Fix crash on null object assignmentAaron Kennedy2010-04-081-1/+2
| * Make string -> int conversion consistent in bindingsAaron Kennedy2010-04-081-0/+4
| * Improve static assignment to QVariant's in the int and double caseAaron Kennedy2010-04-085-7/+44
| * Update QmlChanges for SmoothedFollowLeonardo Sobral Cunha2010-04-081-4/+12
| * Renamed 'source' property from SpringFollow to 'to'Leonardo Sobral Cunha2010-04-082-26/+35
| * Make script and binding assignments identical for list propertiesAaron Kennedy2010-04-081-1/+5
| * Fix qdeclarativeecmascript::arrayExpression() testAaron Kennedy2010-04-081-1/+1
| * Cleanup handling of errors in bindings and scriptsAaron Kennedy2010-04-0815-96/+148
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-0816-23/+448
| |\
| * | Fix AnimatedImage for remote image test. Fix and test sourceSize property.Warwick Allison2010-04-083-2/+7
* | | Calculate GridView columns regardless of whether we have a populated modelMartin Jones2010-04-081-1/+1
* | | Add highlightMoveDuration to views.Martin Jones2010-04-087-8/+131
| |/ |/|
* | Add SmoothedFollow element to qmlLeonardo Sobral Cunha2010-04-084-0/+416
* | Tracking the velocity when restarting SmoothedAnimationLeonardo Sobral Cunha2010-04-081-0/+2
* | Fix doc of qml's SmoothedAnimationLeonardo Sobral Cunha2010-04-081-9/+10
* | Refactor in smoothedanimation, removed unneeded codeLeonardo Sobral Cunha2010-04-082-6/+1
* | Do not create a QScriptValue for an object being deletedAaron Kennedy2010-04-081-0/+3
* | Replace "import Qt 4.6" with "import Qt 4.7"Michael Brasser2010-04-087-7/+7
* | Don't optimized extended type constructionAaron Kennedy2010-04-083-1/+9
|/
* Correctly handle shutdown order in the presence of QWidgetsAaron Kennedy2010-04-081-1/+1
* Initialize QDeclarativeData even when not using a QDeclarativeEngineAaron Kennedy2010-04-082-5/+14
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-085-25/+53
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-088-37/+38
| |\
| * | Replace Text::wrap property with Text::wrapMode enumeration.Martin Jones2010-04-085-25/+53
* | | Fix location of error message.Warwick Allison2010-04-081-2/+2
| |/ |/|
* | Revert "Add QListModelInterface::modelReset() signal and emit this in"Bea Lam2010-04-085-23/+12
* | Prevent Behavior from being triggered on initialization.Michael Brasser2010-04-081-12/+10
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-084-11/+30
|\ \ | |/