diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-18 18:50:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-18 18:50:55 (GMT) |
| commit | a584ce0be29e9cb5cb0b627c71e4147011013418 (patch) | |
| tree | 16e924295b77c8329010954da2ed3ca4af1b7fd8 /src/plugins/mediaservices/gstreamer/qgstreamervideooverlay.h | |
| parent | 0cea0e45523283d6c31998672f97b0343c1388f2 (diff) | |
| parent | 3341054219a9d58286b8770d4bb4b40fb33b3c09 (diff) | |
| download | Qt-a584ce0be29e9cb5cb0b627c71e4147011013418.zip Qt-a584ce0be29e9cb5cb0b627c71e4147011013418.tar.gz Qt-a584ce0be29e9cb5cb0b627c71e4147011013418.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Fixed compile of JavaScriptCore for Symbian^3.
Fix compilation: StringImpl has no public, default constructor
JavaScriptCore doesn't need QtGui
Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x
Diffstat (limited to 'src/plugins/mediaservices/gstreamer/qgstreamervideooverlay.h')
0 files changed, 0 insertions, 0 deletions