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/plugins.pro | |
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/plugins.pro')
-rw-r--r-- | src/plugins/plugins.pro | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index ac5968a3b..80dbc1295 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -35,10 +35,6 @@ unix:!mac { } mac:!simulator { - SUBDIRS += audiocapture - - # Currently we need qmacdefines_mac.h from QtWidgets, so this depends on that :/ - # despite the code not really using them. - !isEmpty(QT.widgets.name):SUBDIRS += qt7 + SUBDIRS += audiocapture qt7 } |