diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-01-18 11:35:48 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-18 04:59:36 +0100 |
commit | 7e76391c5985cdd95de6baf5409793b11373f120 (patch) | |
tree | 3a5d3921a85e5fa55809763172b1941fe4bb9b54 /src/plugins/qt7/qt7movieviewoutput.h | |
parent | c803933c46c9a9986cd73701066c08dfefd0dcfc (diff) | |
download | qtmultimedia-7e76391c5985cdd95de6baf5409793b11373f120.tar.gz |
Fixed compile of quicktime plugin
This code was including the qmacdefines_mac.h header from QtWidgets,
which has recently been removed. Using the header is no longer
necessary.
Note that the qmacdefines_mac.h contained a workaround for some mac
system headers declaring variables named `slots'. Replace that
workaround with the standard no_keywords method.
Change-Id: Icd47a562d64953692e50a9fea8bb4a9c8424375c
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/plugins/qt7/qt7movieviewoutput.h')
-rw-r--r-- | src/plugins/qt7/qt7movieviewoutput.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/qt7/qt7movieviewoutput.h b/src/plugins/qt7/qt7movieviewoutput.h index 597de1940..801a74beb 100644 --- a/src/plugins/qt7/qt7movieviewoutput.h +++ b/src/plugins/qt7/qt7movieviewoutput.h @@ -47,7 +47,6 @@ #include <qvideowindowcontrol.h> #include <qmediaplayer.h> -#include <QtWidgets/qmacdefines_mac.h> #include "qt7videooutput.h" |