summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-07-01393-2850/+5894
|\
| * doc fixBea Lam2010-07-011-2/+4
| * Add abstractitemmodel example, and fix some model docsBea Lam2010-07-0112-127/+469
| * docs - quote code with snippets, other improvementsBea Lam2010-07-019-109/+116
| * Fix webkit import for webkit tests.Martin Jones2010-07-017-7/+7
| * Remove qmlviewer dependency on QDeclarativeTimerMartin Jones2010-07-013-21/+23
| * Remove a few more unnecessary exports.Martin Jones2010-07-014-6/+6
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-0112-687/+767
| |\
| | * Add additional text layout benchmarks.Michael Brasser2010-07-011-7/+51
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-01155-979/+2978
| | |\
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-308-678/+701
| | |\ \
| | | * | Reformat whitespace according to coding styleMark Brand2010-06-306-676/+676
| | | * | QGraphicsView: Handle wheelEvents correctly with Qt::Popup widgets.Jocelyn Turcotte2010-06-301-0/+19
| | | * | QGraphicsProxyWidget: Fixes QComboBox popup closing issue.Jocelyn Turcotte2010-06-302-2/+6
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-303-2/+15
| | |\ \ \
| | | * | | Fix invalid bookmark in anomaly demoMiikka Heikkinen2010-06-302-2/+1
| | | * | | Fixed pre-built resources deployment in SymbianMiikka Heikkinen2010-06-301-0/+14
| * | | | | Don't export declarative private classesMartin Jones2010-07-0135-52/+52
| | |_|_|/ | |/| | |
| * | | | Don't access uninitialized value.Martin Jones2010-06-301-10/+9
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-30155-969/+2969
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Added SET_BINDING message to QDeclarative debugger protocolLasse Holmstedt2010-06-305-7/+112
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-301-2/+3
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-30148-934/+2800
| | | |\ \ \ | | | | |/ / | | | |/| |
| | * | | | Add ListView.nextSection attached propertyMartin Jones2010-06-305-10/+55
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-3028-181/+405
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Docs - add more links to relevant examplesBea Lam2010-06-3024-15/+59
| | | * | | Rewrite runtime & qmlviewer docs and emphasise that qmlviewer shouldn'tBea Lam2010-06-303-165/+345
| | | * | | Indicate default sizing option in qmlviewerBea Lam2010-06-301-1/+1
| | * | | | Remove the old font.outline documentationMartin Jones2010-06-303-18/+2
| | |/ / /
| | * | | Plug QdeclarativePixmapCache canceled request leak.Martin Jones2010-06-301-27/+29
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-30124-726/+2366
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-29124-726/+2366
| | | |\ \ \
| | | | * | | update qml.qch to version 4.7mae2010-06-291-2/+2
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-29123-724/+2364
| | | | |\ \ \
| | | | | * | | Undefined is undefined, and now qml warns about itmae2010-06-291-3/+3
| | | | | * | | Fix so window will resize with the root object (broken byBea Lam2010-06-291-0/+1
| | | | | * | | Avoid duplicate code for testing initial sizesBea Lam2010-06-291-21/+15
| | | | | * | | Remove an unnecessary connect() in TextInputMartin Jones2010-06-291-3/+1
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-2966-401/+810
| | | | | |\ \ \
| | | | | | * | | Fix flow layout not taking into account whether it's width and height are imp...Joona Petrell2010-06-293-2/+41
| | | | | | * | | Avoid binding loop.Yann Bodson2010-06-291-1/+2
| | | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-29115-687/+2289
| | | | | | |\ \ \
| | | | | * | | | | Ensure micro focus is updated in TextEdit and TextInputMartin Jones2010-06-294-9/+14
| | | | | | |/ / / | | | | | |/| | |
| | | | | * | | | Ensure Loader item change listener is removed when Loader is destroyedMartin Jones2010-06-292-6/+13
| | | | | * | | | Adapt all qmlviewer testcases to the code changes in the actual viewer.Robert Griebl2010-06-284-25/+22
| | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-28114-671/+2269
| | | | | |\ \ \ \
| | | | | | * | | | Stop QMLLauncher from crashing on exit on Mac when quitting app via theBea Lam2010-06-282-0/+14
| | | | | | * | | | VisualDataModel hasModelChildren role shadowed user roles.Martin Jones2010-06-281-1/+1
| | | | | | * | | | Allow positioning of ListView items width sub-pixel precision.Martin Jones2010-06-281-7/+10
| | | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-2811-19/+33
| | | | | | |\ \ \ \