diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 18:01:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 18:01:25 (GMT) |
| commit | 766791963b91bea53867381f04f72d356382a81b (patch) | |
| tree | be076b86f023ecfa4d32805fc5470df072087749 /tools | |
| parent | ce1c485bea8baddbc89d35b3a0f94374205d94a3 (diff) | |
| parent | ba9241a7a4e795f92a71a6989db3ff972a3ec571 (diff) | |
| download | Qt-766791963b91bea53867381f04f72d356382a81b.zip Qt-766791963b91bea53867381f04f72d356382a81b.tar.gz Qt-766791963b91bea53867381f04f72d356382a81b.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: (21 commits)
QtWebKit: Corrects symbols visibility for JavaScriptCore.
QtWebKit: Fix the QWebHistory serialization auto-test
Mark QWebFrame::overloadedSlots autotest as expected failure
QtWebKit: Fix autotests .qrc file paths when built from tests/auto/qweb*
QtWebKit: Build fix for WinCE.
Fix the build of webkit examples on platforms without OpenGL and Multimedia
QtWebKit: Fix build on mac.
QtWebKit: Fix build on WinCE, adding missing include path.
QtWebKit: Add missing namespace wrapper temporarily until next import.
QtWebKit: fix build with qws temporarily until next import.
Update src/3rdparty/webkit from trunk.
Fix failing assertions in debug builds
Fix the build of webkit examples on platforms without OpenGL and Multimedia
QtWebKit: Fix build on mac.
QtWebKit: Build fix for WinCE.
QtWebKit: Fix build on WinCE, adding missing include path.
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.
...
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions