summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/declarative/integrating-javascript/includejs/script.js
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-12-06 19:46:12 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-06 19:46:12 (GMT)
commit54aa97bf265bfa581bb64b5968e92ce943c63802 (patch)
tree0abefc29b6641bc24b4af577e6e38e2c5c23875d /doc/src/snippets/declarative/integrating-javascript/includejs/script.js
parenta70ccc4aaad74dbf28569c78479d4668781bb0fe (diff)
parentc5a9bf1553dc1960ef5d1531a0acf405ace6a05c (diff)
downloadQt-54aa97bf265bfa581bb64b5968e92ce943c63802.zip
Qt-54aa97bf265bfa581bb64b5968e92ce943c63802.tar.gz
Qt-54aa97bf265bfa581bb64b5968e92ce943c63802.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: QGtkStyle: Use gtk_progress_configure() instead of adjustment API Move test data to a qrc file.
Diffstat (limited to 'doc/src/snippets/declarative/integrating-javascript/includejs/script.js')
0 files changed, 0 insertions, 0 deletions