diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 01:15:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 01:15:40 (GMT) |
| commit | 1cdaca2823a7c09f377ab205e6424e35febcbf2c (patch) | |
| tree | 559c1f8c8ea2109945580fe118a6aa213c1eb349 /src/opengl/qglshaderprogram.cpp | |
| parent | 8a026d93a76a61415b4d697991cdd8aee6b76cb9 (diff) | |
| parent | 5048b96a14b61329257e153f2551b6fca4519f84 (diff) | |
| download | Qt-1cdaca2823a7c09f377ab205e6424e35febcbf2c.zip Qt-1cdaca2823a7c09f377ab205e6424e35febcbf2c.tar.gz Qt-1cdaca2823a7c09f377ab205e6424e35febcbf2c.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: (104 commits)
Include QML doc snippets in examples autotest
Update QML documentation snippets to latest syntax.
MouseRegion is dead. Long live MouseArea.
Compile fix for wince
Update QML PropertyAnimation::easing docs
Add testcase for QTBUG-7730
Add autotests for tab and backtab in Keys and KeyNavigation.
Run signal expressions on attached property objects in correct scope
Fixup test
Add support for tab and backtab in KeyNavigation
Mark QGraphicsItem position properties as FINAL
Move the multimedia files to the correct place.
Fix grammar stringifying "on" as "readonly"
Improve grouped property error messages
Don't mess with highlight size if highlightFollowsCurrentItem is false.
Fix ListView contentHeight calculation.
Remove Qt.playSound()
Add formatting functions to QML's global Qt object.
Signal handler requires exactly one value.
QDeclarativeContext::contextProperty() should also access ids
...
Diffstat (limited to 'src/opengl/qglshaderprogram.cpp')
0 files changed, 0 insertions, 0 deletions