summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativetext_p_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-02-25 17:25:46 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-02-25 17:25:46 (GMT)
commit606793520b1470604e5ac8c7e25a4db7e1a10f54 (patch)
tree11c64f8183bb15abc1c820a00278aed616612bb0 /src/declarative/graphicsitems/qdeclarativetext_p_p.h
parenta496f435792808e9faa36fd3e5c07cba51fffe75 (diff)
parente77e820191919aaf54c85f599cf71cfbecd1ee14 (diff)
downloadQt-606793520b1470604e5ac8c7e25a4db7e1a10f54.zip
Qt-606793520b1470604e5ac8c7e25a4db7e1a10f54.tar.gz
Qt-606793520b1470604e5ac8c7e25a4db7e1a10f54.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QSortFilterProxyModel::reset() should invalidate.
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetext_p_p.h')
0 files changed, 0 insertions, 0 deletions