summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeinclude_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-07-09 08:13:16 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-07-09 08:13:16 (GMT)
commitbfe1b734cf138a05611666a6a4f351c52d825290 (patch)
tree171fc686b4f6cb66b7b98cc23c5662784497efd9 /src/declarative/qml/qdeclarativeinclude_p.h
parentfb89f24ec1c799ed23ed5ee566e6d5d78122fc46 (diff)
parent0c56bef89b6e3fe4c9fb32eb8b51a6ea316a89fa (diff)
downloadQt-bfe1b734cf138a05611666a6a4f351c52d825290.zip
Qt-bfe1b734cf138a05611666a6a4f351c52d825290.tar.gz
Qt-bfe1b734cf138a05611666a6a4f351c52d825290.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: Optimize text layout.
Diffstat (limited to 'src/declarative/qml/qdeclarativeinclude_p.h')
0 files changed, 0 insertions, 0 deletions