summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code/src_script_qscriptengine.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-22 18:18:15 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-22 18:18:15 (GMT)
commitb4824f5c987b050a10b75abbed753126877100ba (patch)
treebae3b8f355e8a73d49f9efe75aa629c398b6e32a /doc/src/snippets/code/src_script_qscriptengine.cpp
parent315ea8d679d4c600db8ca85aad37c99590d090bc (diff)
parent193601b5d19881d8c031c5868e808dd75233e535 (diff)
downloadQt-b4824f5c987b050a10b75abbed753126877100ba.zip
Qt-b4824f5c987b050a10b75abbed753126877100ba.tar.gz
Qt-b4824f5c987b050a10b75abbed753126877100ba.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: Designer: Fix cardinality error in stringlist properties in ui4 schema. [qtconfig app] Add an app icon. Mac: Remove Ctrl+Y as redo shortcut. Fix strerror_r in case it returns a pointer that is not our buffer [networkselftest] Verify some CGIs on the test server [networkselftest] Verify the presence and size of some files on HTTP [networkselftest] Verify PUT and DELETE commands and the protected area in HTTP [networkselftest] Enchance test to verify the layout of the FTP server. [networkselftest] Add a test for the FTP proxy server [networkselftest] Add a test to try the SMB server. [networkselftest] Add the FTP proxy and SMB ports to the test. Add new QDataStream version for Qt 4.8. Long live Qt 4.8!
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptengine.cpp')
0 files changed, 0 insertions, 0 deletions