Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-10-27 | 74 | -266/+2198 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2009-10-27 | 111 | -739/+2580 |
| |\ | | | | | | | | | | into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-27 | 7 | -56/+52 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | forgot icons | Yann Bodson | 2009-10-27 | 6 | -0/+0 |
| | | | | |||||
| | | * | listview/dynamic improvements | Yann Bodson | 2009-10-27 | 1 | -56/+52 |
| | | | | |||||
| | * | | Add QFxVisualItemModel::children notify signal | Aaron Kennedy | 2009-10-27 | 2 | -1/+10 |
| | | | | |||||
| | * | | Update parallax example | Aaron Kennedy | 2009-10-27 | 5 | -4/+523 |
| | | | | |||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-27 | 2 | -11/+13 |
| | |\ \ | | | |/ | | | | | | | | | 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-27 | 14 | -87/+112 |
| | | |\ | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | * | | make listview/dynamic.qml work again | Yann Bodson | 2009-10-27 | 2 | -11/+13 |
| | | | | | |||||
| | * | | | Alias cleanup testcase | Aaron Kennedy | 2009-10-27 | 2 | -0/+41 |
| | | | | | |||||
| | * | | | 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 | 4 | -0/+43 |
| | |/ / | |||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-27 | 6 | -3/+21 |
| | |\ \ | | | | | | | | | | | | | | | | 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 | 6 | -3/+21 |
| | | |/ | | | | | | | | | | | | | This crashed as the metatype of QVariant is -1. | ||||
| | * | | Improve highlight range API and fix incorrect list end calc. | Martin Jones | 2009-10-27 | 7 | -78/+70 |
| | |/ | |||||
| * | | Add qmldebugger/creatorplugin | Bea Lam | 2009-10-27 | 15 | -0/+1240 |
| | | | |||||
| * | | Move qmldebugger/ into qmldebugger/standalone dir. | Bea Lam | 2009-10-27 | 22 | -18/+20 |
| | | | |||||
| * | | Add -stayontop option. | Bea Lam | 2009-10-27 | 1 | -2/+9 |
| | | | |||||
| * | | Increase minimum height | Bea Lam | 2009-10-27 | 1 | -1/+1 |
| | | | |||||
| * | | Allow debugger components to be reset/cleared. | Bea Lam | 2009-10-27 | 10 | -38/+109 |
| | | | |||||
* | | | Test remote QML content | Warwick Allison | 2009-10-27 | 1 | -0/+28 |
| | | | | | | | | | | | | (test data will appear on qt-test-server.qt-test-net shortly) | ||||
* | | | Fix remote content loading for absolute URLs | Warwick Allison | 2009-10-27 | 1 | -3/+6 |
| |/ |/| | | | | | (the test is pending...) | ||||
* | | Fixed namespace macro. | Erik Verbruggen | 2009-10-26 | 1 | -2/+2 |
| | | |||||
* | | typo fixed in qmlviewer main menu | Joerg Bornemann | 2009-10-26 | 1 | -1/+1 |
| | | | | | | | | Reviewed-by: kkoehne | ||||
* | | Resize loader after parameters have changed | Aaron Kennedy | 2009-10-26 | 1 | -0/+2 |
| | | |||||
* | | parallax example | Aaron Kennedy | 2009-10-26 | 6 | -0/+134 |
| | | |||||
* | | 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 |