summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-05-272-7/+22
|\
| * fix flickr demo after recent changes to gradients.Lars Knoll2009-05-271-2/+2
| * Better gradient support for Rect.Martin Jones2009-05-272-7/+22
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-05-272-3/+18
|\ \ | |/ |/|
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-271-3/+3
| |\
| | * BT: opening datetimepicker in a cell in spreadsheet demo resets the dateOlivier Goffart2009-05-261-3/+3
| * | Merge branch 'master' into graphics-masterTom Cooksey2009-05-251-0/+15
| |\ \
| | * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animat...Thierry Bastian2009-05-228-72/+80
| | |\ \
| | * | | add animation and state machine examples to qtdemoKent Hansen2009-05-201-0/+15
| * | | | Merge commit 'qt/master'Samuel Rødal2009-05-203-11/+15
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge commit 'qt/master'Samuel Rødal2009-05-131-1/+1
| |\ \ \ \
| * | | | | Mac OSX compile errors in shader usageRhys Weatherley2009-05-101-9/+9
* | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-05-223-11/+15
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge commit 'origin/4.5'Samuel Rødal2009-05-201-2/+5
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Compile on Solaris with broken GL headers.Trond Kjernåsen2009-05-201-2/+5
| * | | | | Merge commit 'origin/4.5'Olivier Goffart2009-05-181-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix syntax error in demos.pro.Jason McDonald2009-05-151-1/+1
| | | |_|/ | | |/| |
| * | | | Graphics View Optimization: Use a simple style option by default.Bjoern Erik Nilsen2009-05-151-8/+9
| | |_|/ | |/| |
* | | | Add status and feedback info to XmlListModelMartin Jones2009-05-201-0/+2
* | | | better focus handling for the location barLars Knoll2009-05-191-4/+1
* | | | make the web browser URL field work a little betterLars Knoll2009-05-191-14/+2
* | | | More precise positioning to leave 1-pixel inner marginWarwick Allison2009-05-192-7/+7
* | | | Simplify (hopefully) anchors, and make them less reliant on signalsAaron Kennedy2009-05-181-1/+0
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Warwick Allison2009-05-151-1/+1
|\ \ \ \ | |/ / /
| * | | Fix typo in spreadsheet exampleThomas Zander2009-05-121-1/+1
* | | | Flickr demo: Scale the image about the center of the visible area.Martin Jones2009-05-141-2/+17
* | | | Make good television.Warwick Allison2009-05-121-2/+2
* | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-121-21/+0
|\ \ \ \
| * | | | Revert accidentally commted stuff.Warwick Allison2009-05-121-21/+0
* | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-121-1/+24
|\ \ \ \ \ | |/ / / /
| * | | | Fix resizing and skinning.Warwick Allison2009-05-111-1/+24
* | | | | Make scaling in flickr demo sensible.Martin Jones2009-05-123-16/+29
|/ / / /
* | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-05-114-4/+10
|\ \ \ \
| * | | | Fix webbrowser demoYann Bodson2009-05-113-3/+9
| * | | | Change pathview angle.Yann Bodson2009-05-111-1/+1
* | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-05-082-52/+47
|\ \ \ \ \ | |/ / / /
| * | | | Add tags to flickr2Yann Bodson2009-05-081-5/+14
| * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-05-088-34/+201
| |\ \ \ \
| * | | | | Fix flickr2Yann Bodson2009-05-082-49/+35
* | | | | | highlight in tune with background imageWarwick Allison2009-05-081-0/+1
| |/ / / / |/| | | |
* | | | | Fade TagEdit properlyWarwick Allison2009-05-081-0/+1
* | | | | Minimal size is MediaButton size, center outside edit modeWarwick Allison2009-05-081-10/+8
* | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-05-088-102/+133
|\ \ \ \ \
| * \ \ \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Ian Walters2009-05-081-71/+58
| |\ \ \ \ \ | | |/ / / /
| | * | | | Get the delegate scale correct at the ends of the path.Martin Jones2009-05-081-5/+4
| | * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-083-3/+6
| | |\ \ \ \
| | * | | | | More path to path fixing.Martin Jones2009-05-081-68/+56
| * | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Ian Walters2009-05-084-23/+32
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-05-071-1/+1
| | |\ \ \ \ \
| | * | | | | | Fixes for the slider.Yann Bodson2009-05-073-2/+5
| | | |/ / / / | | |/| | | |