Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Compile on windows | Aaron Kennedy | 2009-10-26 | 1 | -0/+6 |
| | |||||
* | make remotable | Warwick Allison | 2009-10-26 | 2 | -4/+4 |
| | |||||
* | Fix for windows paths. | Warwick Allison | 2009-10-26 | 2 | -6/+15 |
| | | | | (i.e. nb. "\") | ||||
* | Compile with -no-qt3support | Aaron Kennedy | 2009-10-26 | 2 | -3/+1 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Martin Jones | 2009-10-26 | 110 | -681/+2094 |
|\ | | | | | | | into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-26 | 83 | -372/+1121 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Yann Bodson | 2009-10-26 | 41 | -230/+859 |
| | |\ | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | * | Fix more warnings. | Michael Brasser | 2009-10-26 | 12 | -17/+25 |
| | | | | |||||
| | | * | Don't need this check. | Michael Brasser | 2009-10-26 | 1 | -2/+1 |
| | | | | |||||
| | | * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-10-26 | 16 | -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 Brasser | 2009-10-26 | 33 | -118/+212 |
| | | | |\ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | | * | | Silence warnings. | Michael Brasser | 2009-10-26 | 5 | -6/+13 |
| | | | | | | |||||
| | | | * | | Add support for value interceptors to the DOM. | Michael Brasser | 2009-10-26 | 3 | -3/+143 |
| | | | | | | |||||
| | | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-10-26 | 10 | -83/+467 |
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui | ||||
| | | | | * | | Suppress warnings in QtOpenGL code | Rhys Weatherley | 2009-10-26 | 3 | -1/+5 |
| | | | | | | | |||||
| | | | | * | | Suppress warnings under OpenGL/ES 2.0 in QGLShaderProgram | Rhys Weatherley | 2009-10-26 | 1 | -0/+55 |
| | | | | | | | |||||
| | | | | * | | Fix OpenGL/ES 2.0 bug in previous QGLShaderProgram check-in | Rhys Weatherley | 2009-10-26 | 1 | -1/+1 |
| | | | | | | | |||||
| | | | | * | | Use QObjectPrivate within QGLShaderPrivate and QGLShaderProgramPrivate | Rhys Weatherley | 2009-10-26 | 2 | -47/+134 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith | ||||
| | | | | * | | Optimize concatenation of partial shaders | Rhys Weatherley | 2009-10-26 | 2 | -30/+95 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith | ||||
| | | | | * | | Fix ifdef around QMatrix4x4::rotate(QQuaternion) | Rhys Weatherley | 2009-10-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme | ||||
| | | | | * | | Optimize QGraphicsRotation's use of QMatrix4x4 | Rhys Weatherley | 2009-10-26 | 4 | -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 == float | Rhys Weatherley | 2009-10-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith | ||||
| | | * | | | | Fix "initial" size for remote content. | Warwick Allison | 2009-10-26 | 4 | -2/+20 |
| | | | | | | | |||||
| | | * | | | | qmldir not needed if types are qualified. | Warwick Allison | 2009-10-26 | 1 | -2/+2 |
| | | | | | | | |||||
| | | * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-10-26 | 54 | -155/+493 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | | | Allow flickr demo to be remote. | Warwick Allison | 2009-10-26 | 1 | -0/+10 |
| | | | | | | | |||||
| | | * | | | | Move knowledge of qmldir out of QmlScriptParser. | Warwick Allison | 2009-10-26 | 2 | -6/+11 |
| | | | | | | | |||||
| | | * | | | | Wait for qmldir remote content so that imports work remotely. | Warwick Allison | 2009-10-26 | 6 | -74/+131 |
| | | | | | | | |||||
| | | * | | | | Work again for URLs. | Warwick Allison | 2009-10-26 | 2 | -43/+45 |
| | | | | | | | |||||
| | | * | | | | unwarn | Warwick Allison | 2009-10-26 | 3 | -4/+3 |
| | | | | | | | |||||
| | * | | | | | improve connections example. | Yann Bodson | 2009-10-26 | 5 | -22/+32 |
| | | | | | | | |||||
| | * | | | | | fix anchors | Yann Bodson | 2009-10-26 | 1 | -1/+1 |
| | | |/ / / | | |/| | | | |||||
| | * | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Yann Bodson | 2009-10-26 | 23 | -57/+147 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | * \ \ \ | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2009-10-26 | 1760 | -48962/+105482 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | | * \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-26 | 5 | -1/+17 |
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | | * | | | | Docs. | Martin Jones | 2009-10-26 | 8 | -20/+38 |
| | | | | | | | | |||||
| | | | * | | | | Fix accessing QmlList data as a model. | Martin Jones | 2009-10-26 | 2 | -6/+11 |
| | | | | | | | | |||||
| | | * | | | | | Fix to show expression query widget and allow QmlEngineDebug values | Bea Lam | 2009-10-26 | 10 | -23/+78 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for widgets to be changed after construction. | ||||
| | | * | | | | | Allow canvas sizehint to be configurable and fix signal-slot | Bea Lam | 2009-10-22 | 5 | -8/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connections in engine.cpp | ||||
| | * | | | | | | use enums rather than strings in examples | Yann Bodson | 2009-10-26 | 7 | -9/+9 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Yann Bodson | 2009-10-26 | 23 | -37/+281 |
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | * | | | | | Doc. | Michael Brasser | 2009-10-26 | 5 | -1/+17 |
| | | | |/ / / | | | |/| | | | |||||
| | | * | | | | Fix crash. | Michael Brasser | 2009-10-26 | 1 | -3/+3 |
| | | | | | | | |||||
| | * | | | | | Improve states & transitions examples. | Yann Bodson | 2009-10-26 | 3 | -52/+56 |
| | | | | | | | |||||
| * | | | | | | Doc | Aaron Kennedy | 2009-10-26 | 3 | -3/+2 |
| | | | | | | | |||||
| * | | | | | | Use QScriptProgram under windows | Aaron Kennedy | 2009-10-26 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'qscriptprogram' of ↵ | Aaron Kennedy | 2009-10-26 | 11 | -271/+708 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/khansens-qt-script-program into kinetic-declarativeui Manually merged src/declarative/qml/qmlexpression.cpp src/script/api/qscriptengine.cpp src/script/api/qscriptengine.h | ||||
| | * | | | | | add benchmark for QScriptEngine::evaluate(QScriptProgram) | Kent Hansen | 2009-10-23 | 1 | -1/+18 |
| | | | | | | | |||||
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qscriptprogram | Kent Hansen | 2009-10-23 | 1951 | -82215/+146384 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/script/api/qscriptengine.cpp tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp | ||||
| | * | | | | | | Refactor QScriptProgram and related API | Kent Hansen | 2009-10-23 | 8 | -114/+231 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of QScriptEngine::compile(); you pass arguments to the QScriptProgram constructor instead. evaluate() will lazily compile the program the first time it is evaluated, then use the cached, compiled form on subsequent calls. |