summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-10-2641-230/+859
|\ | | | | | | into kinetic-declarativeui
| * Fix more warnings.Michael Brasser2009-10-2612-17/+25
| |
| * Don't need this check.Michael Brasser2009-10-261-2/+1
| |
| * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-10-2616-90/+621
| |\ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qbitfield_p.h
| | * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-10-2633-118/+212
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Silence warnings.Michael Brasser2009-10-265-6/+13
| | | |
| | * | Add support for value interceptors to the DOM.Michael Brasser2009-10-263-3/+143
| | | |
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-2610-83/+467
| | |\ \ | | | | | | | | | | | | | | | kinetic-declarativeui
| | | * | Suppress warnings in QtOpenGL codeRhys Weatherley2009-10-263-1/+5
| | | | |
| | | * | Suppress warnings under OpenGL/ES 2.0 in QGLShaderProgramRhys Weatherley2009-10-261-0/+55
| | | | |
| | | * | Fix OpenGL/ES 2.0 bug in previous QGLShaderProgram check-inRhys Weatherley2009-10-261-1/+1
| | | | |
| | | * | Use QObjectPrivate within QGLShaderPrivate and QGLShaderProgramPrivateRhys Weatherley2009-10-262-47/+134
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith
| | | * | Optimize concatenation of partial shadersRhys Weatherley2009-10-262-30/+95
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith
| | | * | Fix ifdef around QMatrix4x4::rotate(QQuaternion)Rhys Weatherley2009-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * | Optimize QGraphicsRotation's use of QMatrix4x4Rhys Weatherley2009-10-264-6/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous code was creating a full 3D rotation matrix and then projecting back to 2D. This change combines the two steps into one to avoid calculating matrix components that will be dropped. Reviewed-by: Sarah Smith
| | | * | Make compile on X11 systems where qreal == floatRhys Weatherley2009-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith
| * | | | Fix "initial" size for remote content.Warwick Allison2009-10-264-2/+20
| | | | |
| * | | | qmldir not needed if types are qualified.Warwick Allison2009-10-261-2/+2
| | | | |
| * | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-10-2654-155/+493
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Allow flickr demo to be remote.Warwick Allison2009-10-261-0/+10
| | | | |
| * | | | Move knowledge of qmldir out of QmlScriptParser.Warwick Allison2009-10-262-6/+11
| | | | |
| * | | | Wait for qmldir remote content so that imports work remotely.Warwick Allison2009-10-266-74/+131
| | | | |
| * | | | Work again for URLs.Warwick Allison2009-10-262-43/+45
| | | | |
| * | | | unwarnWarwick Allison2009-10-263-4/+3
| | | | |
* | | | | improve connections example.Yann Bodson2009-10-265-22/+32
| | | | |
* | | | | fix anchorsYann Bodson2009-10-261-1/+1
| |/ / / |/| | |
* | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-10-2623-57/+147
|\ \ \ \ | | | | | | | | | | | | | | | into kinetic-declarativeui
| * \ \ \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2009-10-261760-48962/+105482
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | * \ \ \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-10-265-1/+17
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Docs.Martin Jones2009-10-268-20/+38
| | | | | |
| | * | | | Fix accessing QmlList data as a model.Martin Jones2009-10-262-6/+11
| | | | | |
| * | | | | Fix to show expression query widget and allow QmlEngineDebug valuesBea Lam2009-10-2610-23/+78
| | | | | | | | | | | | | | | | | | | | | | | | for widgets to be changed after construction.
| * | | | | Allow canvas sizehint to be configurable and fix signal-slotBea Lam2009-10-225-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | connections in engine.cpp
* | | | | | use enums rather than strings in examplesYann Bodson2009-10-267-9/+9
| | | | | |
* | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-10-2623-37/+281
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | into kinetic-declarativeui
| * | | | | Doc.Michael Brasser2009-10-265-1/+17
| | |/ / / | |/| | |
| * | | | Fix crash.Michael Brasser2009-10-261-3/+3
| | | | |
| * | | | Flip around perspective originAaron Kennedy2009-10-261-0/+1
| | | | |
| * | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-10-266-24/+36
| |\ \ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Doc.Michael Brasser2009-10-264-22/+31
| | | | | |
| | * | | | Fix assert with non-integer Rectangle radius.Michael Brasser2009-10-261-2/+5
| | | |/ / | | |/| |
| | * | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-10-261647-47723/+101883
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Avoid unnecessary trademark.Warwick Allison2009-10-261-0/+0
| | | | | |
| * | | | | Ensure cleanup happens before the destruction of QScriptEngineAaron Kennedy2009-10-2611-9/+224
| | |/ / / | |/| | | | | | | | | | | | | This was causing crashes on windows.
* | | | | Improve states & transitions examples.Yann Bodson2009-10-263-52/+56
|/ / / /
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-251630-47688/+101648
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/qdoc3/cppcodemarker.cpp
| * | | Fix a crash in shutdown of QGraphicsEffectRhys Weatherley2009-10-251-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| * | | Issue a warning if bindAttributeLocation() is used after shaders linkedRhys Weatherley2009-10-251-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attribute locations must be bound before a shader program is linked according to the GLSL specification. Issue a warning to the user if they do it in the wrong order, which should help to isolate hard to find bugs much quicker. Reviewed-by: trustme
| * | | Add an extra overload for QMatrix4x4::toTransform()Rhys Weatherley2009-10-254-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 100afe8d fixed a bug in QGraphicsRotation related to when the "distance to plane" projection needed to be performed. As a side effect it made the toTransform() API not do the expected thing when the function is called with no argument. This change makes the default no-argument version of toTransform() do the simple "drop row 3 and column 3" orthographic transformation that normal users of the class expect, and adds a new overload for the "distance to plane" projection case for the special case. Reviewed-by: trustme
| * | | Merge branch '4.5' into 4.6Thiago Macieira2009-10-233-29/+6
| |\ \ \
generated by cgit v0.12 at 2025-08-18 17:16:52 (GMT)