summaryrefslogtreecommitdiff
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-03 16:00:29 +0100
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-03 16:00:29 +0100
commit14e4fd08ff67578dccf5e85a88fcadf747ae5852 (patch)
tree903518cf3f79926a52ebe1f0a7e55d5ab26382a6 /doc/src/snippets/declarative/integrating-javascript/includejs/script.js
parent2242f508903983b5aac3c086f1f652ec04c53e4c (diff)
parentb552f7c8b5cdc455b87a2688ac0df47fcdf7ac35 (diff)
downloadqt4-tools-14e4fd08ff67578dccf5e85a88fcadf747ae5852.tar.gz
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: rebuild configure fix misleading uppercasing deprecation warning Enable Phonon on Symbian by default. Disable OpenGL on Symbian only by default instead of always VFP type on ARM option in Linux configure script Adding -dont-process option to Unix configure script Synchronized configure.exe OpenGL options with Unix configure build lrelease as part of the "libs" part. purge vestiges of imageformat-plugins
Diffstat (limited to 'doc/src/snippets/declarative/integrating-javascript/includejs/script.js')
0 files changed, 0 insertions, 0 deletions