summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-292-6/+9
|\
| * Fix crash in QDeclarativePropertyMap.Michael Brasser2010-03-292-6/+9
* | Remove total wrongness.Warwick Allison2010-03-291-1/+0
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-297-47/+443
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-295-18/+27
| |\
| | * Fix memory leak and clean up deletion.Bea Lam2010-03-291-8/+5
| | * Don't emit QDeclarativePropertyMap::valueChanged() before the value hasMichael Brasser2010-03-294-10/+22
| * | Optimization: Don't use QVariant in QDeclarativeVMEMetaObjectAaron Kennedy2010-03-292-29/+416
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-294-83/+105
|\ \ | |/
| * Cleanup.Michael Brasser2010-03-282-30/+8
| * Don't set status to Ready until model has been created (currently thisBea Lam2010-03-282-53/+97
* | Add importPathList, mainly for doc purposes.Warwick Allison2010-03-292-10/+25
|/
* Source resizing for QDeclarativeImageProvider too.Warwick Allison2010-03-285-6/+12
* tyopWarwick Allison2010-03-281-1/+1
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-26110-1140/+3033
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-26110-1140/+3033
| |\
| | * Recompute the source location of regexp literals.Roberto Raggi2010-03-262-2/+14
| | * Adds a way to clear the state list property in QDeclarativeStateGroupKai Koehne2010-03-261-1/+13
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-264-57/+281
| | |\
| | | * Added highlight ranges/modes to PathViewMartin Jones2010-03-264-57/+281
| | * | I've been told this fixes compilation on windows.Alan Alpert2010-03-261-1/+1
| | * | Doc AugmentationAlan Alpert2010-03-261-1/+3
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-26204-3495/+8821
| | |\ \ | | | |/
| | | * Use QThread IdlePriority rather than linux platform code.Martin Jones2010-03-261-14/+1
| | | * Test and fix order of transform application.Warwick Allison2010-03-265-37/+26
| | | * Fix namespace.Warwick Allison2010-03-261-1/+3
| | | * Simple case, no size returned.Warwick Allison2010-03-261-1/+1
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-261-4/+0
| | | |\
| | | | * QDeclarativeItem don't need to emit childrenChanged anymore.Alexis Menard2010-03-261-4/+0
| | | * | sourceWidth/sourceHeight -> sourceSizeWarwick Allison2010-03-264-47/+24
| | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-2610-18/+64
| | | |\
| | | | * Do not call parent implementation if we accept the keyPressEvent in GridView ...Yann Bodson2010-03-262-6/+6
| | | | * Remove Q prefix from the validators.Michael Brasser2010-03-263-11/+13
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-264-0/+44
| | | | |\
| | | | | * Add Symbian deploy section for qml import pluginsJoona Petrell2010-03-264-0/+44
| | | | * | Really fix qMin() parameter types.Martin Jones2010-03-261-1/+1
| | | | |/
| | | * | Control of image rendered size (esp. SVG).Warwick Allison2010-03-2612-78/+514
| | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-262-0/+167
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-26183-3430/+8151
| | | | |\
| | | | * | Add missing files from 72599ca45c416f2f0a9654412c14a148ca3d728cAaron Kennedy2010-03-262-0/+167
| | | * | | Document Particles module import.Martin Jones2010-03-261-0/+5
| | | | |/ | | | |/|
| | | * | Remove some Script {} docsMartin Jones2010-03-254-105/+12
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-254-27/+9
| | | |\ \
| | | | * | Fix where data() is called before xml is loaded. Also add status tests.Bea Lam2010-03-251-2/+4
| | | | * | Clean upBea Lam2010-03-251-20/+0
| | | | * | Remove int parameter from ListModel countChanged() to be consistentBea Lam2010-03-253-5/+5
| | | * | | Ensure both qMin() parameters are the same type.Martin Jones2010-03-251-1/+1
| | | |/ /
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-25173-3288/+8120
| | | |\ \
| | * | \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-252-9/+9
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2583-900/+2047
| | | |\ \ \ | | | | | |/ | | | | |/|