summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Document QML_IMPORT_TRACEBea Lam2010-06-161-2/+29
* Document section.delegateBea Lam2010-06-161-1/+5
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-156-33/+58
|\
| * Remove duplicated code.Michael Brasser2010-06-152-14/+2
| * Fix bug with childrenRect resizing on startup.Michael Brasser2010-06-154-19/+56
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-156-11/+21
|\ \
| * | Updated WebKit to 40c2d6907ef75288b4f15e7fad334b9138acdbbfSimon Hausmann2010-06-156-11/+21
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-157-28/+74
|\ \ | |/ |/|
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-147-28/+74
| |\
| | * Fixed error reporting in grayraster and reduced default pool size.Carolina Gomes2010-06-144-22/+35
| | * Add QTextOption API to QStaticTextEskil Abrahamsen Blomfeldt2010-06-143-6/+39
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-14257-1138/+3416
|\ \ \ | |/ / |/| |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-14257-1138/+3416
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-12257-1138/+3416
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-12257-1138/+3416
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-1111-0/+26
| | | | |\ \
| | | | | * | Move listview/itemlist.qml to a separate visualitemmodel exampleBea Lam2010-06-1111-0/+26
| | | | * | | ListView.onRemove animation is not played when the list has only one item.Martin Jones2010-06-112-2/+2
| | | | |/ /
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-1124-248/+318
| | | | |\ \
| | | | | * | Fix test - sizeHint should not change after initial load. Also useBea Lam2010-06-111-5/+3
| | | | | * | Minor doc fixesBea Lam2010-06-117-8/+11
| | | | | * | Doc improvements, including snippet fixes, linking to examples, makingBea Lam2010-06-1118-216/+278
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-114-31/+127
| | | | | |\ \
| | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-112-20/+12
| | | | | | |\ \
| | | | | | * | | Do not keep flush timer running once no pixmaps are detached.Warwick Allison2010-06-111-11/+18
| | | | | * | | | Fix qmlviewer test failure on windowsMartin Jones2010-06-111-8/+8
| | | | * | | | | Make snapping work properly for highlight ranges > item sizeMartin Jones2010-06-112-28/+84
| | | | | |_|/ / | | | | |/| | |
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-111-0/+97
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| |
| | | | | * | | Make snippet compile and pass license test, and add missing snippet fileBea Lam2010-06-111-0/+97
| | | | | |/ /
| | | | * | | Avoid recursive refill() in List/GridViewMartin Jones2010-06-112-20/+12
| | | | |/ /
| | | | * | Remove accidentaly added characters.Martin Jones2010-06-101-1/+1
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-10235-901/+2938
| | | | |\ \
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-10235-901/+2938
| | | | | |\ \
| | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-10235-901/+2938
| | | | | | |\ \
| | | | | | | * | Update on color change.Warwick Allison2010-06-101-0/+1
| | | | | | | * | Update on color change.Warwick Allison2010-06-101-1/+5
| | | | | | | * | Add go button to webbrowser example.Yann Bodson2010-06-105-4/+36
| | | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-10231-896/+2896
| | | | | | | |\ \
| | | | | | | | * | Remove 'XXX Experimental' from VisualItemModel/VisualDataModel andBea Lam2010-06-102-11/+0
| | | | | | | | * | Document attached propertiesBea Lam2010-06-104-3/+22
| | | | | | | | * | Add 'on' prefix to documentation of signalsBea Lam2010-06-102-3/+3
| | | | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-101-0/+17
| | | | | | | | |\ \
| | | | | | | | | * | Improve test stability.Warwick Allison2010-06-101-0/+17
| | | | | | | | * | | Stablize qmlviewer testMartin Jones2010-06-101-13/+14
| | | | | | | | |/ /
| | | | | | | | * | qmlviewer: ensure that only clicks on the current file list are handled.Martin Jones2010-06-091-1/+1
| | | | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-0935-422/+1105
| | | | | | | | |\ \
| | | | | | | | | * | Doc improvements: move some example code to snippets, add screenshots,Bea Lam2010-06-0929-225/+783
| | | | | | | | | * | Move some example code into snippets/ and add other doc fixesBea Lam2010-06-0913-204/+329
| | | | | | | | * | | Fix crash when changing ListView model with highlightRangeMode: ListView.Stri...Martin Jones2010-06-094-4/+27
| | | | | | | | |/ /
| | | | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-095-24/+100
| | | | | | | | |\ \