summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qt_s60_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-25 08:24:19 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-25 08:24:19 (GMT)
commit978daedf73ba7aecf9ea9f83c9108308e4303d6e (patch)
tree6b080f34609bebf1cc049eeb1751d3b5141d5881 /src/gui/kernel/qt_s60_p.h
parent675188b766b7b0f7eb65c2e9f3ee7d6017e63453 (diff)
parent141c5ea5b14b1499bcfb5e2c39c917e94aa4e23f (diff)
downloadQt-978daedf73ba7aecf9ea9f83c9108308e4303d6e.zip
Qt-978daedf73ba7aecf9ea9f83c9108308e4303d6e.tar.gz
Qt-978daedf73ba7aecf9ea9f83c9108308e4303d6e.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: Don't circumvent onDestruction handlers when clearing expression in delegate cleanup Fix responseText to check the charset encoding field and also to not Re-insert and emit the correct NOTIFY signals following the removal Fix poor flicking behavior with slower flicks. Alignment of shadow for rich text is broken when using text styles typo Setting one dimension of the sourceSize should set the other dimension. Document calling QObject methods from QML in Extending QML in C++ docs.
Diffstat (limited to 'src/gui/kernel/qt_s60_p.h')
0 files changed, 0 insertions, 0 deletions