summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-2911-83/+30
|\
| * Don't call qRegisterMetaType() in global scopeBea Lam2010-04-292-1/+1
| * Remove Component's isReady, isLoading, isError and isNull properties.Bea Lam2010-04-299-81/+28
| * Return enum property values as numbers, not QVariant valuesBea Lam2010-04-291-1/+1
* | Ensure filenames are correctly resolvedWarwick Allison2010-04-291-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-2920-922/+1241
|\ \ | |/
| * Fix typo in qdeclarativeitem's docLeonardo Sobral Cunha2010-04-291-1/+1
| * Fix path view update on startX(Y) changes in qmlLeonardo Sobral Cunha2010-04-295-1/+77
| * Suppress transient errors from bindingsAaron Kennedy2010-04-293-1/+34
| * Cleanup: Move import stuff out of the QDeclarativeEngineAaron Kennedy2010-04-2911-919/+1129
* | undebuggeryWarwick Allison2010-04-291-1/+0
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-2917-138/+251
|\ \ | |/
| * Additional Behavior test + text fixes.Michael Brasser2010-04-292-23/+58
| * Prevent Behavior from being triggered on initialization.Michael Brasser2010-04-296-2/+38
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-287-109/+151
| |\
| | * Fix references to createComponent() and createQmlObject() toBea Lam2010-04-287-109/+151
| * | Doc: Qt.MidButton -> Qt.MiddleButtonMartin Jones2010-04-282-4/+4
| |/
* | Stricter (but controllable) error reporting on Connections signal-name error....Warwick Allison2010-04-293-8/+77
* | Ignore QWS verbosity.Warwick Allison2010-04-281-0/+3
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-2884-758/+2067
|\ \ | |/
| * Compile on OSX, hopefully.Martin Jones2010-04-281-0/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-2865-551/+1100
| |\
| | * Improve border image documentation.Yann Bodson2010-04-281-11/+23
| | * Update border image examples.Yann Bodson2010-04-287-73/+98
| | * Doc - micro fix.Martin Jones2010-04-281-1/+0
| | * Fix QML default property HTML generation... again.Martin Jones2010-04-281-8/+0
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-284-13/+73
| | |\
| | | * Bunch of doc fixes.Alexis Menard2010-04-284-13/+73
| | * | Alpha needs to be part of rectangle cache key.Martin Jones2010-04-281-4/+6
| | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-2814-330/+503
| | |\
| | | * Code cleanupAaron Kennedy2010-04-281-235/+238
| | | * Remove unused variableAaron Kennedy2010-04-282-4/+1
| | | * Don't test snippets with C++ componentsBea Lam2010-04-281-0/+2
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-281-29/+43
| | | |\
| | | * | Don't unnecessarily regenerate property cacheAaron Kennedy2010-04-286-32/+77
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-2830-29/+73
| | | |\ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-2810-56/+264
| | | |\ \ \
| | | * | | | BenchmarkAaron Kennedy2010-04-283-0/+166
| | | * | | | Small cleanupsAaron Kennedy2010-04-282-59/+19
| | * | | | | Doc: overview for ImageMartin Jones2010-04-281-1/+21
| | | |_|_|/ | | |/| | |
| | * | | | Share Rectangle pixmap caches between items.Martin Jones2010-04-281-29/+43
| | | |_|/ | | |/| |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-2825-19/+19
| | |\ \ \
| | | * | | Move snippets to correct locationBea Lam2010-04-2825-19/+19
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-281-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Make compileBea Lam2010-04-281-1/+1
| | | | |/ | | | |/|
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-2810-56/+264
| | |\ \ \ | | | |/ /
| | | * | Doc fixesBea Lam2010-04-287-55/+90
| | | * | Delete canvas after use in positioner unit testsJoona Petrell2010-04-281-0/+28
| | | * | Setting conflicting anchors to items inside positioners should print a warningJoona Petrell2010-04-283-1/+146
| | | |/
| | * | Fix snap at view boundaries with overshoot on.Martin Jones2010-04-282-8/+14