summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-11-30 15:06:38 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-11-30 15:06:38 (GMT)
commitbb1a6cd1e9d6d00e8d70f665ca223261e9eda06e (patch)
treeb65be7919d3eb5e0b6fd63c6127234a79bd9e262 /src/corelib/tools
parente42d95d4e9d0dc547c604939f88de95180e74fa0 (diff)
parent840ffbd6187fe2573d8c00481120d4cf30aed351 (diff)
downloadQt-bb1a6cd1e9d6d00e8d70f665ca223261e9eda06e.zip
Qt-bb1a6cd1e9d6d00e8d70f665ca223261e9eda06e.tar.gz
Qt-bb1a6cd1e9d6d00e8d70f665ca223261e9eda06e.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: Ensure header is considered when positioning content with snapping. Fix integer overflow in QDeclarativeItemPrivate::origin enumeration Correct ownership semantics for QObject derived types Correctly handle CppOwnership even when a QDeclarativeData doesn't exist Fix Browser.qml warnings Document which header to include for qmlRegister functions. Don't draw null pixmap in QDeclarativeImage paint function Fix id documentation Link to List Properties docs from QML Intro page
Diffstat (limited to 'src/corelib/tools')
0 files changed, 0 insertions, 0 deletions