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-06-10 22:57:08 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-10 22:57:08 (GMT)
commit7d81f5ee410c07d6ba74ede7b953c5b8346b35f5 (patch)
tree5c539ecd3d095b5aa3d09f50a93bd1a67f87f623 /doc/src/snippets/code/src_script_qscriptclass.cpp
parenta60ca503751b9716f552437f7054b14b5ef0925b (diff)
parentd7d55ab51381f5805d52523d98623e63a99db2cf (diff)
downloadQt-7d81f5ee410c07d6ba74ede7b953c5b8346b35f5.zip
Qt-7d81f5ee410c07d6ba74ede7b953c5b8346b35f5.tar.gz
Qt-7d81f5ee410c07d6ba74ede7b953c5b8346b35f5.tar.bz2
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (140 commits) Change the directory where smart-installable application package is Disabled tst_MakeTestSelfTest::make_check by default on mac. fix translations from some header files being omitted New keys for media-related keys, common mobile keys Retrieve proper glyph outlines from Symbian^4 Updated WebKit to 6db5de6d18c3ab8b74809303e4d79abacfc570a8 Make Fluidlauncher demo have same version as corresponding Qt Revert changes to syncqt. Fix the building of sis files. Fix style sheet error with slider handle Make symbian install to epocroot by default. Fixed `make install' for qmediaplayer demo. Updated WebKit to 903617844b4341f7098b63b54e5be16cd83af647 deprecate header files in $$QT_BUILD_TREE/include/Qt syncqt: tabs changes to spaces Fixed def file usage for Qt plugins under the makefile build system. Fixed def file usage for the makefile build system on the SDK plugin. Synchronizing to latest tree Adding correct hungarian translation Add a note to the Linguist docs stating XLIFF 1.0 is not supported ...
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptclass.cpp')
0 files changed, 0 insertions, 0 deletions