diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-07 10:01:54 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-07 10:01:54 (GMT) |
| commit | 658eb0f7f595ff770c40d6bcd4279fb09aac92c5 (patch) | |
| tree | 9d3b09149b2518194f3ca533600bdcbb80f1093b /doc/src/snippets/code/src_script_qscriptclass.cpp | |
| parent | 19a566f82a7c684423331a8caab70ec594afd1ce (diff) | |
| parent | e8901e829df11eeecb2c9489c7d502f007694bfb (diff) | |
| download | Qt-658eb0f7f595ff770c40d6bcd4279fb09aac92c5.zip Qt-658eb0f7f595ff770c40d6bcd4279fb09aac92c5.tar.gz Qt-658eb0f7f595ff770c40d6bcd4279fb09aac92c5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
QtWebKit: Change the dependency from phonon to QtMultimedia.
QtWebKit: Add missing namespace wrapper temporarily until next import.
QtWebKit: fix build with qws temporarily until next import.
Update src/3rdparty/webkit from trunk.
QtWebKit: Re-add the dependency to the static linked JavaScriptCore
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptclass.cpp')
0 files changed, 0 insertions, 0 deletions