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-04 02:58:47 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-04 02:58:47 (GMT)
commita2c35349880b056ebec3ad7db9e796e8abd028a3 (patch)
tree021d0a403732738fcedab74ff7c5aefccad4b192 /doc/src/snippets/declarative/integrating-javascript/includejs/script.js
parent4a00c77f1e7c93519a8bb7cea09849d911b51607 (diff)
parent4b9b388c9a1e2d74a0188db7df57bd93c1f97240 (diff)
downloadQt-a2c35349880b056ebec3ad7db9e796e8abd028a3.zip
Qt-a2c35349880b056ebec3ad7db9e796e8abd028a3.tar.gz
Qt-a2c35349880b056ebec3ad7db9e796e8abd028a3.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: print out which GLSL shader that failed compilation for better debugging QSystemTrayIcon::messageTimeout() signal implemented --warn compile with debug defined enabled
Diffstat (limited to 'doc/src/snippets/declarative/integrating-javascript/includejs/script.js')
0 files changed, 0 insertions, 0 deletions