summaryrefslogtreecommitdiffstats
path: root/src/corelib/plugin/quuid.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-12 05:33:43 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-12 05:33:43 (GMT)
commitfc3ef51ef7344e189699e62ec54f3ce469c553f9 (patch)
treeb1b689337c81edbf3a4f5abfe26004c55e1c9b42 /src/corelib/plugin/quuid.cpp
parent2504c2d4b1a7ae952005f9736c7f0399b31b1864 (diff)
parenta3e2e9efd4ed4baed3b5ca71cf518b3d3fda4716 (diff)
downloadQt-fc3ef51ef7344e189699e62ec54f3ce469c553f9.zip
Qt-fc3ef51ef7344e189699e62ec54f3ce469c553f9.tar.gz
Qt-fc3ef51ef7344e189699e62ec54f3ce469c553f9.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QPainterVideoSurface: assume yuv 420p and YV12 lines are 4 byte aligned. Delayed initialization of gstreamer video widget.
Diffstat (limited to 'src/corelib/plugin/quuid.cpp')
0 files changed, 0 insertions, 0 deletions