summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-156-46/+84
|\
| * ComboBox popuplist is not correctly layouted in fullscreen modeSami Merila2010-06-151-10/+1
| * Stylus menu for Share (QT app) is different from native S60 appsSami Merila2010-06-151-31/+35
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-06-154-10/+5
| |\
| | * Change $${EPOCROOT} to also have drive if EPOCROOT env variable has itMiikka Heikkinen2010-06-154-10/+5
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-06-1572-457/+1261
| |\ \ | | |/
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-06-111-1/+1
| |\ \
| * | | Stylus menu for Share (QT app) is different from native S60 appsSami Merila2010-06-112-19/+67
* | | | 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