summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code/src_script_qscriptclass.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-26 15:23:59 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-26 15:23:59 (GMT)
commit084c5c697040e46180b6bcc0150683d9b363450c (patch)
treef260176d4559ceafe68dffff2a0b14ebb89484b1 /doc/src/snippets/code/src_script_qscriptclass.cpp
parentcd865551919b0e56a3c049d15f767ca644931c5f (diff)
parent8d267e8d7a1e3374558ed302cfa415788ca74e02 (diff)
downloadQt-084c5c697040e46180b6bcc0150683d9b363450c.zip
Qt-084c5c697040e46180b6bcc0150683d9b363450c.tar.gz
Qt-084c5c697040e46180b6bcc0150683d9b363450c.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: Improved documentation for QSharedMemory's key/setKey functions. Added native key support to QSharedMemory API. Make test work with shadow builds again. Added QThreadPool::waitForDone(int msecs) Add support of high unicodes in QUrl. QComboBox::modelColumn was not respected when selecting an item
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptclass.cpp')
0 files changed, 0 insertions, 0 deletions