diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-28 14:51:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-28 14:51:21 (GMT) |
| commit | c8b99a9b0a10541503f3e5b49b016862c7bc3ae5 (patch) | |
| tree | 249c0b51b3608d4c65e80bcca0346280f20ff9be /demos/declarative | |
| parent | 8b533a7564c634e6e7228c5e02832d55513777b5 (diff) | |
| parent | 9caae83e1f2b9c56ee86b8523391e6a83ea724c5 (diff) | |
| download | Qt-c8b99a9b0a10541503f3e5b49b016862c7bc3ae5.zip Qt-c8b99a9b0a10541503f3e5b49b016862c7bc3ae5.tar.gz Qt-c8b99a9b0a10541503f3e5b49b016862c7bc3ae5.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:
QDeclarativeDebugClient: Fix gcc warning
QmlDebugService: Check that there is a receiver before sending messages
If a type is registered under several names, share the attached property object
QmlViewer: Fix typo in comment
QmlViewer: Fix assert on exit (Windows)
QDeclarativeDebugService: Add bc autotest
Make QmlDebug protocol more robust
Minimize parameter changes on glyph cache textures
Only set maskTexture sampler uniform once
Only repopulate the glyph cache when we know something could have changed
Remove unnecessary attribute changes
Invalidate QStaticText coord cache when texture size changes
Diffstat (limited to 'demos/declarative')
0 files changed, 0 insertions, 0 deletions