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/qt7movievideowidget.h | |
| parent | c803933c46c9a9986cd73701066c08dfefd0dcfc (diff) | |
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/qt7movievideowidget.h')
| -rw-r--r-- | src/plugins/qt7/qt7movievideowidget.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/qt7/qt7movievideowidget.h b/src/plugins/qt7/qt7movievideowidget.h index f7070030a..38f17d58f 100644 --- a/src/plugins/qt7/qt7movievideowidget.h +++ b/src/plugins/qt7/qt7movievideowidget.h @@ -48,7 +48,6 @@ #include <qvideowindowcontrol.h> #include <qmediaplayer.h> -#include <QtWidgets/qmacdefines_mac.h> #include "qt7videooutput.h" #include <QuartzCore/CVOpenGLTexture.h> @@ -94,7 +93,7 @@ public: int saturation() const; void setSaturation(int saturation); -private slots: +private Q_SLOTS: void updateVideoFrame(const CVTimeStamp &ts); private: |