diff options
Diffstat (limited to 'src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm')
| -rw-r--r-- | src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm b/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm index f88dce7..0248394 100644 --- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm +++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm @@ -47,6 +47,15 @@ #import "SoftLinking.h" #import "TimeRanges.h" #import "WebCoreSystemInterface.h" + +#if PLATFORM(QT) +// Avoid clash with slots member in CALayer.h +#include <qobjectdefs.h> +#if defined(slots) +#undef slots +#endif +#endif + #import <QTKit/QTKit.h> #import <objc/objc-runtime.h> #import <wtf/UnusedParam.h> |