summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeinclude.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-09-07 01:28:23 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-09-07 01:28:23 (GMT)
commitef5eabdd58a9f584cff8b4e70b7eea583957114c (patch)
treecc42c5a4bb3201c552c465176bcbca8ae77fcea5 /src/declarative/qml/qdeclarativeinclude.cpp
parent00ffa83f2dbe3b3019dc564d6b4447f83b5d655f (diff)
parent7253fe0cb58699d911f7f5b2dca28dd7182b1ef9 (diff)
downloadQt-ef5eabdd58a9f584cff8b4e70b7eea583957114c.zip
Qt-ef5eabdd58a9f584cff8b4e70b7eea583957114c.tar.gz
Qt-ef5eabdd58a9f584cff8b4e70b7eea583957114c.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: Dragging in nested views no longer works as expected Fix implicit height not growing when pre-edit text wraps. Fix leak in State element. Fix leak in bindings created by PropertyChanges.
Diffstat (limited to 'src/declarative/qml/qdeclarativeinclude.cpp')
0 files changed, 0 insertions, 0 deletions