summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Fixed invalid XML from testlib: `<Incident type="fail" (null)="" ...'Rohan McGovern2009-05-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When failing without a filename, setting file to 0 does not work. File must be set to "". Autotest: 2d194009379a4e199ec246ca053ee97ee733482f
| | * | | Fixed invalid XML from testlib.Rohan McGovern2009-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Obvious typo in format string: `<DataTag><![CDATA[%s]]></Description>', closing tag should be `DataTag'. Autotest: 2d194009379a4e199ec246ca053ee97ee733482f
| | * | | Made tst_Selftests::checkXML actually test the new (Qt 4.6) test logger.Rohan McGovern2009-05-062-28/+42
| | | | | | | | | | | | | | | | | | | | | | | | | Previously `-flush' was always passed to the child process, meaning the old (Qt 4.5) test logger was used exclusively in this test, hiding bugs.
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QObject::setParent is not allowed for QWidgets using QWidget::setParent instead if QObject::isWidgetType() Reviewed-by: Kai Koehne
| * | | | 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 ↵Ian Walters2009-05-0638-860/+869
| |\ \ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | DocMichael Brasser2009-05-061-6/+1
| | | | | |
| | * | | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-061-5/+6
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | | docWarwick Allison2009-05-061-5/+6
| | | | | | |
| | * | | | | Enable updating of XmlListModel from Qml.Michael Brasser2009-05-063-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Made the fetch() method a slot so it will be accessible from QML.
| | * | | | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-0661-553/+2073
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-0615-3/+368
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * \ \ \ \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-0636-284/+1542
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | | | | 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 ↵Michael Brasser2009-05-0614-807/+431
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: demos/boxes/scene.cpp src/opengl/qglpixmapfilter.cpp src/opengl/qglshaderprogram.cpp src/opengl/qglshaderprogram.h
| | | * | | | | | | Port boxes demo to use math3d throughoutRhys Weatherley2009-05-0112-732/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch originally by Ian Walters.
| | | * | | | | | | qdoc fixesRhys Weatherley2009-05-011-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * | | | | | | Disable shaders on OpenGL/ES 1.1Rhys Weatherley2009-05-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * | | | | | | Samplers should be set via the GLuint override, not the GLint override.Rhys Weatherley2009-05-012-7/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * | | | | | | Make QGLShaderProgram::disable() static.Rhys Weatherley2009-05-012-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * | | | | | | Rename QGLShader(Program)::errors() to log()Rhys Weatherley2009-05-013-42/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The shader compilers also report warnings, so it is more appropriate to call the string a log. Reviewed-by: trustme
| | | * | | | | | | Add uniform setters for Qt data types to QGLShaderProgramTom Cooksey2009-05-012-0/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Rhys Weatherley
| | | * | | | | | | Merge branch 'shaderprograms' of ↵Rhys Weatherley2009-05-0117-1059/+3600
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/rweathers-shaderprograms into shader-api Conflicts: src/gui/math3d/math3d.pri src/gui/math3d/qgenericmatrix.cpp src/gui/math3d/qgenericmatrix.h src/gui/math3d/qmatrix4x4.cpp src/gui/math3d/qmatrix4x4.h src/gui/math3d/qquaternion.cpp src/gui/math3d/qquaternion.h src/gui/math3d/qvector2d.cpp src/gui/math3d/qvector2d.h src/gui/math3d/qvector3d.cpp src/gui/math3d/qvector3d.h src/gui/math3d/qvector4d.cpp src/gui/math3d/qvector4d.h src/opengl/opengl.pro tests/auto/math3d/math3d.pro tests/auto/math3d/qmatrixnxn/tst_qmatrixnxn.cpp tests/auto/math3d/qquaternion/tst_qquaternion.cpp tests/auto/math3d/qvectornd/tst_qvectornd.cpp tests/auto/math3d/shared/math3dincludes.h
| | | | * | | | | | | 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
| | | | | | | | | | |
* | | | | | | | | | | Shift QmlBindableValue data into d-ptrAaron Kennedy2009-05-064-25/+106
| | | | | | | | | | |
* | | | | | | | | | | Add an (unused) locations field to compiled dataAaron Kennedy2009-05-063-9/+22
| | | | | | | | | | |
* | | | | | | | | | | Improve parser line/column trackingAaron Kennedy2009-05-068-166/+210
| | | | | | | | | | |
* | | | | | | | | | | Track expression evaluation when debugging is enabledAaron Kennedy2009-05-064-33/+162
| |_|_|_|_|_|/ / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-06237-2568/+6540
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-0632-238/+1494
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | | | | | Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-05-06225-2821/+5228
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | | | | | | Images for third chapter of the tutorialIan Walters2009-05-066-44/+48
| | | | | | | | | | |
| | * | | | | | | | | Put more items in the contact table.Ian Walters2009-05-066-0/+1365
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need a few names for scrolling to be demonstrated. Also still only a few hundred K, so 1000 items not that big a deal.
| | * | | | | | | | | Use new syntax for properties and signals.Ian Walters2009-05-069-77/+37
| | | | | | | | | | |
| | * | | | | | | | | Use new syntax for properties and signals.Ian Walters2009-05-0611-117/+44
| | | | | | | | | | |
| * | | | | | | | | | docWarwick Allison2009-05-061-23/+36
| | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | docWarwick Allison2009-05-063-23/+12
| | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-06194-2158/+4862
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ \ \ \ \ \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-06196-2051/+4877
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | | | | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-0626-522/+228
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | | | | | | 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 ↵Michael Brasser2009-05-0644-818/+1905
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | kinetic-declarativeui
| | | | * | | | | | | Fixes crash when mysql_init() returns 0Bill King2009-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 250632
generated by cgit v0.12 at 2024-10-26 09:33:27 (GMT)