summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-16 14:26:46 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-16 14:26:46 (GMT)
commit4b32e350da224e55e2be490964521551713f0796 (patch)
treefccfcc22f375e89cbd3b4ce01d36374335fdbfab /src/multimedia
parentb8ded0df9c85558b93ee5ec5abd5774c87c4deed (diff)
parent234a4b614e30ec2ad3e161c0dcd4d339182ff9ec (diff)
downloadQt-4b32e350da224e55e2be490964521551713f0796.zip
Qt-4b32e350da224e55e2be490964521551713f0796.tar.gz
Qt-4b32e350da224e55e2be490964521551713f0796.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Qt.include() used in WorkerScript is broken on Windows.
Diffstat (limited to 'src/multimedia')
0 files changed, 0 insertions, 0 deletions