From 9deb0512a6dd870309a45cb1d195ee7539db6f32 Mon Sep 17 00:00:00 2001
From: Jonas Rabbe <jonas.rabbe@nokia.com>
Date: Thu, 20 Oct 2011 12:45:28 +1000
Subject: Fixed build problems with Quicktime

Because the Q_WS_* defines were removed, the Quicktime backend
stopped working. Replacing them with Q_OS_* works. Additionally,
the Quicktimer Player Service has to depend on QtWidgets.

Change-Id: I687b352191c38a91edaaf2a687ac13ed118fcf88
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
---
 src/plugins/plugins.pro                         | 2 +-
 src/plugins/qt7/mediaplayer/qt7playerservice.mm | 2 +-
 src/plugins/qt7/qt7.pro                         | 2 +-
 src/plugins/qt7/qt7backend.h                    | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 09b9461ea..ced4db9f0 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -36,7 +36,7 @@ unix:!mac {
 
 mac:!simulator {
     SUBDIRS += audiocapture
-    !qpa: SUBDIRS += qt7
+    SUBDIRS += qt7
 }
 
 # fake radio to test the radio APIs
diff --git a/src/plugins/qt7/mediaplayer/qt7playerservice.mm b/src/plugins/qt7/mediaplayer/qt7playerservice.mm
index 8dabbdadd..f868fd578 100644
--- a/src/plugins/qt7/mediaplayer/qt7playerservice.mm
+++ b/src/plugins/qt7/mediaplayer/qt7playerservice.mm
@@ -41,7 +41,7 @@
 
 #include <QtCore/qvariant.h>
 #include <QtCore/qdebug.h>
-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>
 
 #include "qt7backend.h"
 #include "qt7playerservice.h"
diff --git a/src/plugins/qt7/qt7.pro b/src/plugins/qt7/qt7.pro
index 34e54cfc5..e58b19925 100644
--- a/src/plugins/qt7/qt7.pro
+++ b/src/plugins/qt7/qt7.pro
@@ -1,7 +1,7 @@
 load(qt_module)
 
 TARGET = qqt7engine
-QT += multimedia-private multimediawidgets-private network
+QT += multimedia-private multimediawidgets-private network widgets
 PLUGIN_TYPE = mediaservice
 
 load(qt_plugin)
diff --git a/src/plugins/qt7/qt7backend.h b/src/plugins/qt7/qt7backend.h
index 67ff53abb..92c56edd7 100644
--- a/src/plugins/qt7/qt7backend.h
+++ b/src/plugins/qt7/qt7backend.h
@@ -46,8 +46,8 @@
 
 #include <QtCore/QString>
 
-#ifndef Q_WS_SIMULATOR
-#ifndef Q_WS_MAC64
+#ifndef Q_OS_SIMULATOR
+#ifndef Q_OS_MAC64
 #define QUICKTIME_C_API_AVAILABLE
 #endif
 #endif // !defined(Q_WS_SIMULATOR)
-- 
cgit v1.2.3