Merge branch 4.7 into qt-master-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 12 Apr 2011 16:06:35 +0000 (02:06 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 12 Apr 2011 16:06:35 +0000 (02:06 +1000)
commit163a4a4c38453cd4ed32c5a436763e11ce580687
treec9162f4b47571300ea17578401122532139561e9
parent7190c7be34fe0dbcfbb10b232b40977c758d251a
parentb6f1dd4151c5bbcb7d4367ec972c9026ab9e68be
Merge branch 4.7 into qt-master-from-4.7
src/declarative/util/qdeclarativelistmodel.cpp
src/gui/kernel/qwidget_mac.mm
src/gui/text/qtextobject.cpp
src/gui/text/qtextobject.h