summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/cppcodemarker.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-02 20:03:28 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-02 20:03:28 (GMT)
commit5783f98ce5e243afbbd4c6a68c80d2dd959520e0 (patch)
treea3de3aadcae6c4c956c75ea7bdf8d44e2b18c452 /tools/qdoc3/cppcodemarker.cpp
parente0a50a627376a7b83a2e965dee75515ed283a447 (diff)
parent7b96944a02991e404cdab61e24182b90f5849120 (diff)
downloadQt-5783f98ce5e243afbbd4c6a68c80d2dd959520e0.zip
Qt-5783f98ce5e243afbbd4c6a68c80d2dd959520e0.tar.gz
Qt-5783f98ce5e243afbbd4c6a68c80d2dd959520e0.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: QSortFilterProxyModel: Fix dynamic sorting when severals rows are added. QLabel: add setSelection, hasSelectedText, selectedText, selectionStart.
Diffstat (limited to 'tools/qdoc3/cppcodemarker.cpp')
0 files changed, 0 insertions, 0 deletions