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-05-04 11:53:11 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-04 11:53:11 (GMT)
commit49a3c9840116fce1fb4c2f7cd2dcd4c85bd20032 (patch)
tree41deea6b7a593c2a2f48efff37bce1d55c41fd6d /doc/src/snippets/code/src_script_qscriptengine.cpp
parentbea0a4195bcd641a05ae7195cf319590a254b876 (diff)
parentcbdd0bfe63beed9e0a4596e6d9e5b0be1ea9eb46 (diff)
downloadQt-49a3c9840116fce1fb4c2f7cd2dcd4c85bd20032.zip
Qt-49a3c9840116fce1fb4c2f7cd2dcd4c85bd20032.tar.gz
Qt-49a3c9840116fce1fb4c2f7cd2dcd4c85bd20032.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: Skip failing auto-test on Mac and Linux QWS Update changelog after last change. QTabBar: smaller minimumSizeHint in ElideMode, and unit-test. Fix tab stop in QPainter::drawText()
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptengine.cpp')
0 files changed, 0 insertions, 0 deletions