summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Don't need this check.Michael Brasser2009-10-261-2/+1
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-10-2616-90/+621
|\
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-10-2633-118/+212
| |\
| * | 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 kinetic-declarati...Michael Brasser2009-10-2610-83/+467
| |\ \
| | * | 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
| | * | Optimize concatenation of partial shadersRhys Weatherley2009-10-262-30/+95
| | * | Fix ifdef around QMatrix4x4::rotate(QQuaternion)Rhys Weatherley2009-10-261-1/+1
| | * | Optimize QGraphicsRotation's use of QMatrix4x4Rhys Weatherley2009-10-264-6/+179
| | * | Make compile on X11 systems where qreal == floatRhys Weatherley2009-10-261-1/+1
* | | | 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 git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-10-2654-155/+493
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Yann Bodson2009-10-2623-57/+147
| |\ \ \
| | * \ \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Bea Lam2009-10-261760-48962/+105482
| | |\ \ \
| | | * \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-10-265-1/+17
| | | |\ \ \ | | | | |/ /
| | | * | | 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
| | * | | | Allow canvas sizehint to be configurable and fix signal-slotBea Lam2009-10-225-8/+20
| * | | | | use enums rather than strings in examplesYann Bodson2009-10-267-9/+9
| * | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Yann Bodson2009-10-2623-37/+281
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | 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 git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-10-266-24/+36
| | |\ \ \
| | | * | | Doc.Michael Brasser2009-10-264-22/+31
| | | * | | Fix assert with non-integer Rectangle radius.Michael Brasser2009-10-261-2/+5
| | * | | | Ensure cleanup happens before the destruction of QScriptEngineAaron Kennedy2009-10-2611-9/+224
| * | | | | Improve states & transitions examples.Yann Bodson2009-10-263-52/+56
| |/ / / /
* | | | | 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
| |/ / / |/| | |
* | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-10-261647-47723/+101883
|\ \ \ \ | |/ / /
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-251630-47688/+101648
| |\ \ \ | | | |/ | | |/|
| | * | Fix a crash in shutdown of QGraphicsEffectRhys Weatherley2009-10-251-1/+1
| | * | Issue a warning if bindAttributeLocation() is used after shaders linkedRhys Weatherley2009-10-251-3/+8
| | * | Add an extra overload for QMatrix4x4::toTransform()Rhys Weatherley2009-10-254-5/+24
| | * | Merge branch '4.5' into 4.6Thiago Macieira2009-10-233-29/+6
| | |\ \
| | | * | QWidget painting regression on Windows.Bjørn Erik Nilsen2009-10-221-1/+1
| | | * | QWindowsMobileStyle::drawPrimitive(PE_Frame) background color fixedJoerg Bornemann2009-10-221-4/+2
| | | * | move default QAbstractButton font setup on Win mobile to QApplicationJoerg Bornemann2009-10-222-24/+3
| | * | | Compile on QWSAnders Bakken2009-10-231-1/+1
| | * | | Add cross compiling pkg-config disabled warningDonald Carr2009-10-231-0/+5