summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-18287-3744/+7257
|\
| * Add missing semicolons. moc was confused and positionViewAtIndex not invokable.Yann Bodson2010-03-182-2/+2
| * Use the correct base URL in resolveUriMartin Jones2010-03-181-3/+2
| * Remove timing sensitivity.Warwick Allison2010-03-181-2/+2
| * Optimize id checking.Warwick Allison2010-03-181-10/+0
| * Fix examples after 47fb07c9fdf47584ae55f3412102bbeef5576b04.Yann Bodson2010-03-187-0/+0
| * Don't use QScriptValueIterator to iterate over arrays.Bea Lam2010-03-181-4/+3
| * Skip test, to be fixed.Bea Lam2010-03-181-0/+2
| * Only release the binding once we're finished with its memoryAaron Kennedy2010-03-181-1/+1
| * Make it harder to accidentally delete a bindingAaron Kennedy2010-03-181-5/+7
| * Adjust test now that redundant contexts are not create dueWarwick Allison2010-03-181-2/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-1825-62/+73
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-1824-38/+39
| | |\
| | | * Fix tests after 47fb07c9fdf47584ae55f3412102bbeef5576b04.Michael Brasser2010-03-1824-38/+39
| | * | Don't destroy cookie jar until while someone may be using it.Martin Jones2010-03-181-24/+34
| | |/
| * | Block modifications to internal QDeclarativeContextsAaron Kennedy2010-03-182-1/+50
| |/
| * Another fix to findmae2010-03-171-3/+5
| * Improve implicit "." importmae2010-03-172-16/+28
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-17265-3662/+7109
| |\
| | * Fix auto testmae2010-03-171-8/+8
| | * Fix type lookup with urlmae2010-03-171-8/+8
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-03-17493-12162/+25145
| | |\
| | * | Fix default values on TextinputAlan Alpert2010-03-171-0/+3
| | * | Add an implicit import "." to types loaded from a local urlmae2010-03-172-4/+28
| | * | Fix crashAaron Kennedy2010-03-173-8/+9
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-176-38/+111
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-172-9/+19
| | | |\ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-1713-155/+179
| | | |\ \ \
| | | * | | | Add/delete albums in photoviewer.Yann Bodson2010-03-175-24/+95
| | | * | | | Emits itemsRemoved() in QDeclarativeListModel::remove.Yann Bodson2010-03-171-14/+16
| | * | | | | Don't use Qt3 support methods.Martin Jones2010-03-171-1/+1
| | | |_|/ / | | |/| | |
| | * | | | CrashAaron Kennedy2010-03-172-9/+19
| | | |/ / | | |/| |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-171-0/+102
| | |\ \ \
| | | * | | Readd the itemtree benchmarks for comparison purposes.Michael Brasser2010-03-171-0/+102
| | * | | | Allow enum constants as list element properties.Warwick Allison2010-03-176-6/+63
| | |/ / /
| | * | | CompileAaron Kennedy2010-03-176-5/+6
| | * | | Cleanup benchmark a littleAaron Kennedy2010-03-171-232/+96
| | |/ /
| | * | Really fix warning.Martin Jones2010-03-171-2/+2
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-175-10/+11
| | |\ \
| | | * | MouseArea works now with any QGraphicsObjectAlexis Menard2010-03-172-6/+6
| | | * | Make states test work with smaller font size.Martin Jones2010-03-172-4/+4
| | | * | Register QGraphicsWidget type.Alexis Menard2010-03-171-0/+1
| | * | | Fix warnings.Martin Jones2010-03-172-2/+2
| | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-1744-611/+860
| | |\ \
| | | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-1739-576/+827
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-17258-3490/+6750
| | | | |\ \
| | | | | * | Verbose unexpected errors.Warwick Allison2010-03-171-2/+1
| | | | | * | One url for an *unqualilfied* import is not special.Warwick Allison2010-03-171-1/+2
| | | | | * | Fix test failuresAaron Kennedy2010-03-176-6/+11
| | | | | * | Optimization: Don't unnecessarily run VMEStack element constructorsAaron Kennedy2010-03-171-4/+4