summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-18 00:46:22 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-18 00:46:22 (GMT)
commit19c41b7de6596453f16d52f05953b153cd40e36e (patch)
tree549bb5ca3e8c19911434904924a4b8ac4551fd6d /qmake
parentf9ca0df998a8a3a942816f2954603ad996210d8d (diff)
parent2d1095e5a5c3cbf054d87d3f5b10c6ecaa1e98c3 (diff)
downloadQt-19c41b7de6596453f16d52f05953b153cd40e36e.zip
Qt-19c41b7de6596453f16d52f05953b153cd40e36e.tar.gz
Qt-19c41b7de6596453f16d52f05953b153cd40e36e.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: Pause the direct show graph when the playback rate is 0.0. Rebuild configure.exe (again enable QtDeclarative module by default)
Diffstat (limited to 'qmake')
0 files changed, 0 insertions, 0 deletions