diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-11 03:52:49 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-11 03:52:49 +1000 |
| commit | c8a2533cb39ce0c7479880cd889ad594d569ecc0 (patch) | |
| tree | 99ca377b6c66eceb6bb11e3b68e6179d349c4e75 /src/gui/itemviews/qsortfilterproxymodel.cpp | |
| parent | 9dc3c41a076ee647d64700eff01da863a0df7012 (diff) | |
| parent | 9fe927a54f0c465c0dcbcc5790ad0ddb17d4cc18 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Proposed fix for QTBUG-10499
remove useless overload
simplify polling code a bit
promote QNetworkConfigurationManager::updateConfigurations() to a slot
simplify waitForOpened()
fix CV-qualifiers for some members
minor clean-ups and styling fixes
Diffstat (limited to 'src/gui/itemviews/qsortfilterproxymodel.cpp')
0 files changed, 0 insertions, 0 deletions