summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add progress reporting to Image and use it in the flickr demo.Martin Jones2009-05-076-11/+93
* Doc.Martin Jones2009-05-061-11/+57
* Small fix. Rotation was not set back to 0 properly.Yann Bodson2009-05-061-2/+3
* Use source locations in the diagnostic messages.Roberto Raggi2009-05-064-54/+34
* Add some support for QWidget (again)Thomas Hartmann2009-05-061-1/+6
* Reject multiple top-level object members.Roberto Raggi2009-05-065-825/+851
* Add a new Flickr demo.Yann Bodson2009-05-0618-0/+464
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Ian Walters2009-05-0638-860/+869
|\
| * DocMichael Brasser2009-05-061-6/+1
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-05-061-5/+6
| |\
| | * docWarwick Allison2009-05-061-5/+6
| * | Enable updating of XmlListModel from Qml.Michael Brasser2009-05-063-4/+15
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-05-0661-553/+2073
| |\ \ | | |/
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-0615-3/+368
| | |\
| | | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-06237-2568/+6540
| | | |\
| | | * | Beginings of an experimental QML debugger viewAaron Kennedy2009-05-0615-3/+368
| | * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-0636-284/+1542
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-05-0632-238/+1494
| | | |\ \
| | | * | | docWarwick Allison2009-05-061-23/+36
| | * | | | Don't process input events while waiting for network response.Martin Jones2009-05-061-1/+1
| | * | | | Docs.Martin Jones2009-05-063-17/+17
| * | | | | Merge branch 'shader-api' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team i...Michael Brasser2009-05-0614-807/+431
| |\ \ \ \ \
| | * | | | | Port boxes demo to use math3d throughoutRhys Weatherley2009-05-0112-732/+131
| | * | | | | qdoc fixesRhys Weatherley2009-05-011-12/+12
| | * | | | | Disable shaders on OpenGL/ES 1.1Rhys Weatherley2009-05-012-2/+2
| | * | | | | Samplers should be set via the GLuint override, not the GLint override.Rhys Weatherley2009-05-012-7/+35
| | * | | | | Make QGLShaderProgram::disable() static.Rhys Weatherley2009-05-012-2/+8
| | * | | | | Rename QGLShader(Program)::errors() to log()Rhys Weatherley2009-05-013-42/+42
| | * | | | | Add uniform setters for Qt data types to QGLShaderProgramTom Cooksey2009-05-012-0/+142
| | * | | | | Merge branch 'shaderprograms' of git@scm.dev.nokia.troll.no:qt/rweathers-shad...Rhys Weatherley2009-05-0117-1059/+3600
| | |\ \ \ \ \
| | | * | | | | Fix loading of partial shaders from files.Rhys Weatherley2009-03-271-3/+0
| | | * | | | | Bug in QGLShaderProgram::addShader() that stopped partial shaders working.Rhys Weatherley2009-03-271-3/+6
| | | * | | | | Import shader implementation from before the history cut.Rhys Weatherley2009-03-2353-1063/+18061
* | | | | | | | Quote align center enum appropriatelyIan Walters2009-05-065-5/+5
* | | | | | | | Use animated images where appropriate.Ian Walters2009-05-064-4/+3
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Ian Walters2009-05-06225-2821/+5228
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | docWarwick Allison2009-05-063-23/+12
| | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-06194-2158/+4862
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-05-06196-2051/+4877
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-05-0626-522/+228
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | * | | | Add images for the Transform documentation.Michael Brasser2009-05-064-2/+11
| | | * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-05-0644-818/+1905
| | | |\ \ \ \
| | | | * | | | Fixes crash when mysql_init() returns 0Bill King2009-05-051-1/+1
| | | | * | | | Cleaned up codeAnders Bakken2009-05-051-24/+20
| | | | * | | | Cleaned up codeAnders Bakken2009-05-051-439/+443
| | | | * | | | Refactored image cachingAnders Bakken2009-05-057-141/+147
| | | | * | | | Make sure image caching works with Qt3SupportAnders Bakken2009-05-052-0/+4
| | | | * | | | Cleaned up code a littleAnders Bakken2009-05-051-41/+28
| | | | * | | | Don't call prepare more than necessaryAnders Bakken2009-05-053-22/+37
| | | | * | | | DirectFB can't handle "mirrored" scalesAnders Bakken2009-05-051-14/+23