summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwidget_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-01 07:56:38 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-01 07:56:38 (GMT)
commit236c3ad7bacf165069b834b62fede6b147cfaf03 (patch)
treeb33ce32ee9b86c4c6bf2e87cfd1c6d6f61bf2e2c /src/gui/kernel/qwidget_p.h
parentd65cb666cba22f08dd72d8e3336b104713e9daca (diff)
parent049330b4a54836f227a0e179082527a5272e868d (diff)
downloadQt-236c3ad7bacf165069b834b62fede6b147cfaf03.zip
Qt-236c3ad7bacf165069b834b62fede6b147cfaf03.tar.gz
Qt-236c3ad7bacf165069b834b62fede6b147cfaf03.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: Keep image centered in ImageDetails. Small optimizations. Fix position of image in detail view in flickr-mobile Make compile following QDeclarativePropertyChanges. Fix reload() when keys are not specified, and add extra tests.
Diffstat (limited to 'src/gui/kernel/qwidget_p.h')
0 files changed, 0 insertions, 0 deletions