summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-123-6/+19
|\
| * Merge branch '4.6-platform' into 4.6Denis Dzyubenko2009-11-113-6/+19
| |\
| | * Pinchzoom example zooms more smoothDenis Dzyubenko2009-11-112-5/+18
| | * Fixed opening files in the findfile example.Denis Dzyubenko2009-11-101-1/+1
* | | Merge remote branch 'qt/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-11-1113-51/+69
|\ \ \ | |/ /
| * | Improvements to graphics effects API after review round.Samuel Rødal2009-11-104-6/+6
| |/
| * Changes to low-level audio API.Kurt Korbatits2009-11-103-12/+12
| * Changes to low-level audio API.Kurt Korbatits2009-11-103-12/+12
| * Merge branch '4.6' of ../qt into 4.6Kurt Korbatits2009-11-1026-67/+424
| |\
| | * Merge commit 'qtwebkit/qtwebkit-4.6' into 4.6Jocelyn Turcotte2009-11-091-4/+3
| | |\
| | | * Corrects bug in fancybrowser example where image rotation did not work.Jocelyn Turcotte2009-11-061-4/+3
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Morten Engvoldsen2009-11-091-2/+2
| | |\ \
| | | * \ Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-091-2/+2
| | | |\ \
| | | | * | API review: QRegExp::numCaptures() -> QRegExp::captureCount()Marius Storm-Olsen2009-11-061-2/+2
| | * | | | ÿþdMorten Engvoldsen2009-11-094-27/+46
| | |/ / /
| * | | | Changes to low-level audio API.Kurt Korbatits2009-11-053-12/+12
| | |_|/ | |/| |
* | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-11-111-2/+3
|\ \ \ \
| * | | | look nicerWarwick Allison2009-11-111-2/+3
* | | | | Update SameGame tutorial to discuss offline storageAlan Alpert2009-11-111-1/+3
|/ / / /
* | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-11-102-31/+33
|\ \ \ \
| * | | | Fix samegame tutorial 3Alan Alpert2009-11-101-12/+12
| * | | | Clarify the role of positioner transitionsAlan Alpert2009-11-101-19/+21
* | | | | Remove WebView::pagewidth and tidy up - it's not needed and interferedWarwick Allison2009-11-101-2/+2
|/ / / /
* | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-11-092-5/+8
|\ \ \ \
| * | | | Fix perspective in dynamic exampleAlan Alpert2009-11-092-5/+8
* | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-0929-77/+395
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-0610-33/+72
| |\ \ \
| | * \ \ Merge branch '4.6-s60' into 4.6axis2009-11-066-3/+27
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-052-15/+0
| | | |\ \ | | | | |/
| | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-0410-32/+28
| | | |\ \
| | | * | | Added UIDs to projects lacking themMiikka Heikkinen2009-11-046-3/+27
| | * | | | Merge remote branch 'qt-official/4.6' into 4.6Morten Johan Sørvig2009-11-062-17/+25
| | |\ \ \ \
| | | * | | | Modify QGLShader and QGLShaderProgram in response to API reviewRhys Weatherley2009-11-052-17/+25
| | | | |_|/ | | | |/| |
| | * | | | Fixed pinching in the imagegestures example.Denis Dzyubenko2009-11-051-6/+5
| | * | | | Small improvement in the imagegesture example.Denis Dzyubenko2009-11-051-1/+1
| | * | | | Implemented QSwipeGesture recognizer using touch events.Denis Dzyubenko2009-11-051-8/+10
| | * | | | Merge remote branch 'qt-official/4.6' into 4.6Morten Johan Sørvig2009-11-0511-41/+15
| | |\ \ \ \ | | | |/ / /
| | * | | | Mac: pinch gesture scales to fast and event below zeroRichard Moe Gustavsen2009-11-042-4/+10
| * | | | | Pro file fixes wrt anchor layout examples.Jan-Arve Sæther2009-11-062-4/+3
| * | | | | Make sure the pixmap is properly initialized.Jan-Arve Sæther2009-11-061-0/+1
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6Jan-Arve Sæther2009-11-054-35/+16
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Eskil Abrahamsen Blomfeldt2009-11-047-29/+23
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge commit '51c9b68' into 4.6Morten Johan Sørvig2009-11-042-20/+16
| | | |\ \ \ | | | | |/ /
| | | | * | Compile fix after the last gesture api changeDenis Dzyubenko2009-11-031-3/+3
| | | | * | Gesture api review.Denis Dzyubenko2009-11-031-3/+3
| | | | * | Implemented pinch gesture recognizer.Denis Dzyubenko2009-11-031-11/+7
| | | | * | Fixed the imagegestures project file.Denis Dzyubenko2009-11-031-3/+3
| | * | | | Fixed hardcoded GL library names on WinCE.Trond Kjernåsen2009-11-042-15/+0
| * | | | | Merge branch 'fixes' of git://gitorious.org/~morphbr/qt/morphbrs-clone into m...Jan-Arve Sæther2009-11-059-0/+300
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Weather Anchor Layout exampleArtur Duque de Souza2009-11-059-0/+300
| | | |/ / | | |/| |