diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-24 03:39:38 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-24 03:39:38 (GMT) |
| commit | fb5fc5eead19a079853ebc3b0f8eddd94bbc0154 (patch) | |
| tree | 8aec4d1a03e199a8c0f8cc7b9cecf91a098630fd /doc | |
| parent | e5722f539888913b9bea4f91db95f5e2c5fceed1 (diff) | |
| parent | 52b3d6263bb58ca82a8f00d42af801f5ed521f6b (diff) | |
| download | Qt-fb5fc5eead19a079853ebc3b0f8eddd94bbc0154.zip Qt-fb5fc5eead19a079853ebc3b0f8eddd94bbc0154.tar.gz Qt-fb5fc5eead19a079853ebc3b0f8eddd94bbc0154.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:
Update lupdate to recognize concatenated text in QML files.
Ensure sourcesize is in pixmap cache key.
Use ugly but reliable bitmaps fonts in test.
doc: note that calling methods before component completion may have no effect
Fix unstable qdeclarativeviewer tests
Use Pen with Qt::MiterJoin when drawing Rectangles with gradients
Update screenshot
Fix and better test Text / TextEdit alignments.
Ensure the view is correctly positioned at component complete.
Support for non-literal plural arguments to qsTr() in lupdate (QML).
References to undefined variables throws a ReferenceError
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/images/qml-xmlhttprequest-example.png | bin | 21311 -> 20934 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/qml-xmlhttprequest-example.png b/doc/src/images/qml-xmlhttprequest-example.png Binary files differindex 68e7d27..f585613 100644 --- a/doc/src/images/qml-xmlhttprequest-example.png +++ b/doc/src/images/qml-xmlhttprequest-example.png |
