diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-20 11:15:52 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-20 11:15:52 (GMT) |
| commit | f5bab2bc74ed03fd1db99cba3830b6b21795a627 (patch) | |
| tree | b10c428a9b482354c5366e920a2a3359b676f82c /examples/multimedia | |
| parent | 489cface92f40f4e82866b5fabf57d29e9632811 (diff) | |
| parent | a27f18db247a0456ca15ad58f8dcc6b3441d55d0 (diff) | |
| download | Qt-f5bab2bc74ed03fd1db99cba3830b6b21795a627.zip Qt-f5bab2bc74ed03fd1db99cba3830b6b21795a627.tar.gz Qt-f5bab2bc74ed03fd1db99cba3830b6b21795a627.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6
src/3rdparty/* is left untouched and not merged from 4.6. The corresponding
changes in Harfbuzz and WebKit are already in the 4.6 staging areas.
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/3rdparty/webkit/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.qrc
tests/auto/qtextlayout/tst_qtextlayout.cpp
tests/auto/qwidgetaction/tst_qwidgetaction.cpp
Diffstat (limited to 'examples/multimedia')
0 files changed, 0 insertions, 0 deletions