diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-21 21:40:46 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-21 21:40:46 (GMT) |
commit | 91215b48022b3b3980960f1b5f301ac84f14d49d (patch) | |
tree | c71963ebb5270b0f8a85177c22377b7e625fb994 /config.tests/.gitignore | |
parent | 07f131927faa09402589da7b4bfb516482f59e46 (diff) | |
parent | b05e07835c376857da0a0f9cb85bbab001f145dd (diff) | |
download | Qt-91215b48022b3b3980960f1b5f301ac84f14d49d.zip Qt-91215b48022b3b3980960f1b5f301ac84f14d49d.tar.gz Qt-91215b48022b3b3980960f1b5f301ac84f14d49d.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: (26 commits)
Expand QDeclarativeExtensionPlugin docs
Add missing snippet files
Expand QtObject doc
Indicate default values
Use snippets instead to avoid quoting license headers
Rename remaining 'wantsFocus'.
Bounding rect of text was not always calculated correctly.
Add QML tutorials to the tutorials page
QML focus API updates.
Do not show copyright header in documentation.
Ensure redirects (and indeed all reply process) is done in the right thread.
Only ignore the same target value for a Behavior when it is running.
Fix clock example: make sure hands always moves forward.
font.letterSpacing used percentage rather than absolute values.
Rewinding AnchorChanges should not make target item's implicit width and height explicit
Compile: include <float.h> for usage of FLT_MAX.
Restore the FLT_MAX define.
Make Item::transformOriginPoint read-only
Ensure the boundingRect() of Text is correctly calculated.
Better defaults for MouseArea's drag.
...
Diffstat (limited to 'config.tests/.gitignore')
0 files changed, 0 insertions, 0 deletions