diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-05 00:47:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-05 00:47:53 (GMT) |
| commit | 757733f4a5698ec87072031996e6025a51ce1648 (patch) | |
| tree | b12e7a6c508a3d7e372556286097e41d4f0307ea /demos/browser/settings.h | |
| parent | 7474ad656269aec1352d166bb5a4435086d48482 (diff) | |
| parent | 8aabb79ccde7502eb82aae5ce614b37c6789bc1f (diff) | |
| download | Qt-757733f4a5698ec87072031996e6025a51ce1648.zip Qt-757733f4a5698ec87072031996e6025a51ce1648.tar.gz Qt-757733f4a5698ec87072031996e6025a51ce1648.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3309 commits)
Add some painting benchmarks.
Make sure cookies are saved.
Fix headers::licenseCheck autotest failure
Re-add accidentally deleted file
Test SizeItemToLoader to SizeLoaderToItem resizeMode change.
Document QmlContext ownership.
Add bug note.
Fix elision and multilength strings when resizing a Text element.
Document calling C++ methods from QML.
Document margins property
Augment documentation
doc: There is no easeNone, it is called easeLinear
doc: Converted the basic types page to use \qmlbasictype
Focus focusScope from focusing for focusOnPress
Really run image reader in its own thread.
Don't create one QNetworkAccessManager per XMLHttpRequest
We use JavaScript, not ECMAScript.
XMLHttpRequest redirection
update Image.paintedWidth and Image.paintedHeight when the source changes
Remove debug.
...
Diffstat (limited to 'demos/browser/settings.h')
0 files changed, 0 insertions, 0 deletions