summaryrefslogtreecommitdiffstats
path: root/tests/auto/qtextlayout
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-18 01:10:06 +0200
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-18 01:10:06 +0200
commit489cface92f40f4e82866b5fabf57d29e9632811 (patch)
treeccb319491f5d2864e84a460ef19cbbb0fa4dc1d7 /tests/auto/qtextlayout
parent6aa50af000f85cc4497749fcf0860c8ed244a60e (diff)
parent08ddad034bfc7dbb81e6553b03f9df843d465ee4 (diff)
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( aa3f786bdba4dc153620ae7f98e4b0e41770d1d1 ) Audio (osx); In pull mode emit readyRead() for each period received. AudioInput example; disconnect from the built-in device when changing mode.
Diffstat (limited to 'tests/auto/qtextlayout')
0 files changed, 0 insertions, 0 deletions