diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 09:41:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 09:41:25 (GMT) |
| commit | ebc7e35bd287a18c7f44d75a056dbc06172ef146 (patch) | |
| tree | cb88593a496377f6fcb15ddd4a4ccb3b71b4125f /src/xmlpatterns/functions/qstaticnamespacescontainer.cpp | |
| parent | 3e94b3a77affeef80544e48949e018ced4e0d96e (diff) | |
| parent | 689d74130f3deb987f22f75a21d3d7a8076951ae (diff) | |
| download | Qt-ebc7e35bd287a18c7f44d75a056dbc06172ef146.zip Qt-ebc7e35bd287a18c7f44d75a056dbc06172ef146.tar.gz Qt-ebc7e35bd287a18c7f44d75a056dbc06172ef146.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: 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.
QtWebKit: Re-add the dependency to the static linked JavaScriptCore
Diffstat (limited to 'src/xmlpatterns/functions/qstaticnamespacescontainer.cpp')
0 files changed, 0 insertions, 0 deletions