diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 15:20:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 15:20:34 (GMT) |
| commit | f651be32bff238765b371f62b40b7ec74bdf8a03 (patch) | |
| tree | 0fdc5f4dce832f79aa87db6cac1e79990706e3ea /src/xmlpatterns/functions/qstaticnamespacescontainer.cpp | |
| parent | ce1c485bea8baddbc89d35b3a0f94374205d94a3 (diff) | |
| parent | a43df009713c7df7b19336db5cee8306da62d186 (diff) | |
| download | Qt-f651be32bff238765b371f62b40b7ec74bdf8a03.zip Qt-f651be32bff238765b371f62b40b7ec74bdf8a03.tar.gz Qt-f651be32bff238765b371f62b40b7ec74bdf8a03.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: 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.
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