diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-04-14 08:48:19 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-04-14 08:48:19 (GMT) |
| commit | 4ca8db7b01793a97489b75d093e289a8ec9c23a0 (patch) | |
| tree | af3b666fdf2b6887d7f10c20c1d36f84390606fa /src/plugins/mediaservices/qt7/qcvdisplaylink.h | |
| parent | 4607210dfef3b51933f03deab1037c98cbb8869c (diff) | |
| parent | d3e91e4124b96869b8c4e2c8492b4d4cec913ebc (diff) | |
| download | Qt-4ca8db7b01793a97489b75d093e289a8ec9c23a0.zip Qt-4ca8db7b01793a97489b75d093e289a8ec9c23a0.tar.gz Qt-4ca8db7b01793a97489b75d093e289a8ec9c23a0.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/plugins/mediaservices/qt7/qcvdisplaylink.h')
| -rw-r--r-- | src/plugins/mediaservices/qt7/qcvdisplaylink.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/mediaservices/qt7/qcvdisplaylink.h b/src/plugins/mediaservices/qt7/qcvdisplaylink.h index 5cd8f73..5a1180d 100644 --- a/src/plugins/mediaservices/qt7/qcvdisplaylink.h +++ b/src/plugins/mediaservices/qt7/qcvdisplaylink.h @@ -45,7 +45,7 @@ #include <QtCore/qobject.h> #include <QtCore/qmutex.h> -#include <CoreVideo/CVDisplayLink.h> +#include <QuartzCore/CVDisplayLink.h> QT_BEGIN_HEADER |