Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-10-28 | 16 | -47/+216 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-28 | 10 | -83/+164 |
| |\ | | | | | | | | | | 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-28 | 6 | -26/+100 |
| | |\ | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | * | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-10-28 | 6 | -64/+140 |
| | | |\ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | Doc | Michael Brasser | 2009-10-28 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | make TextElideMode an enum of QFxText. | Yann Bodson | 2009-10-28 | 3 | -18/+23 |
| | | | | | |||||
| * | | | | Do not display transient binding errors | Aaron Kennedy | 2009-10-28 | 7 | -10/+88 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During QML startup, it is common to have "errors" in bindings as the apps state stabilizes. These are not real errors, but just a consequence of implementing a declarative UI in an imperative world. Now during startup, the display of errors is delayed until the startup completes, and then only bindings that are still in an error state are displayed. QT-2373 | ||||
| * | | | | Add a QmlExpression::error() method | Aaron Kennedy | 2009-10-28 | 8 | -21/+107 |
| | |/ / | |/| | | | | | | | | | | | | | | QmlExpression should not print errors itself. This is the responsibility of the caller. | ||||
* | | | | Fix dynamic example | Alan Alpert | 2009-10-28 | 1 | -1/+15 |
| |_|/ |/| | | | | | | | | | | | Includes adding a comment to the positioners to alert others that you shouldn't use anchors as well. | ||||
* | | | Fix bug where repeater would add spacing for 0 sized children | Alan Alpert | 2009-10-28 | 1 | -2/+4 |
| | | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-28 | 2 | -39/+41 |
|\ \ \ | | |/ | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | QT-2382 | Yann Bodson | 2009-10-28 | 2 | -39/+41 |
| |/ | |||||
* | | Mode improvement to strictly enforced highlight range movement. | Martin Jones | 2009-10-28 | 2 | -17/+89 |
| | | |||||
* | | Ensure that the Follows handle the target value changing unexpectedly. | Martin Jones | 2009-10-28 | 2 | -6/+6 |
|/ | | | | | | If the target's property was changed elsewhere while the Follow wasn't running, it would fail to start when a source identical to its current source valule was set. | ||||
* | Doc | Aaron Kennedy | 2009-10-27 | 1 | -2/+10 |
| | |||||
* | Support return values in synthesized methods | Aaron Kennedy | 2009-10-27 | 2 | -2/+5 |
| | |||||
* | Oops. | Martin Jones | 2009-10-27 | 1 | -2/+1 |
| | |||||
* | Try to be a bit more clever with snapping. | Martin Jones | 2009-10-27 | 4 | -7/+97 |
| | |||||
* | Add QFxVisualItemModel::children notify signal | Aaron Kennedy | 2009-10-27 | 2 | -1/+10 |
| | |||||
* | Simplify the defaultObjects handling | Aaron Kennedy | 2009-10-27 | 5 | -32/+9 |
| | | | | | As the scope object is no longer added to the defaultObjects list it makes sense that the root object remain constant at position 0 | ||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-27 | 1 | -6/+21 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Fix dragging at the end of a flickable with overShoot: false | Martin Jones | 2009-10-27 | 1 | -6/+21 |
| | | |||||
* | | Don't crash when requesting an attached object for non-QML object | Aaron Kennedy | 2009-10-27 | 1 | -0/+2 |
|/ | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-27 | 1 | -1/+1 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Error when a QVariant property is used as a grouped property | Aaron Kennedy | 2009-10-27 | 1 | -1/+1 |
| | | | | | | | | This crashed as the metatype of QVariant is -1. | ||||
* | | Improve highlight range API and fix incorrect list end calc. | Martin Jones | 2009-10-27 | 2 | -28/+37 |
|/ | |||||
* | Fixed namespace macro. | Erik Verbruggen | 2009-10-26 | 1 | -2/+2 |
| | |||||
* | Resize loader after parameters have changed | Aaron Kennedy | 2009-10-26 | 1 | -0/+2 |
| | |||||
* | Compile on windows | Aaron Kennedy | 2009-10-26 | 1 | -0/+6 |
| | |||||
* | 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 | 61 | -494/+1483 |
|\ | | | | | | | into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-26 | 44 | -196/+734 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic 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 | 14 | -86/+526 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 5 | -13/+16 |
| | | |\ | | | | | | | | | | | | | | | | 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 | 2 | -0/+116 |
| | | | | | |||||
| | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-10-26 | 9 | -82/+399 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | 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 | 3 | -5/+111 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -1/+12 |
| | | | | | | |||||
| | * | | | | 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 | 22 | -44/+286 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui |