diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-14 16:02:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-14 16:02:08 (GMT) |
| commit | 0f4505dd18a1342b62a049d4c37414179d6ec065 (patch) | |
| tree | 3be71264d34e2ec7534a404634ae39f3cf47d497 /src/plugins/mediaservices/qt7/qt7movierenderer.h | |
| parent | b371999d3e9c207047be6afda89d008b6cf04763 (diff) | |
| parent | 8876c7c44744b0813f98ebbb0f748331f9d8a22c (diff) | |
| download | Qt-0f4505dd18a1342b62a049d4c37414179d6ec065.zip Qt-0f4505dd18a1342b62a049d4c37414179d6ec065.tar.gz Qt-0f4505dd18a1342b62a049d4c37414179d6ec065.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits)
Added missing newline after warning message when using -L with qml
Doc: updating scripts
Fixed a crash on embedded due to uninitialized pointer.
Fix a race where QThread::exit() is "lost" when called after start()
qdoc: Removed all <table> attributes in favor of using css.
Autotest failure: dialogModality test fails on cocoa (macgui)
Force the bic test to compile in 32-bit mode on Mac
Revert "Doc: Updating design files."
Remove statically allocated pixmaps through the post routine
qdoc: Checked for empty title.
qdoc: Added TOC to class ref pages.
Cocoa: qwidget autotest fails on setToolTip
Compile on Mac OS 10.4
Bearer management changes from Qt Mobility (7a5ff985)
Partially revert "Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors"
Fix margins for placeholdertext in QLineEdit
qdoc: Added TOC to module pages.
Doc: Updating design files.
Doc: Fixing design bugs. Updating the index page and script/style files. Adding some image files.
qdoc: Changed <ul> elements in TOC.
...
Diffstat (limited to 'src/plugins/mediaservices/qt7/qt7movierenderer.h')
| -rw-r--r-- | src/plugins/mediaservices/qt7/qt7movierenderer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/mediaservices/qt7/qt7movierenderer.h b/src/plugins/mediaservices/qt7/qt7movierenderer.h index c2dd177..5953b54 100644 --- a/src/plugins/mediaservices/qt7/qt7movierenderer.h +++ b/src/plugins/mediaservices/qt7/qt7movierenderer.h @@ -53,7 +53,7 @@ #include <QtGui/qmacdefines_mac.h> #include "qt7videooutputcontrol.h" -#include <CoreVideo/CVOpenGLTexture.h> +#include <QuartzCore/CVOpenGLTexture.h> #include <QuickTime/QuickTime.h> |