summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-05 20:08:54 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-05 20:08:54 (GMT)
commit901ea45ca02dc8fbbf3f6112240c4e468c240b73 (patch)
tree90fc6cb660e99575f31ab234788cd1869e2d8e39 /src/corelib/kernel
parent6f44e508d421f69f6f61db567c29aa3eb4828f96 (diff)
parent7e423cbaba0eb0a7d1e7c81b673149ba59901aab (diff)
downloadQt-901ea45ca02dc8fbbf3f6112240c4e468c240b73.zip
Qt-901ea45ca02dc8fbbf3f6112240c4e468c240b73.tar.gz
Qt-901ea45ca02dc8fbbf3f6112240c4e468c240b73.tar.bz2
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Document and test paintedWidth and paintedHeight properties of Image Add missing license header. Improve test coverage for declarative module. Avoid potential null dereference. Add autotest for reserved words in QML. Prevent crash in XmlListModel when appending an empty role. Remove unused, unexported class. Fix clipping behavior for non-cached text. Compile Only cache textlayout in paint engines that support transformations QmlDebugService: Fix compiler warning about cast from ascii Qt.openUrlExternally should resolve relative URLs. Doc: add missing image. Doc: typographical and spelling errors. Doc: remove unfinished and confusing mention to focus panels. Apply the QStaticText text-caching strategy for QML Documentation: input to Qt.rgba should be from 0-1, not 0-255.
Diffstat (limited to 'src/corelib/kernel')
0 files changed, 0 insertions, 0 deletions