summaryrefslogtreecommitdiffstats
path: root/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-07-27 11:26:14 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-07-27 11:26:14 (GMT)
commit3d54d228d3fa8003f883275f775c37c2c031d9cc (patch)
tree0930379267e2035a6659234c0ef7010d7e00767a /tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp
parent5888ac21097dd718fc81d05987213391b923ea6d (diff)
parent83dbd809a0af50ac91d1e36a6b0437fc263958f3 (diff)
downloadQt-3d54d228d3fa8003f883275f775c37c2c031d9cc.zip
Qt-3d54d228d3fa8003f883275f775c37c2c031d9cc.tar.gz
Qt-3d54d228d3fa8003f883275f775c37c2c031d9cc.tar.bz2
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: QNAM: Stop half-supporting wrong way of deleting QAbstractSocket: Remove old workaround
Diffstat (limited to 'tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp')
0 files changed, 0 insertions, 0 deletions