summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-28 16:13:07 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-28 16:13:07 (GMT)
commitd49a7e382c69076de179103c9072e49a72db264d (patch)
treed5237a64483ddeaf25b6a09edecba0aad7011b65 /src/network
parentc79a78b7f48ba806c578e7213d4cdcda00f9ea17 (diff)
parent5784f5e0f85e7aad57aab8883f55157586b36804 (diff)
downloadQt-d49a7e382c69076de179103c9072e49a72db264d.zip
Qt-d49a7e382c69076de179103c9072e49a72db264d.tar.gz
Qt-d49a7e382c69076de179103c9072e49a72db264d.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix tst_qsorftfilterproxymodel after 893cd4dd6eb64 An an assert when a QModelIndex from the wrong model is used with QSFPM.
Diffstat (limited to 'src/network')
0 files changed, 0 insertions, 0 deletions