summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-1935-292/+384
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-1817-147/+225
| |\
| | * Fix bug when resetting QSortFilterProxyModelStephen Kelly2010-03-182-2/+89
| | * Fix the QSplitter not showing correctly in QGraphicsViewThierry Bastian2010-03-181-20/+15
| | * Remove ; after Q_PROPERTY declarationThierry Bastian2010-03-187-90/+90
| | * Fix compilation issues of autotest on solarisThierry Bastian2010-03-189-13/+13
| | * fix a crash when registering 2 metatype name for the same actual typeThierry Bastian2010-03-181-11/+7
| | * Fixed problem in painting of QTreeViewThierry Bastian2010-03-181-11/+11
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-1818-146/+160
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-1818-146/+160
| | |\ \
| | | * | Replace AspectRatioMode enum from QVideoWidget with Qt::AspectRatioMode.Andrew den Exter2010-03-1818-146/+160
* | | | | Fixed install of qml imports when doing a vcproj build.Rohan McGovern2010-03-191-1/+1
* | | | | Disable tests temporarilyBea Lam2010-03-191-0/+3
* | | | | Remove warningsYann Bodson2010-03-182-29/+31
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-18287-3744/+7257
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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
| | | |/ / / / /