diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-26 14:32:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-26 14:32:47 (GMT) |
| commit | d477cc1498ccf2204dd0e5cd6676f5c0788a9090 (patch) | |
| tree | a086428b8ee6b838d3babc8d0844ab23f36389b5 /src/opengl/qglshaderprogram.cpp | |
| parent | 065610d14fda00057724a46e2649db6bb98aca58 (diff) | |
| parent | ff10e44642d65b2dde50579c4994aa9def43f4c0 (diff) | |
| download | Qt-d477cc1498ccf2204dd0e5cd6676f5c0788a9090.zip Qt-d477cc1498ccf2204dd0e5cd6676f5c0788a9090.tar.gz Qt-d477cc1498ccf2204dd0e5cd6676f5c0788a9090.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Handle layoutChanged() properly in QML views.
Fix ListView and GridView tests following off-by-one fixes.
Revert 4bc81bb1cb3cd4a0a3fe071e00556124e770d7ac
Fix off-by-one at end when views scroll to keep currentItem visible.
Make declarative examples a bit more qt-like.
Add quit buttons to declarative demos
ListView.view and GridView.view properties should not be writable.
Avoid Flickable view jumping when drag threashold is exceeded.
Fix ListView.view attached property with VisualItemModel
Remove dead code.
Add test for VisualItemModel layoutChanged() handling
Remove unused code.
Handle QAbstractItemModel layoutChanged() signal
Diffstat (limited to 'src/opengl/qglshaderprogram.cpp')
0 files changed, 0 insertions, 0 deletions